From ab763f25a4c19b32def39dd5ff7cbc30b91eda82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20P=C3=A9an?= <gregoire.pean@gmail.com>
Date: Sun, 16 Apr 2017 14:53:06 -0700
Subject: [PATCH 01/73] Add CMake options LIBTINS_BUILD_EXAMPLES/TESTS

---
 CMakeLists.txt | 62 ++++++++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 27 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f57162b..710b6a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,9 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.1)
 PROJECT(libtins)
 
+OPTION(LIBTINS_BUILD_EXAMPLES "Build examples" ON)
+OPTION(LIBTINS_BUILD_TESTS "Build tests" ON)
+
 # Compile in release mode by default
 IF(NOT CMAKE_BUILD_TYPE)
     MESSAGE(STATUS "Setting build type to 'RelWithDebInfo' as none was specified.")
@@ -262,36 +265,41 @@ ADD_CUSTOM_TARGET(uninstall
 # ******************
 ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(src)
-IF(LIBTINS_ENABLE_PCAP)
-    ADD_SUBDIRECTORY(examples)
-ELSE()
-    MESSAGE(STATUS "Not building examples as pcap support is disabled")
+
+IF(LIBTINS_BUILD_EXAMPLES)
+    IF(LIBTINS_ENABLE_PCAP)
+        ADD_SUBDIRECTORY(examples)
+    ELSE()
+        MESSAGE(STATUS "Not building examples as pcap support is disabled")
+    ENDIF()
 ENDIF()
 
-# Only include googletest if the git submodule has been fetched
-IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/googletest/CMakeLists.txt")
-    # Enable tests and add the test directory
-    MESSAGE(STATUS "Tests have been enabled")
-    SET(GOOGLETEST_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/googletest)
-    SET(GOOGLETEST_INCLUDE ${GOOGLETEST_ROOT}/googletest/include)
-    SET(GOOGLETEST_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/googletest)
-    SET(GOOGLETEST_LIBRARY ${GOOGLETEST_BINARY_DIR}/googletest)
+IF(LIBTINS_BUILD_TESTS)
+    # Only include googletest if the git submodule has been fetched
+    IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/googletest/CMakeLists.txt")
+        # Enable tests and add the test directory
+        MESSAGE(STATUS "Tests have been enabled")
+        SET(GOOGLETEST_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/googletest)
+        SET(GOOGLETEST_INCLUDE ${GOOGLETEST_ROOT}/googletest/include)
+        SET(GOOGLETEST_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/googletest)
+        SET(GOOGLETEST_LIBRARY ${GOOGLETEST_BINARY_DIR}/googletest)
 
-    ExternalProject_Add(
-        googletest
-        DOWNLOAD_COMMAND ""
-        SOURCE_DIR ${GOOGLETEST_ROOT}
-        BINARY_DIR ${GOOGLETEST_BINARY_DIR}
-        CMAKE_CACHE_ARGS "-DBUILD_GTEST:bool=ON" "-DBUILD_GMOCK:bool=OFF"
-                         "-Dgtest_force_shared_crt:bool=ON"
-        INSTALL_COMMAND ""
-    )
-    # Make sure we build googletest before anything else
-    ADD_DEPENDENCIES(tins googletest)
-    ENABLE_TESTING()
-    ADD_SUBDIRECTORY(tests)
-ELSE()
-    MESSAGE(STATUS "googletest git submodule is absent. Run `git submodule init && git submodule update` to get it")
+        ExternalProject_Add(
+            googletest
+            DOWNLOAD_COMMAND ""
+            SOURCE_DIR ${GOOGLETEST_ROOT}
+            BINARY_DIR ${GOOGLETEST_BINARY_DIR}
+            CMAKE_CACHE_ARGS "-DBUILD_GTEST:bool=ON" "-DBUILD_GMOCK:bool=OFF"
+                            "-Dgtest_force_shared_crt:bool=ON"
+            INSTALL_COMMAND ""
+        )
+        # Make sure we build googletest before anything else
+        ADD_DEPENDENCIES(tins googletest)
+        ENABLE_TESTING()
+        ADD_SUBDIRECTORY(tests)
+    ELSE()
+        MESSAGE(STATUS "googletest git submodule is absent. Run `git submodule init && git submodule update` to get it")
+    ENDIF()
 ENDIF()
 
 # **********************************

From 6b3875ae39cf7f2757255ec16c17f9a7adc8c2a2 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sat, 29 Apr 2017 09:22:04 -0700
Subject: [PATCH 02/73] Bump version to 4.0

Next release will be a major one
---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 710b6a9..29d7d2c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,8 +45,8 @@ ELSE(LIBTINS_BUILD_SHARED)
 ENDIF(LIBTINS_BUILD_SHARED)
 
 # The version number.
-SET(LIBTINS_VERSION_MAJOR 3)
-SET(LIBTINS_VERSION_MINOR 5)
+SET(LIBTINS_VERSION_MAJOR 4)
+SET(LIBTINS_VERSION_MINOR 0)
 SET(LIBTINS_VERSION "${LIBTINS_VERSION_MAJOR}.${LIBTINS_VERSION_MINOR}")
 
 # Required Packages

From 8838ddf921c2d53173be12e4a6d1ffb2cab755a0 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sat, 29 Apr 2017 09:27:08 -0700
Subject: [PATCH 03/73] Add parent PDU member to PDU class

Now this is a bidirectional list of PDUs
---
 include/tins/pdu.h     | 23 ++++++++++++++++++++---
 src/CMakeLists.txt     |  1 -
 src/pdu.cpp            | 14 ++++++++++++--
 tests/src/pdu_test.cpp | 17 ++++++++++++++++-
 4 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/include/tins/pdu.h b/include/tins/pdu.h
index ab006ef..bde9a1b 100644
--- a/include/tins/pdu.h
+++ b/include/tins/pdu.h
@@ -231,8 +231,11 @@ public:
          * \param rhs The PDU to be moved.
          */
         PDU(PDU &&rhs) TINS_NOEXCEPT 
-        : inner_pdu_(0) {
+        : inner_pdu_(0), parent_pdu_(0) {
             std::swap(inner_pdu_, rhs.inner_pdu_);
+            if (inner_pdu_) {
+                inner_pdu_->parent_pdu(this);
+            }
         }
         
         /**
@@ -242,6 +245,10 @@ public:
          */
         PDU& operator=(PDU &&rhs) TINS_NOEXCEPT {
             std::swap(inner_pdu_, rhs.inner_pdu_);
+            rhs.inner_pdu_ = 0;
+            if (inner_pdu_) {
+                inner_pdu_->parent_pdu(this);
+            }
             return* this;
         }
     #endif
@@ -274,11 +281,19 @@ public:
 
     /**
      * \brief Getter for the inner PDU.
-     * \return The current inner PDU. Might be 0.
+     * \return The current inner PDU. Might be a null pointer.
      */
     PDU* inner_pdu() const {
         return inner_pdu_;
     }
+
+    /**
+     * Getter for the parent PDU
+     * \return The current parent PDU. Might be a null pointer.
+     */
+    PDU* parent_pdu() const {
+        return parent_pdu_;
+    }
     
     /**
      * \brief Releases the inner PDU.
@@ -314,7 +329,6 @@ public:
      */
     void inner_pdu(const PDU& next_pdu);
 
-
     /** 
      * \brief Serializes the whole chain of PDU's, including this one.
      *
@@ -505,7 +519,10 @@ protected:
      */
     virtual void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent) = 0;
 private:
+    void parent_pdu(PDU* parent);
+
     PDU* inner_pdu_;
+    PDU* parent_pdu_;
 };
 
 /**
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 63e78af..82a7ae0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -80,7 +80,6 @@ SET(PCAP_DEPENDENT_SOURCES
 )
 
 IF(LIBTINS_ENABLE_PCAP)
-    message(STATUS "SETTING TO ${PCAP_DEPENDENT_SOURCES}")
     SET(SOURCES ${SOURCES} ${PCAP_DEPENDENT_SOURCES})
 ENDIF() 
 
diff --git a/src/pdu.cpp b/src/pdu.cpp
index f772da3..50899d9 100644
--- a/src/pdu.cpp
+++ b/src/pdu.cpp
@@ -49,12 +49,12 @@ PDU::metadata::metadata(uint32_t header_size, PDUType current_type, PDUType next
 // PDU
 
 PDU::PDU()
-: inner_pdu_() {
+: inner_pdu_(), parent_pdu_() {
 
 }
 
 PDU::PDU(const PDU& other) 
-: inner_pdu_(0) {
+: inner_pdu_(), parent_pdu_() {
     copy_inner_pdu(other);
 }
 
@@ -101,6 +101,9 @@ bool PDU::matches_response(const uint8_t* /*ptr*/, uint32_t /*total_sz*/) const
 void PDU::inner_pdu(PDU* next_pdu) {
     delete inner_pdu_;
     inner_pdu_ = next_pdu;
+    if (inner_pdu_) {
+        inner_pdu_->parent_pdu(this);
+    }
 }
 
 void PDU::inner_pdu(const PDU& next_pdu) {
@@ -110,6 +113,9 @@ void PDU::inner_pdu(const PDU& next_pdu) {
 PDU* PDU::release_inner_pdu() {
     PDU* result = 0;
     swap(result, inner_pdu_);
+    if (result) {
+        result->parent_pdu(0);
+    }
     return result;
 }
 
@@ -132,4 +138,8 @@ void PDU::serialize(uint8_t* buffer, uint32_t total_sz, const PDU* parent) {
     write_serialization(buffer, total_sz, parent);
 }
 
+void PDU::parent_pdu(PDU* parent) {
+    parent_pdu_ = parent;
+}
+
 } // Tins
diff --git a/tests/src/pdu_test.cpp b/tests/src/pdu_test.cpp
index 5d6df86..209f982 100644
--- a/tests/src/pdu_test.cpp
+++ b/tests/src/pdu_test.cpp
@@ -17,7 +17,7 @@ public:
 };
 
 TEST_F(PDUTest, FindPDU) {
-    IP ip = IP("192.168.0.1") / TCP(22, 52) / RawPDU("Test"); 
+    IP ip = IP("192.168.0.1") / TCP(22, 52) / RawPDU("Test");
     EXPECT_TRUE(ip.find_pdu<TCP>() != NULL);
     EXPECT_TRUE(ip.find_pdu<RawPDU>() != NULL);
     EXPECT_FALSE(ip.find_pdu<UDP>() != NULL);
@@ -28,6 +28,21 @@ TEST_F(PDUTest, FindPDU) {
     EXPECT_THROW(ip.rfind_pdu<UDP>(), pdu_not_found);
 }
 
+TEST_F(PDUTest, PDURelationship) {
+    IP packet = IP("192.168.0.1") / TCP(22, 52) / RawPDU("Test");
+    IP* ip = packet.find_pdu<IP>();
+    TCP* tcp = packet.find_pdu<TCP>();
+    RawPDU* raw = packet.find_pdu<RawPDU>();
+
+    ASSERT_TRUE(ip != 0);
+    ASSERT_TRUE(tcp != 0);
+    ASSERT_TRUE(raw != 0);
+
+    EXPECT_EQ(0, ip->parent_pdu());
+    EXPECT_EQ(ip, tcp->parent_pdu());
+    EXPECT_EQ(tcp, raw->parent_pdu());
+}
+
 TEST_F(PDUTest, OperatorConcat) {
     std::string raw_payload = "Test";
     IP ip = IP("192.168.0.1") / TCP(22, 52) / RawPDU(raw_payload); 

From 4eb4dfe5fa2628825cf2b73a77b04e53ac33b2cc Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sat, 29 Apr 2017 09:53:33 -0700
Subject: [PATCH 04/73] Remove parent parameter from write_serialization

This is no longer needed as each PDU knows its parent PDU already
---
 include/tins/arp.h              |  2 +-
 include/tins/bootp.h            |  2 +-
 include/tins/dhcp.h             |  2 +-
 include/tins/dhcpv6.h           |  2 +-
 include/tins/dns.h              |  2 +-
 include/tins/dot11/dot11_base.h |  2 +-
 include/tins/dot1q.h            |  2 +-
 include/tins/dot3.h             |  2 +-
 include/tins/eapol.h            |  8 +-------
 include/tins/ethernetII.h       |  2 +-
 include/tins/icmp.h             | 11 ++---------
 include/tins/icmpv6.h           |  2 +-
 include/tins/ip.h               |  4 ++--
 include/tins/ipsec.h            |  4 ++--
 include/tins/ipv6.h             |  2 +-
 include/tins/llc.h              |  2 +-
 include/tins/loopback.h         |  2 +-
 include/tins/mpls.h             |  2 +-
 include/tins/pdu.h              | 10 +++-------
 include/tins/pdu_cacher.h       |  2 +-
 include/tins/pktap.h            |  2 +-
 include/tins/ppi.h              |  2 +-
 include/tins/pppoe.h            |  2 +-
 include/tins/radiotap.h         |  2 +-
 include/tins/rawpdu.h           |  2 +-
 include/tins/sll.h              |  2 +-
 include/tins/snap.h             |  2 +-
 include/tins/stp.h              |  2 +-
 include/tins/tcp.h              |  2 +-
 include/tins/udp.h              |  2 +-
 src/arp.cpp                     |  2 +-
 src/bootp.cpp                   |  2 +-
 src/dhcp.cpp                    |  4 ++--
 src/dhcpv6.cpp                  |  2 +-
 src/dns.cpp                     |  2 +-
 src/dot11/dot11_base.cpp        |  2 +-
 src/dot1q.cpp                   |  2 +-
 src/dot3.cpp                    |  2 +-
 src/eapol.cpp                   |  2 +-
 src/ethernetII.cpp              |  2 +-
 src/icmp.cpp                    |  2 +-
 src/icmpv6.cpp                  |  4 ++--
 src/ip.cpp                      | 10 ++++------
 src/ipsec.cpp                   |  4 ++--
 src/ipv6.cpp                    |  2 +-
 src/llc.cpp                     |  2 +-
 src/loopback.cpp                |  2 +-
 src/mpls.cpp                    |  4 ++--
 src/pdu.cpp                     | 12 ++++++------
 src/pktap.cpp                   |  2 +-
 src/ppi.cpp                     |  2 +-
 src/pppoe.cpp                   |  2 +-
 src/radiotap.cpp                |  2 +-
 src/rawpdu.cpp                  |  2 +-
 src/sll.cpp                     |  2 +-
 src/snap.cpp                    |  2 +-
 src/stp.cpp                     |  2 +-
 src/tcp.cpp                     |  3 ++-
 src/udp.cpp                     |  3 ++-
 tests/src/allocators_test.cpp   |  3 +--
 60 files changed, 79 insertions(+), 97 deletions(-)

diff --git a/include/tins/arp.h b/include/tins/arp.h
index 159500c..f6a17c0 100644
--- a/include/tins/arp.h
+++ b/include/tins/arp.h
@@ -334,7 +334,7 @@ private:
         uint32_t target_ip_address;
     } TINS_END_PACK;
 
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
 
     arp_header header_;
 };
diff --git a/include/tins/bootp.h b/include/tins/bootp.h
index 7d27175..18b3cb5 100644
--- a/include/tins/bootp.h
+++ b/include/tins/bootp.h
@@ -332,7 +332,7 @@ protected:
      */
     vend_type& vend() { return vend_; }
 
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
     
     /**
      * Struct that represents the Bootp datagram.
diff --git a/include/tins/dhcp.h b/include/tins/dhcp.h
index ea8aec5..d60da12 100644
--- a/include/tins/dhcp.h
+++ b/include/tins/dhcp.h
@@ -509,7 +509,7 @@ public:
 private:
     static const uint32_t MAX_DHCP_SIZE;
   
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
 
     template <typename T> 
     T search_and_convert(OptionTypes opt) const {
diff --git a/include/tins/dhcpv6.h b/include/tins/dhcpv6.h
index 9acb438..9c79293 100644
--- a/include/tins/dhcpv6.h
+++ b/include/tins/dhcpv6.h
@@ -890,7 +890,7 @@ public:
         return new DHCPv6(*this);
     }
 private:
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU *);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
     void write_option(const option& option, Memory::OutputMemoryStream& stream) const;
     options_type::const_iterator search_option_iterator(OptionTypes type) const;
     options_type::iterator search_option_iterator(OptionTypes type);
diff --git a/include/tins/dns.h b/include/tins/dns.h
index 7dcd77b..37eb0e0 100644
--- a/include/tins/dns.h
+++ b/include/tins/dns.h
@@ -1030,7 +1030,7 @@ private:
     uint8_t* update_dname(uint8_t* ptr, uint32_t threshold, uint32_t offset);
     static void inline_convert_v4(uint32_t value, char* output);
     static bool contains_dname(uint16_t type);
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
     void add_record(const resource& resource, const sections_type& sections);
     
     dns_header header_;
diff --git a/include/tins/dot11/dot11_base.h b/include/tins/dot11/dot11_base.h
index aa4d38e..5d8cf4a 100644
--- a/include/tins/dot11/dot11_base.h
+++ b/include/tins/dot11/dot11_base.h
@@ -554,7 +554,7 @@ private:
     Dot11(const dot11_header* header_ptr);
     
     void internal_add_option(const option& opt);
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
     options_type::const_iterator search_option_iterator(OptionTypes type) const;
     options_type::iterator search_option_iterator(OptionTypes type);
 
diff --git a/include/tins/dot1q.h b/include/tins/dot1q.h
index 7499d04..0e7a08b 100644
--- a/include/tins/dot1q.h
+++ b/include/tins/dot1q.h
@@ -197,7 +197,7 @@ public:
      */
     bool matches_response(const uint8_t* ptr, uint32_t total_sz) const;
 private:
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
 
     TINS_BEGIN_PACK
     struct dot1q_header {
diff --git a/include/tins/dot3.h b/include/tins/dot3.h
index 1c6f248..81c75b3 100644
--- a/include/tins/dot3.h
+++ b/include/tins/dot3.h
@@ -199,7 +199,7 @@ private:
         uint16_t length;
     } TINS_END_PACK;
 
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
 
     dot3_header header_;
 };
diff --git a/include/tins/eapol.h b/include/tins/eapol.h
index a24ad3a..0a2ce5f 100644
--- a/include/tins/eapol.h
+++ b/include/tins/eapol.h
@@ -185,13 +185,7 @@ protected:
      */
     virtual void write_body(Memory::OutputMemoryStream& stream) = 0;
 private:
-    /** 
-     * \brief Serialices this EAPOL PDU.
-     * \param buffer The buffer in which the PDU will be serialized.
-     * \param total_sz The size available in the buffer.
-     * \param parent The PDU that's one level below this one on the stack.
-     */
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
 
     eapol_header header_;
 };
diff --git a/include/tins/ethernetII.h b/include/tins/ethernetII.h
index 8fda537..ddea06a 100644
--- a/include/tins/ethernetII.h
+++ b/include/tins/ethernetII.h
@@ -208,7 +208,7 @@ private:
         uint16_t payload_type;
     } TINS_END_PACK;
     
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
 
     ethernet_header header_;
 };
diff --git a/include/tins/icmp.h b/include/tins/icmp.h
index c357a37..9249a3a 100644
--- a/include/tins/icmp.h
+++ b/include/tins/icmp.h
@@ -493,15 +493,8 @@ private:
         } un;
     } TINS_END_PACK;
 
-    void checksum(uint16_t new_check);
-    
-    /** \brief Serialices this ICMP PDU.
-     * \param buffer The buffer in which the PDU will be serialized.
-     * \param total_sz The size available in the buffer.
-     * \param parent The PDU that's one level below this one on the stack.
-     */
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
-    
+    void checksum(uint16_t new_check);    
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
     uint32_t get_adjusted_inner_pdu_size() const;
     void try_parse_extensions(Memory::InputMemoryStream& stream);
     bool are_extensions_allowed() const;
diff --git a/include/tins/icmpv6.h b/include/tins/icmpv6.h
index 9cb3dad..85a4122 100644
--- a/include/tins/icmpv6.h
+++ b/include/tins/icmpv6.h
@@ -1559,7 +1559,7 @@ private:
     } TINS_END_PACK;
     
     void internal_add_option(const option& option);
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
     bool has_options() const;
     void write_option(const option& opt, Memory::OutputMemoryStream& stream);
     void parse_options(Memory::InputMemoryStream& stream);
diff --git a/include/tins/ip.h b/include/tins/ip.h
index f951fca..94fc18b 100644
--- a/include/tins/ip.h
+++ b/include/tins/ip.h
@@ -756,10 +756,10 @@ private:
     void head_len(small_uint<4> new_head_len);
     void tot_len(uint16_t new_tot_len);
 
-    void prepare_for_serialize(const PDU* parent);
+    void prepare_for_serialize();
     void internal_add_option(const option& option);
     void init_ip_fields();
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
     void write_option(const option& opt, Memory::OutputMemoryStream& stream);
     void add_route_option(option_identifier id, const generic_route_option_type& data);
     generic_route_option_type search_route_option(option_identifier id) const;
diff --git a/include/tins/ipsec.h b/include/tins/ipsec.h
index 6eebd8b..b4ca2a6 100644
--- a/include/tins/ipsec.h
+++ b/include/tins/ipsec.h
@@ -168,7 +168,7 @@ private:
         uint32_t spi, seq_number;
     };
 
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU *);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
     
     ipsec_header header_;
     byte_array icv_;
@@ -258,7 +258,7 @@ private:
         uint32_t spi, seq_number;
     };
 
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU *);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
     
     ipsec_header header_;
 };
diff --git a/include/tins/ipv6.h b/include/tins/ipv6.h
index 7998467..5b951f7 100644
--- a/include/tins/ipv6.h
+++ b/include/tins/ipv6.h
@@ -320,7 +320,7 @@ public:
      */
     const ext_header* search_header(ExtensionHeader id) const;
 private:
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
     void set_last_next_header(uint8_t value);
     static void write_header(const ext_header& header, Memory::OutputMemoryStream& stream);
     static bool is_extension_header(uint8_t header_id);
diff --git a/include/tins/llc.h b/include/tins/llc.h
index e7c73a3..98bc7e4 100644
--- a/include/tins/llc.h
+++ b/include/tins/llc.h
@@ -401,7 +401,7 @@ private:
     typedef std::vector<uint8_t> field_type;
     typedef std::list<field_type> field_list;
 
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
 
     llchdr header_;
     uint8_t control_field_length_;
diff --git a/include/tins/loopback.h b/include/tins/loopback.h
index f242486..3b5d541 100644
--- a/include/tins/loopback.h
+++ b/include/tins/loopback.h
@@ -117,7 +117,7 @@ public:
     void send(PacketSender& sender, const NetworkInterface& iface);
     #endif // BSD
 private:
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
 
     uint32_t family_;
 };
diff --git a/include/tins/mpls.h b/include/tins/mpls.h
index 9da8419..11c056d 100644
--- a/include/tins/mpls.h
+++ b/include/tins/mpls.h
@@ -147,7 +147,7 @@ private:
         uint8_t ttl;
     } TINS_END_PACK;
 
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
 
     mpls_header header_;
 };
diff --git a/include/tins/pdu.h b/include/tins/pdu.h
index bde9a1b..1e79467 100644
--- a/include/tins/pdu.h
+++ b/include/tins/pdu.h
@@ -494,19 +494,16 @@ protected:
      * is calculated.
      * 
      * By default, this method does nothing
-     * 
-     * \param parent The parent PDU.
      */
-    virtual void prepare_for_serialize(const PDU* parent);
+    virtual void prepare_for_serialize();
 
     /** 
      * \brief Serializes this PDU and propagates this action to child PDUs.
      *
      * \param buffer The buffer in which to store this PDU's serialization.
      * \param total_sz The total size of the buffer.
-     * \param parent The parent PDU. Will be 0 if there's the parent does not exist.
      */
-    void serialize(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void serialize(uint8_t* buffer, uint32_t total_sz);
 
     /** 
      * \brief Serializes this TCP PDU.
@@ -515,9 +512,8 @@ protected:
      * serialization.
      * \param buffer The buffer in which the PDU will be serialized.
      * \param total_sz The size available in the buffer.
-     * \param parent The PDU that's one level below this one on the stack. Might be 0.
      */
-    virtual void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent) = 0;
+    virtual void write_serialization(uint8_t* buffer, uint32_t total_sz) = 0;
 private:
     void parent_pdu(PDU* parent);
 
diff --git a/include/tins/pdu_cacher.h b/include/tins/pdu_cacher.h
index ebab9b1..9e27c71 100644
--- a/include/tins/pdu_cacher.h
+++ b/include/tins/pdu_cacher.h
@@ -144,7 +144,7 @@ public:
         return cached_.pdu_type();
     }
 private:
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent) {
+    void write_serialization(uint8_t* buffer, uint32_t total_sz) {
         if (cached_serialization_.size() != total_sz) {
             cached_serialization_ = cached_.serialize();
         }
diff --git a/include/tins/pktap.h b/include/tins/pktap.h
index 52f9c25..88f2216 100644
--- a/include/tins/pktap.h
+++ b/include/tins/pktap.h
@@ -107,7 +107,7 @@ private:
         uint8_t ecommand[20];
     };
 
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
 
     pktap_header header_;
 };
diff --git a/include/tins/ppi.h b/include/tins/ppi.h
index 96dd734..8f6934e 100644
--- a/include/tins/ppi.h
+++ b/include/tins/ppi.h
@@ -125,7 +125,7 @@ public:
         return new PPI(*this);
     }
 private:
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU *);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
     void parse_80211(const uint8_t* buffer, uint32_t total_sz);
 
     struct ppi_header {
diff --git a/include/tins/pppoe.h b/include/tins/pppoe.h
index 75a2d58..42842a0 100644
--- a/include/tins/pppoe.h
+++ b/include/tins/pppoe.h
@@ -390,7 +390,7 @@ public:
      */
     std::string generic_error() const;
 private:
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU *);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
     
     template<typename T>
     void add_tag_iterable(TagTypes id, const T& data) {
diff --git a/include/tins/radiotap.h b/include/tins/radiotap.h
index 61bf599..c1a9c6a 100644
--- a/include/tins/radiotap.h
+++ b/include/tins/radiotap.h
@@ -486,7 +486,7 @@ private:
     } TINS_END_PACK;
     
     void init();
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
     uint32_t find_extra_flag_fields_size(const uint8_t* buffer, uint32_t total_sz);
 
     template <size_t n>
diff --git a/include/tins/rawpdu.h b/include/tins/rawpdu.h
index fde9de6..872b29c 100644
--- a/include/tins/rawpdu.h
+++ b/include/tins/rawpdu.h
@@ -201,7 +201,7 @@ public:
         return new RawPDU(*this);
     }
 private:
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
 
     payload_type payload_;
 };
diff --git a/include/tins/sll.h b/include/tins/sll.h
index 0f05365..62a7444 100644
--- a/include/tins/sll.h
+++ b/include/tins/sll.h
@@ -174,7 +174,7 @@ private:
         uint16_t protocol;
     } TINS_END_PACK;
     
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU *);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
     
     sll_header header_;
 };
diff --git a/include/tins/snap.h b/include/tins/snap.h
index 18740e5..5687a7d 100644
--- a/include/tins/snap.h
+++ b/include/tins/snap.h
@@ -177,7 +177,7 @@ private:
         uint16_t eth_type;
     } TINS_END_PACK;
     
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
     
     snap_header snap_;
 };
diff --git a/include/tins/stp.h b/include/tins/stp.h
index f927855..45ef83d 100644
--- a/include/tins/stp.h
+++ b/include/tins/stp.h
@@ -305,7 +305,7 @@ private:
     static bpdu_id_type convert(const pvt_bpdu_id& id);
     static pvt_bpdu_id convert(const bpdu_id_type& id);
     
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
     
     stp_header header_;
 };
diff --git a/include/tins/tcp.h b/include/tins/tcp.h
index 257caa5..68d3f85 100644
--- a/include/tins/tcp.h
+++ b/include/tins/tcp.h
@@ -610,7 +610,7 @@ private:
     }
     
     void internal_add_option(const option& option);
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
     void checksum(uint16_t new_check);
     void update_options_size();
     options_type::const_iterator search_option_iterator(OptionTypes type) const;
diff --git a/include/tins/udp.h b/include/tins/udp.h
index 041f1d5..aaabe7b 100644
--- a/include/tins/udp.h
+++ b/include/tins/udp.h
@@ -191,7 +191,7 @@ private:
         uint16_t check;
     } TINS_END_PACK;
 
-    void write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent);
+    void write_serialization(uint8_t* buffer, uint32_t total_sz);
 
     udp_header header_;
 };
diff --git a/src/arp.cpp b/src/arp.cpp
index e4ed5e2..462aad9 100644
--- a/src/arp.cpp
+++ b/src/arp.cpp
@@ -113,7 +113,7 @@ uint32_t ARP::header_size() const {
     return sizeof(header_);
 }
 
-void ARP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU *) {
+void ARP::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
     stream.write(header_);
 }
diff --git a/src/bootp.cpp b/src/bootp.cpp
index 0611ec8..666ed63 100644
--- a/src/bootp.cpp
+++ b/src/bootp.cpp
@@ -115,7 +115,7 @@ void BootP::vend(const vend_type& newvend_) {
     vend_ = newvend_;
 }
 
-void BootP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* /*parent*/) {
+void BootP::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
     stream.write(bootp_);
     stream.write(vend_.begin(), vend_.end());
diff --git a/src/dhcp.cpp b/src/dhcp.cpp
index 99e132a..e5cd5cb 100644
--- a/src/dhcp.cpp
+++ b/src/dhcp.cpp
@@ -247,7 +247,7 @@ uint32_t DHCP::header_size() const {
     return static_cast<uint32_t>(BootP::header_size() - vend().size() + size_);
 }
 
-void DHCP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent) {
+void DHCP::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     if (size_) {
         vend_type& result = BootP::vend();
         result.resize(size_);
@@ -261,7 +261,7 @@ void DHCP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* pa
             stream.write(it->data_ptr(), it->data_size());
         }
     }
-    BootP::write_serialization(buffer, total_sz, parent);
+    BootP::write_serialization(buffer, total_sz);
 }
 
 } // Tins
diff --git a/src/dhcpv6.cpp b/src/dhcpv6.cpp
index db2e4b9..4354a4c 100644
--- a/src/dhcpv6.cpp
+++ b/src/dhcpv6.cpp
@@ -161,7 +161,7 @@ bool DHCPv6::matches_response(const uint8_t* ptr, uint32_t total_sz) const {
     return false;
 }
 
-void DHCPv6::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU *) {
+void DHCPv6::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     const uint32_t required_size = is_relay_message() ? 2 : 4;
     OutputMemoryStream stream(buffer, total_sz);
     stream.write(header_data_, required_size);
diff --git a/src/dns.cpp b/src/dns.cpp
index 48cb06f..b2bd97d 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -386,7 +386,7 @@ uint32_t DNS::compose_name(const uint8_t* ptr, char* out_ptr) const {
     return end_ptr - start_ptr;
 }
 
-void DNS::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* /*parent*/) {
+void DNS::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
     stream.write(header_);
     stream.write(records_data_.begin(), records_data_.end());
diff --git a/src/dot11/dot11_base.cpp b/src/dot11/dot11_base.cpp
index 82765eb..cc71d47 100644
--- a/src/dot11/dot11_base.cpp
+++ b/src/dot11/dot11_base.cpp
@@ -213,7 +213,7 @@ void Dot11::send(PacketSender& sender, const NetworkInterface& iface) {
 }
 #endif // _WIN32
 
-void Dot11::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* /*parent*/) {
+void Dot11::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
     stream.write(header_);
     write_ext_header(stream);
diff --git a/src/dot1q.cpp b/src/dot1q.cpp
index 2a3c74a..d561957 100644
--- a/src/dot1q.cpp
+++ b/src/dot1q.cpp
@@ -105,7 +105,7 @@ uint32_t Dot1Q::trailer_size() const {
     }
 }
 
-void Dot1Q::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU *) {
+void Dot1Q::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
     if (inner_pdu()) {
         Constants::Ethernet::e flag;
diff --git a/src/dot3.cpp b/src/dot3.cpp
index ec0113b..4d53d02 100644
--- a/src/dot3.cpp
+++ b/src/dot3.cpp
@@ -134,7 +134,7 @@ bool Dot3::matches_response(const uint8_t* ptr, uint32_t total_sz) const {
     return false;
 }
 
-void Dot3::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* /*parent*/) {
+void Dot3::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
     header_.length = Endian::host_to_be<uint16_t>(size() - sizeof(header_));
     stream.write(header_);
diff --git a/src/eapol.cpp b/src/eapol.cpp
index ae8ebe1..1401be2 100644
--- a/src/eapol.cpp
+++ b/src/eapol.cpp
@@ -106,7 +106,7 @@ void EAPOL::type(uint8_t new_type) {
     header_.type = new_type;
 }
 
-void EAPOL::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU *) {
+void EAPOL::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
     length(total_sz - 4);
     stream.write(header_);
diff --git a/src/ethernetII.cpp b/src/ethernetII.cpp
index d5a19e8..dc81c67 100644
--- a/src/ethernetII.cpp
+++ b/src/ethernetII.cpp
@@ -161,7 +161,7 @@ bool EthernetII::matches_response(const uint8_t* ptr, uint32_t total_sz) const {
     return false;
 }
 
-void EthernetII::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* /*parent*/) {
+void EthernetII::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
     if (inner_pdu()) {
         Constants::Ethernet::e flag;
diff --git a/src/icmp.cpp b/src/icmp.cpp
index 63bb299..4aa9e68 100644
--- a/src/icmp.cpp
+++ b/src/icmp.cpp
@@ -216,7 +216,7 @@ void ICMP::use_length_field(bool value) {
     header_.un.rfc4884.length = value ? 1 : 0;
 }
 
-void ICMP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU *) {
+void ICMP::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
 
     // If extensions are allowed and we have to set the length field
diff --git a/src/icmpv6.cpp b/src/icmpv6.cpp
index 0dc4d76..ceeb909 100644
--- a/src/icmpv6.cpp
+++ b/src/icmpv6.cpp
@@ -281,7 +281,7 @@ bool ICMPv6::matches_response(const uint8_t* ptr, uint32_t total_sz) const {
     return false;
 }
 
-void ICMPv6::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent) {
+void ICMPv6::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
 
     // If extensions are allowed and we have to set the length field
@@ -361,7 +361,7 @@ void ICMPv6::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU*
         );
     }
 
-    const Tins::IPv6* ipv6 = tins_cast<const Tins::IPv6*>(parent);
+    const Tins::IPv6* ipv6 = tins_cast<const Tins::IPv6*>(parent_pdu());
     if (ipv6) {
         uint32_t checksum = Utils::pseudoheader_checksum(
             ipv6->src_addr(),  
diff --git a/src/ip.cpp b/src/ip.cpp
index 125d2b3..67f1b04 100644
--- a/src/ip.cpp
+++ b/src/ip.cpp
@@ -418,14 +418,14 @@ PDU* IP::recv_response(PacketSender& sender, const NetworkInterface &) {
     return sender.recv_l3(*this, 0, sizeof(link_addr), type);
 }
 
-void IP::prepare_for_serialize(const PDU* parent) {
-    if (!parent && header_.saddr == 0) {
+void IP::prepare_for_serialize() {
+    if (!parent_pdu()&& header_.saddr == 0) {
         NetworkInterface iface(dst_addr());
         src_addr(iface.addresses().ip_addr);
     }
 }
 
-void IP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent) {
+void IP::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
     checksum(0);
     if (inner_pdu()) {
@@ -446,12 +446,10 @@ void IP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* pare
     uint16_t original_frag_off = header_.frag_off;
     
     #if __FreeBSD__ || defined(__FreeBSD_kernel__) || __APPLE__
-        if (!parent) {
+        if (!parent_pdu()) {
             total_sz = Endian::host_to_be<uint16_t>(total_sz);
             header_.frag_off = Endian::be_to_host(header_.frag_off);
         }
-    #else
-    Internals::unused(parent);
     #endif
     tot_len(total_sz);
     head_len(static_cast<uint8_t>(header_size() / sizeof(uint32_t)));
diff --git a/src/ipsec.cpp b/src/ipsec.cpp
index d136447..dde3007 100644
--- a/src/ipsec.cpp
+++ b/src/ipsec.cpp
@@ -94,7 +94,7 @@ uint32_t IPSecAH::header_size() const {
     return static_cast<uint32_t>(sizeof(header_) + icv_.size());
 }
 
-void IPSecAH::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU *) {
+void IPSecAH::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     if (inner_pdu()) {
         next_header(Internals::pdu_flag_to_ip_type(inner_pdu()->pdu_type()));
     }
@@ -131,7 +131,7 @@ uint32_t IPSecESP::header_size() const {
     return sizeof(header_);
 }
 
-void IPSecESP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU *) {
+void IPSecESP::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream output(buffer, total_sz);
     output.write(header_);
 }
diff --git a/src/ipv6.cpp b/src/ipv6.cpp
index f346c30..1f855b8 100644
--- a/src/ipv6.cpp
+++ b/src/ipv6.cpp
@@ -243,7 +243,7 @@ bool IPv6::matches_response(const uint8_t* ptr, uint32_t total_sz) const {
     return false;
 }
 
-void IPv6::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* /*parent*/) {
+void IPv6::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
     if (inner_pdu()) {
         uint8_t new_flag = Internals::pdu_flag_to_ip_type(inner_pdu()->pdu_type());
diff --git a/src/llc.cpp b/src/llc.cpp
index 43d3aa4..cb9ee68 100644
--- a/src/llc.cpp
+++ b/src/llc.cpp
@@ -196,7 +196,7 @@ void LLC::clear_information_fields() {
 	information_fields_.clear();
 }
 
-void LLC::write_serialization(uint8_t* buffer, uint32_t total_sz, const Tins::PDU* /*parent*/) {
+void LLC::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
     if (inner_pdu() && inner_pdu()->pdu_type() == PDU::STP) {
         dsap(0x42);
diff --git a/src/loopback.cpp b/src/loopback.cpp
index 62345eb..9b473ab 100644
--- a/src/loopback.cpp
+++ b/src/loopback.cpp
@@ -90,7 +90,7 @@ uint32_t Loopback::header_size() const {
     return sizeof(family_);
 }
 
-void Loopback::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU *) {
+void Loopback::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
     #ifndef _WIN32
     if (tins_cast<const Tins::IP*>(inner_pdu())) {
diff --git a/src/mpls.cpp b/src/mpls.cpp
index f7ffd42..0fce533 100644
--- a/src/mpls.cpp
+++ b/src/mpls.cpp
@@ -91,10 +91,10 @@ uint32_t MPLS::header_size() const {
     return sizeof(header_);
 }
 
-void MPLS::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent) {
+void MPLS::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
     // If we have a parent PDU, we might set the bottom-of-stack field
-    if (parent) {
+    if (parent_pdu()) {
         // We'll set it if we either don't have a child or we have one and it's not MPLS
         if (!inner_pdu() || inner_pdu()->pdu_type() != PDU::MPLS) {
             bottom_of_stack(1);
diff --git a/src/pdu.cpp b/src/pdu.cpp
index 50899d9..989bd37 100644
--- a/src/pdu.cpp
+++ b/src/pdu.cpp
@@ -73,7 +73,7 @@ void PDU::copy_inner_pdu(const PDU& pdu) {
     }
 }
 
-void PDU::prepare_for_serialize(const PDU* /*parent*/) {
+void PDU::prepare_for_serialize() {
 }
 
 uint32_t PDU::size() const {
@@ -121,21 +121,21 @@ PDU* PDU::release_inner_pdu() {
 
 PDU::serialization_type PDU::serialize() {
     vector<uint8_t> buffer(size());
-    serialize(&buffer[0], static_cast<uint32_t>(buffer.size()), 0);
+    serialize(&buffer[0], static_cast<uint32_t>(buffer.size()));
     return buffer;
 }
 
-void PDU::serialize(uint8_t* buffer, uint32_t total_sz, const PDU* parent) {
+void PDU::serialize(uint8_t* buffer, uint32_t total_sz) {
     uint32_t sz = header_size() + trailer_size();
     // Must not happen...
     #ifdef TINS_DEBUG
     assert(total_sz >= sz);
     #endif
-    prepare_for_serialize(parent);
+    prepare_for_serialize();
     if (inner_pdu_) {
-        inner_pdu_->serialize(buffer + header_size(), total_sz - sz, this);
+        inner_pdu_->serialize(buffer + header_size(), total_sz - sz);
     }
-    write_serialization(buffer, total_sz, parent);
+    write_serialization(buffer, total_sz);
 }
 
 void PDU::parent_pdu(PDU* parent) {
diff --git a/src/pktap.cpp b/src/pktap.cpp
index 280346f..d475664 100644
--- a/src/pktap.cpp
+++ b/src/pktap.cpp
@@ -65,7 +65,7 @@ uint32_t PKTAP::header_size() const {
     return sizeof(header_);
 }
 
-void PKTAP::write_serialization(uint8_t* /*buffer*/, uint32_t /*total_sz*/, const PDU* /*parent*/) {
+void PKTAP::write_serialization(uint8_t* /*buffer*/, uint32_t /*total_sz*/) {
     throw pdu_not_serializable();
 }
 
diff --git a/src/ppi.cpp b/src/ppi.cpp
index 1246570..89155bb 100644
--- a/src/ppi.cpp
+++ b/src/ppi.cpp
@@ -94,7 +94,7 @@ uint32_t PPI::header_size() const {
     return static_cast<uint32_t>(sizeof(header_) + data_.size());
 }
 
-void PPI::write_serialization(uint8_t* /*buffer*/, uint32_t /*total_sz*/, const PDU *) {
+void PPI::write_serialization(uint8_t* /*buffer*/, uint32_t /*total_sz*/) {
     throw pdu_not_serializable();
 }
 
diff --git a/src/pppoe.cpp b/src/pppoe.cpp
index c991691..2439f87 100644
--- a/src/pppoe.cpp
+++ b/src/pppoe.cpp
@@ -108,7 +108,7 @@ uint32_t PPPoE::header_size() const {
     return sizeof(header_) + tags_size_;
 }
 
-void PPPoE::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU *) {
+void PPPoE::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
     if (tags_size_ > 0) {
         payload_length(tags_size_);
diff --git a/src/radiotap.cpp b/src/radiotap.cpp
index 69326dc..a994583 100644
--- a/src/radiotap.cpp
+++ b/src/radiotap.cpp
@@ -507,7 +507,7 @@ bool RadioTap::matches_response(const uint8_t* ptr, uint32_t total_sz) const {
     return false;
 }
 
-void RadioTap::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* /*parent*/) {
+void RadioTap::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
     uint8_t* buffer_start = buffer;
     radio_.it_len = Endian::host_to_le<uint16_t>(header_size());
diff --git a/src/rawpdu.cpp b/src/rawpdu.cpp
index 07a3196..cf056f8 100644
--- a/src/rawpdu.cpp
+++ b/src/rawpdu.cpp
@@ -48,7 +48,7 @@ uint32_t RawPDU::header_size() const {
     return static_cast<uint32_t>(payload_.size());
 }
 
-void RawPDU::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU *) {
+void RawPDU::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
     stream.write(payload_.begin(), payload_.end());
 }
diff --git a/src/sll.cpp b/src/sll.cpp
index 72ca2e5..9279da5 100644
--- a/src/sll.cpp
+++ b/src/sll.cpp
@@ -81,7 +81,7 @@ uint32_t SLL::header_size() const {
     return sizeof(header_);
 }
 
-void SLL::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU *) {
+void SLL::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
     if (inner_pdu()) {
         Constants::Ethernet::e flag = Internals::pdu_flag_to_ether_type(
diff --git a/src/snap.cpp b/src/snap.cpp
index bf1d327..6b15fc8 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -91,7 +91,7 @@ uint32_t SNAP::header_size() const {
     return sizeof(snap_);
 }
 
-void SNAP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* /*parent*/) {
+void SNAP::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
     if (inner_pdu()) {
         Constants::Ethernet::e flag = Internals::pdu_flag_to_ether_type(
diff --git a/src/stp.cpp b/src/stp.cpp
index e8fd603..77a8028 100644
--- a/src/stp.cpp
+++ b/src/stp.cpp
@@ -106,7 +106,7 @@ void STP::bridge_id(const bpdu_id_type& id) {
     header_.bridge_id = convert(id);
 }
 
-void STP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU *) {
+void STP::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
     stream.write(header_);
 }
diff --git a/src/tcp.cpp b/src/tcp.cpp
index b295e09..beb0d55 100644
--- a/src/tcp.cpp
+++ b/src/tcp.cpp
@@ -295,7 +295,7 @@ uint32_t TCP::header_size() const {
     return sizeof(header_) + total_options_size_;
 }
 
-void TCP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent) {
+void TCP::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
     // Set checksum to 0, we'll calculate it at the end
     checksum(0);
@@ -311,6 +311,7 @@ void TCP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* par
     }
 
     uint32_t check = 0;
+    const PDU* parent = parent_pdu();
     if (const Tins::IP* ip_packet = tins_cast<const Tins::IP*>(parent)) {
         check = Utils::pseudoheader_checksum(
             ip_packet->src_addr(),  
diff --git a/src/udp.cpp b/src/udp.cpp
index 318eb46..b52fd55 100644
--- a/src/udp.cpp
+++ b/src/udp.cpp
@@ -117,7 +117,7 @@ uint32_t pseudoheader_checksum(IPv4Address source_ip, IPv4Address dest_ip, uint3
     return checksum;
 }
 
-void UDP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent) {
+void UDP::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
     // Set checksum to 0, we'll calculate it at the end
     header_.check = 0;
@@ -129,6 +129,7 @@ void UDP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* par
     }
     stream.write(header_);
     uint32_t checksum = 0;
+    const PDU* parent = parent_pdu();
     if (const Tins::IP* ip_packet = tins_cast<const Tins::IP*>(parent)) {
         checksum = Utils::pseudoheader_checksum(
             ip_packet->src_addr(), 
diff --git a/tests/src/allocators_test.cpp b/tests/src/allocators_test.cpp
index e298f8c..b50a9d3 100644
--- a/tests/src/allocators_test.cpp
+++ b/tests/src/allocators_test.cpp
@@ -52,8 +52,7 @@ public:
     DummyPDU* clone() const { return new DummyPDU<n>(*this); }
     uint32_t header_size() const { return (uint32_t)buffer.size(); }
     PDUType pdu_type() const { return pdu_flag; }
-    void write_serialization(uint8_t* data, uint32_t, const PDU *) 
-    { 
+    void write_serialization(uint8_t* data, uint32_t) { 
         std::copy(buffer.begin(), buffer.end(), data);
     }
     

From 2c6ef2a5c05dce8553872fa65aa92a82956bed63 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sat, 29 Apr 2017 09:56:26 -0700
Subject: [PATCH 05/73] Update license date to 2017

---
 LICENSE                                         | 2 +-
 examples/arpmonitor.cpp                         | 2 +-
 examples/arpspoofing.cpp                        | 2 +-
 examples/beacon_display.cpp                     | 2 +-
 examples/defragmenter.cpp                       | 2 +-
 examples/dns_queries.cpp                        | 2 +-
 examples/dns_spoof.cpp                          | 2 +-
 examples/dns_stats.cpp                          | 2 +-
 examples/http_requests.cpp                      | 2 +-
 examples/portscan.cpp                           | 2 +-
 examples/stream_dump.cpp                        | 2 +-
 examples/tcp_connection_close.cpp               | 2 +-
 examples/traceroute.cpp                         | 2 +-
 examples/wps_detect.cpp                         | 2 +-
 include/tins/address_range.h                    | 2 +-
 include/tins/arp.h                              | 2 +-
 include/tins/bootp.h                            | 2 +-
 include/tins/constants.h                        | 2 +-
 include/tins/crypto.h                           | 2 +-
 include/tins/cxxstd.h                           | 2 +-
 include/tins/data_link_type.h                   | 2 +-
 include/tins/dhcp.h                             | 2 +-
 include/tins/dhcpv6.h                           | 2 +-
 include/tins/dns.h                              | 2 +-
 include/tins/dot11.h                            | 2 +-
 include/tins/dot11/dot11_assoc.h                | 2 +-
 include/tins/dot11/dot11_auth.h                 | 2 +-
 include/tins/dot11/dot11_base.h                 | 2 +-
 include/tins/dot11/dot11_beacon.h               | 2 +-
 include/tins/dot11/dot11_control.h              | 2 +-
 include/tins/dot11/dot11_data.h                 | 2 +-
 include/tins/dot11/dot11_mgmt.h                 | 2 +-
 include/tins/dot11/dot11_probe.h                | 2 +-
 include/tins/dot1q.h                            | 2 +-
 include/tins/dot3.h                             | 2 +-
 include/tins/eapol.h                            | 2 +-
 include/tins/endianness.h                       | 2 +-
 include/tins/ethernetII.h                       | 2 +-
 include/tins/exceptions.h                       | 2 +-
 include/tins/handshake_capturer.h               | 2 +-
 include/tins/hw_address.h                       | 2 +-
 include/tins/icmp.h                             | 2 +-
 include/tins/icmp_extension.h                   | 2 +-
 include/tins/icmpv6.h                           | 2 +-
 include/tins/ieee802_3.h                        | 2 +-
 include/tins/internals.h                        | 2 +-
 include/tins/ip.h                               | 2 +-
 include/tins/ip_address.h                       | 2 +-
 include/tins/ip_reassembler.h                   | 2 +-
 include/tins/ipsec.h                            | 2 +-
 include/tins/ipv6.h                             | 2 +-
 include/tins/ipv6_address.h                     | 2 +-
 include/tins/llc.h                              | 2 +-
 include/tins/loopback.h                         | 2 +-
 include/tins/macros.h                           | 2 +-
 include/tins/memory_helpers.h                   | 2 +-
 include/tins/mpls.h                             | 2 +-
 include/tins/network_interface.h                | 2 +-
 include/tins/offline_packet_filter.h            | 2 +-
 include/tins/packet.h                           | 2 +-
 include/tins/packet_sender.h                    | 2 +-
 include/tins/packet_writer.h                    | 2 +-
 include/tins/pdu.h                              | 2 +-
 include/tins/pdu_allocator.h                    | 2 +-
 include/tins/pdu_cacher.h                       | 2 +-
 include/tins/pdu_option.h                       | 2 +-
 include/tins/pktap.h                            | 2 +-
 include/tins/ppi.h                              | 2 +-
 include/tins/pppoe.h                            | 2 +-
 include/tins/radiotap.h                         | 2 +-
 include/tins/rawpdu.h                           | 2 +-
 include/tins/rsn_information.h                  | 2 +-
 include/tins/sll.h                              | 2 +-
 include/tins/small_uint.h                       | 2 +-
 include/tins/snap.h                             | 2 +-
 include/tins/sniffer.h                          | 2 +-
 include/tins/stp.h                              | 2 +-
 include/tins/tcp.h                              | 2 +-
 include/tins/tcp_ip/ack_tracker.h               | 2 +-
 include/tins/tcp_ip/data_tracker.h              | 2 +-
 include/tins/tcp_ip/flow.h                      | 2 +-
 include/tins/tcp_ip/stream.h                    | 2 +-
 include/tins/tcp_ip/stream_follower.h           | 2 +-
 include/tins/tcp_ip/stream_identifier.h         | 2 +-
 include/tins/tcp_stream.h                       | 2 +-
 include/tins/timestamp.h                        | 2 +-
 include/tins/tins.h                             | 2 +-
 include/tins/udp.h                              | 2 +-
 include/tins/utils.h                            | 2 +-
 src/address_range.cpp                           | 2 +-
 src/arp.cpp                                     | 2 +-
 src/bootp.cpp                                   | 2 +-
 src/crypto.cpp                                  | 2 +-
 src/dhcp.cpp                                    | 2 +-
 src/dhcpv6.cpp                                  | 2 +-
 src/dns.cpp                                     | 2 +-
 src/dot11/dot11_assoc.cpp                       | 2 +-
 src/dot11/dot11_auth.cpp                        | 2 +-
 src/dot11/dot11_base.cpp                        | 2 +-
 src/dot11/dot11_beacon.cpp                      | 2 +-
 src/dot11/dot11_control.cpp                     | 2 +-
 src/dot11/dot11_data.cpp                        | 2 +-
 src/dot11/dot11_mgmt.cpp                        | 2 +-
 src/dot11/dot11_probe.cpp                       | 2 +-
 src/dot1q.cpp                                   | 2 +-
 src/dot3.cpp                                    | 2 +-
 src/eapol.cpp                                   | 2 +-
 src/ethernetII.cpp                              | 2 +-
 src/handshake_capturer.cpp                      | 2 +-
 src/icmp.cpp                                    | 2 +-
 src/icmp_extension.cpp                          | 2 +-
 src/icmpv6.cpp                                  | 2 +-
 src/internals.cpp                               | 2 +-
 src/ip.cpp                                      | 2 +-
 src/ip_address.cpp                              | 2 +-
 src/ip_reassembler.cpp                          | 2 +-
 src/ipsec.cpp                                   | 2 +-
 src/ipv6.cpp                                    | 2 +-
 src/ipv6_address.cpp                            | 2 +-
 src/llc.cpp                                     | 2 +-
 src/loopback.cpp                                | 2 +-
 src/mpls.cpp                                    | 2 +-
 src/network_interface.cpp                       | 2 +-
 src/offline_packet_filter.cpp                   | 2 +-
 src/packet_sender.cpp                           | 2 +-
 src/packet_writer.cpp                           | 2 +-
 src/pdu.cpp                                     | 2 +-
 src/pktap.cpp                                   | 2 +-
 src/ppi.cpp                                     | 2 +-
 src/pppoe.cpp                                   | 2 +-
 src/radiotap.cpp                                | 2 +-
 src/rawpdu.cpp                                  | 2 +-
 src/rsn_information.cpp                         | 2 +-
 src/sll.cpp                                     | 2 +-
 src/snap.cpp                                    | 2 +-
 src/sniffer.cpp                                 | 2 +-
 src/stp.cpp                                     | 2 +-
 src/tcp.cpp                                     | 2 +-
 src/tcp_ip/ack_tracker.cpp                      | 2 +-
 src/tcp_ip/data_tracker.cpp                     | 2 +-
 src/tcp_ip/flow.cpp                             | 2 +-
 src/tcp_ip/stream.cpp                           | 2 +-
 src/tcp_ip/stream_follower.cpp                  | 2 +-
 src/tcp_ip/stream_identifier.cpp                | 2 +-
 src/tcp_stream.cpp                              | 2 +-
 src/timestamp.cpp                               | 2 +-
 src/udp.cpp                                     | 2 +-
 src/utils.cpp                                   | 2 +-
 tests/active_tests/include/active_test.h        | 2 +-
 tests/active_tests/include/active_test_runner.h | 2 +-
 tests/active_tests/include/configuration.h      | 2 +-
 tests/active_tests/include/ipv4_tests.h         | 2 +-
 tests/active_tests/include/packet_capturer.h    | 2 +-
 tests/active_tests/include/tcp_tests.h          | 2 +-
 tests/active_tests/include/test_utils.h         | 2 +-
 tests/active_tests/include/utils_tests.h        | 2 +-
 tests/active_tests/src/active_test.cpp          | 2 +-
 tests/active_tests/src/active_test_runner.cpp   | 2 +-
 tests/active_tests/src/configuration.cpp        | 2 +-
 tests/active_tests/src/ipv4_tests.cpp           | 2 +-
 tests/active_tests/src/main.cpp                 | 2 +-
 tests/active_tests/src/packet_capturer.cpp      | 2 +-
 tests/active_tests/src/tcp_tests.cpp            | 2 +-
 tests/active_tests/src/test_utils.cpp           | 2 +-
 tests/active_tests/src/utils_test.cpp           | 2 +-
 165 files changed, 165 insertions(+), 165 deletions(-)

diff --git a/LICENSE b/LICENSE
index 092b6eb..c4009ed 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012-2014, Matias Fontanini
+Copyright (c) 2012-2017, Matias Fontanini
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/examples/arpmonitor.cpp b/examples/arpmonitor.cpp
index 20d4008..16911a4 100644
--- a/examples/arpmonitor.cpp
+++ b/examples/arpmonitor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/examples/arpspoofing.cpp b/examples/arpspoofing.cpp
index 997bc9f..7a7c756 100644
--- a/examples/arpspoofing.cpp
+++ b/examples/arpspoofing.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/examples/beacon_display.cpp b/examples/beacon_display.cpp
index f84186c..5d3ccd1 100644
--- a/examples/beacon_display.cpp
+++ b/examples/beacon_display.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/examples/defragmenter.cpp b/examples/defragmenter.cpp
index d2ef4ae..6665b89 100644
--- a/examples/defragmenter.cpp
+++ b/examples/defragmenter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/examples/dns_queries.cpp b/examples/dns_queries.cpp
index a395b0c..b9cc8c0 100644
--- a/examples/dns_queries.cpp
+++ b/examples/dns_queries.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/examples/dns_spoof.cpp b/examples/dns_spoof.cpp
index ab97c43..b3e4bdf 100644
--- a/examples/dns_spoof.cpp
+++ b/examples/dns_spoof.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/examples/dns_stats.cpp b/examples/dns_stats.cpp
index a2da49d..c08111f 100644
--- a/examples/dns_stats.cpp
+++ b/examples/dns_stats.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/examples/http_requests.cpp b/examples/http_requests.cpp
index a748967..9597220 100644
--- a/examples/http_requests.cpp
+++ b/examples/http_requests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/examples/portscan.cpp b/examples/portscan.cpp
index 31db51e..63affe3 100644
--- a/examples/portscan.cpp
+++ b/examples/portscan.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/examples/stream_dump.cpp b/examples/stream_dump.cpp
index ebb43ef..f413626 100644
--- a/examples/stream_dump.cpp
+++ b/examples/stream_dump.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/examples/tcp_connection_close.cpp b/examples/tcp_connection_close.cpp
index 714a378..1298fdf 100644
--- a/examples/tcp_connection_close.cpp
+++ b/examples/tcp_connection_close.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/examples/traceroute.cpp b/examples/traceroute.cpp
index cb78e3c..09a7991 100644
--- a/examples/traceroute.cpp
+++ b/examples/traceroute.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/examples/wps_detect.cpp b/examples/wps_detect.cpp
index d61cae3..9f4e8ca 100644
--- a/examples/wps_detect.cpp
+++ b/examples/wps_detect.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/address_range.h b/include/tins/address_range.h
index 070f296..fb10cf6 100644
--- a/include/tins/address_range.h
+++ b/include/tins/address_range.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/arp.h b/include/tins/arp.h
index f6a17c0..4fdf53b 100644
--- a/include/tins/arp.h
+++ b/include/tins/arp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/bootp.h b/include/tins/bootp.h
index 18b3cb5..7d88936 100644
--- a/include/tins/bootp.h
+++ b/include/tins/bootp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/constants.h b/include/tins/constants.h
index 6fdcba3..c5d2a70 100644
--- a/include/tins/constants.h
+++ b/include/tins/constants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/crypto.h b/include/tins/crypto.h
index 850f831..4207f9d 100644
--- a/include/tins/crypto.h
+++ b/include/tins/crypto.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/cxxstd.h b/include/tins/cxxstd.h
index 5ea4723..e37e9a5 100644
--- a/include/tins/cxxstd.h
+++ b/include/tins/cxxstd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/data_link_type.h b/include/tins/data_link_type.h
index cf6843a..b502fd5 100644
--- a/include/tins/data_link_type.h
+++ b/include/tins/data_link_type.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/dhcp.h b/include/tins/dhcp.h
index d60da12..7fe33d1 100644
--- a/include/tins/dhcp.h
+++ b/include/tins/dhcp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/dhcpv6.h b/include/tins/dhcpv6.h
index 9c79293..9af14a6 100644
--- a/include/tins/dhcpv6.h
+++ b/include/tins/dhcpv6.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/dns.h b/include/tins/dns.h
index 37eb0e0..0ce1314 100644
--- a/include/tins/dns.h
+++ b/include/tins/dns.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/dot11.h b/include/tins/dot11.h
index 4e79832..1dcb03a 100644
--- a/include/tins/dot11.h
+++ b/include/tins/dot11.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/dot11/dot11_assoc.h b/include/tins/dot11/dot11_assoc.h
index 76fade8..3cbdf73 100644
--- a/include/tins/dot11/dot11_assoc.h
+++ b/include/tins/dot11/dot11_assoc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/dot11/dot11_auth.h b/include/tins/dot11/dot11_auth.h
index f58f6a9..fe4cb6d 100644
--- a/include/tins/dot11/dot11_auth.h
+++ b/include/tins/dot11/dot11_auth.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/dot11/dot11_base.h b/include/tins/dot11/dot11_base.h
index 5d8cf4a..3f0fba4 100644
--- a/include/tins/dot11/dot11_base.h
+++ b/include/tins/dot11/dot11_base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/dot11/dot11_beacon.h b/include/tins/dot11/dot11_beacon.h
index 2edf7ee..5c59c54 100644
--- a/include/tins/dot11/dot11_beacon.h
+++ b/include/tins/dot11/dot11_beacon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/dot11/dot11_control.h b/include/tins/dot11/dot11_control.h
index 2a421eb..e5abb61 100644
--- a/include/tins/dot11/dot11_control.h
+++ b/include/tins/dot11/dot11_control.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/dot11/dot11_data.h b/include/tins/dot11/dot11_data.h
index 5ecd9a9..0c1bd37 100644
--- a/include/tins/dot11/dot11_data.h
+++ b/include/tins/dot11/dot11_data.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/dot11/dot11_mgmt.h b/include/tins/dot11/dot11_mgmt.h
index 09ad501..e7dda2b 100644
--- a/include/tins/dot11/dot11_mgmt.h
+++ b/include/tins/dot11/dot11_mgmt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/dot11/dot11_probe.h b/include/tins/dot11/dot11_probe.h
index fa7db64..eccd5f7 100644
--- a/include/tins/dot11/dot11_probe.h
+++ b/include/tins/dot11/dot11_probe.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/dot1q.h b/include/tins/dot1q.h
index 0e7a08b..b25b877 100644
--- a/include/tins/dot1q.h
+++ b/include/tins/dot1q.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/dot3.h b/include/tins/dot3.h
index 81c75b3..019a1de 100644
--- a/include/tins/dot3.h
+++ b/include/tins/dot3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/eapol.h b/include/tins/eapol.h
index 0a2ce5f..afe8ae3 100644
--- a/include/tins/eapol.h
+++ b/include/tins/eapol.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/endianness.h b/include/tins/endianness.h
index dad1c33..9303e81 100644
--- a/include/tins/endianness.h
+++ b/include/tins/endianness.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/ethernetII.h b/include/tins/ethernetII.h
index ddea06a..bbf3aca 100644
--- a/include/tins/ethernetII.h
+++ b/include/tins/ethernetII.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/exceptions.h b/include/tins/exceptions.h
index 6db106b..0b6405a 100644
--- a/include/tins/exceptions.h
+++ b/include/tins/exceptions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/handshake_capturer.h b/include/tins/handshake_capturer.h
index 978a08d..113cb7c 100644
--- a/include/tins/handshake_capturer.h
+++ b/include/tins/handshake_capturer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/hw_address.h b/include/tins/hw_address.h
index 543b2a1..fde80d4 100644
--- a/include/tins/hw_address.h
+++ b/include/tins/hw_address.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/icmp.h b/include/tins/icmp.h
index 9249a3a..135e3c4 100644
--- a/include/tins/icmp.h
+++ b/include/tins/icmp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/icmp_extension.h b/include/tins/icmp_extension.h
index 4193368..99ade0a 100644
--- a/include/tins/icmp_extension.h
+++ b/include/tins/icmp_extension.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/icmpv6.h b/include/tins/icmpv6.h
index 85a4122..c1b58d1 100644
--- a/include/tins/icmpv6.h
+++ b/include/tins/icmpv6.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/ieee802_3.h b/include/tins/ieee802_3.h
index efeb683..18f69a1 100644
--- a/include/tins/ieee802_3.h
+++ b/include/tins/ieee802_3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/internals.h b/include/tins/internals.h
index b0b031e..3e78030 100644
--- a/include/tins/internals.h
+++ b/include/tins/internals.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/ip.h b/include/tins/ip.h
index 94fc18b..c2c0682 100644
--- a/include/tins/ip.h
+++ b/include/tins/ip.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/ip_address.h b/include/tins/ip_address.h
index 8b7eff4..01055f4 100644
--- a/include/tins/ip_address.h
+++ b/include/tins/ip_address.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/ip_reassembler.h b/include/tins/ip_reassembler.h
index 52bb615..51a521f 100644
--- a/include/tins/ip_reassembler.h
+++ b/include/tins/ip_reassembler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/ipsec.h b/include/tins/ipsec.h
index b4ca2a6..198b7ea 100644
--- a/include/tins/ipsec.h
+++ b/include/tins/ipsec.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/ipv6.h b/include/tins/ipv6.h
index 5b951f7..727bd2b 100644
--- a/include/tins/ipv6.h
+++ b/include/tins/ipv6.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/ipv6_address.h b/include/tins/ipv6_address.h
index 992727a..e04e240 100644
--- a/include/tins/ipv6_address.h
+++ b/include/tins/ipv6_address.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/llc.h b/include/tins/llc.h
index 98bc7e4..4b2ae33 100644
--- a/include/tins/llc.h
+++ b/include/tins/llc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/loopback.h b/include/tins/loopback.h
index 3b5d541..125dba2 100644
--- a/include/tins/loopback.h
+++ b/include/tins/loopback.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/macros.h b/include/tins/macros.h
index e687296..c3da983 100644
--- a/include/tins/macros.h
+++ b/include/tins/macros.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/memory_helpers.h b/include/tins/memory_helpers.h
index f1afc2b..0e7f0e8 100644
--- a/include/tins/memory_helpers.h
+++ b/include/tins/memory_helpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/mpls.h b/include/tins/mpls.h
index 11c056d..404d1fc 100644
--- a/include/tins/mpls.h
+++ b/include/tins/mpls.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/network_interface.h b/include/tins/network_interface.h
index b31308d..896d60a 100644
--- a/include/tins/network_interface.h
+++ b/include/tins/network_interface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/offline_packet_filter.h b/include/tins/offline_packet_filter.h
index d1c3b07..3a76c56 100644
--- a/include/tins/offline_packet_filter.h
+++ b/include/tins/offline_packet_filter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/packet.h b/include/tins/packet.h
index 13450f7..b96a2f1 100644
--- a/include/tins/packet.h
+++ b/include/tins/packet.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/packet_sender.h b/include/tins/packet_sender.h
index a5caa2c..130a9b2 100644
--- a/include/tins/packet_sender.h
+++ b/include/tins/packet_sender.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/packet_writer.h b/include/tins/packet_writer.h
index 5daea6d..ef9f2c9 100644
--- a/include/tins/packet_writer.h
+++ b/include/tins/packet_writer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/pdu.h b/include/tins/pdu.h
index 1e79467..6fad174 100644
--- a/include/tins/pdu.h
+++ b/include/tins/pdu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/pdu_allocator.h b/include/tins/pdu_allocator.h
index e64d80f..30b9f33 100644
--- a/include/tins/pdu_allocator.h
+++ b/include/tins/pdu_allocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/pdu_cacher.h b/include/tins/pdu_cacher.h
index 9e27c71..0e8ccdc 100644
--- a/include/tins/pdu_cacher.h
+++ b/include/tins/pdu_cacher.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/pdu_option.h b/include/tins/pdu_option.h
index 63be671..97d704f 100644
--- a/include/tins/pdu_option.h
+++ b/include/tins/pdu_option.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/pktap.h b/include/tins/pktap.h
index 88f2216..ce88f84 100644
--- a/include/tins/pktap.h
+++ b/include/tins/pktap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/ppi.h b/include/tins/ppi.h
index 8f6934e..b24d8cf 100644
--- a/include/tins/ppi.h
+++ b/include/tins/ppi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/pppoe.h b/include/tins/pppoe.h
index 42842a0..40b1b80 100644
--- a/include/tins/pppoe.h
+++ b/include/tins/pppoe.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/radiotap.h b/include/tins/radiotap.h
index c1a9c6a..0855146 100644
--- a/include/tins/radiotap.h
+++ b/include/tins/radiotap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/rawpdu.h b/include/tins/rawpdu.h
index 872b29c..056d412 100644
--- a/include/tins/rawpdu.h
+++ b/include/tins/rawpdu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/rsn_information.h b/include/tins/rsn_information.h
index 359aad5..13a4325 100644
--- a/include/tins/rsn_information.h
+++ b/include/tins/rsn_information.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/sll.h b/include/tins/sll.h
index 62a7444..5a802bd 100644
--- a/include/tins/sll.h
+++ b/include/tins/sll.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/small_uint.h b/include/tins/small_uint.h
index 8f40c91..7e04cb3 100644
--- a/include/tins/small_uint.h
+++ b/include/tins/small_uint.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/snap.h b/include/tins/snap.h
index 5687a7d..3035254 100644
--- a/include/tins/snap.h
+++ b/include/tins/snap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/sniffer.h b/include/tins/sniffer.h
index 7b1cc5e..a3c7144 100644
--- a/include/tins/sniffer.h
+++ b/include/tins/sniffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/stp.h b/include/tins/stp.h
index 45ef83d..29c0711 100644
--- a/include/tins/stp.h
+++ b/include/tins/stp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/tcp.h b/include/tins/tcp.h
index 68d3f85..0f11fa4 100644
--- a/include/tins/tcp.h
+++ b/include/tins/tcp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/tcp_ip/ack_tracker.h b/include/tins/tcp_ip/ack_tracker.h
index 606f089..69700f5 100644
--- a/include/tins/tcp_ip/ack_tracker.h
+++ b/include/tins/tcp_ip/ack_tracker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/tcp_ip/data_tracker.h b/include/tins/tcp_ip/data_tracker.h
index 9736687..461c2cd 100644
--- a/include/tins/tcp_ip/data_tracker.h
+++ b/include/tins/tcp_ip/data_tracker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/tcp_ip/flow.h b/include/tins/tcp_ip/flow.h
index 81c65f9..d157e13 100644
--- a/include/tins/tcp_ip/flow.h
+++ b/include/tins/tcp_ip/flow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/tcp_ip/stream.h b/include/tins/tcp_ip/stream.h
index 1ea21ac..ea86de8 100644
--- a/include/tins/tcp_ip/stream.h
+++ b/include/tins/tcp_ip/stream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/tcp_ip/stream_follower.h b/include/tins/tcp_ip/stream_follower.h
index 6648329..5283b75 100644
--- a/include/tins/tcp_ip/stream_follower.h
+++ b/include/tins/tcp_ip/stream_follower.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/tcp_ip/stream_identifier.h b/include/tins/tcp_ip/stream_identifier.h
index bfa85c5..9f6c019 100644
--- a/include/tins/tcp_ip/stream_identifier.h
+++ b/include/tins/tcp_ip/stream_identifier.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/tcp_stream.h b/include/tins/tcp_stream.h
index 42ae322..0952176 100644
--- a/include/tins/tcp_stream.h
+++ b/include/tins/tcp_stream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/timestamp.h b/include/tins/timestamp.h
index 274ae7d..503dc15 100644
--- a/include/tins/timestamp.h
+++ b/include/tins/timestamp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/tins.h b/include/tins/tins.h
index 2756476..86ff7bf 100644
--- a/include/tins/tins.h
+++ b/include/tins/tins.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/udp.h b/include/tins/udp.h
index aaabe7b..c50245b 100644
--- a/include/tins/udp.h
+++ b/include/tins/udp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/tins/utils.h b/include/tins/utils.h
index 2d5b709..7beff5d 100644
--- a/include/tins/utils.h
+++ b/include/tins/utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/address_range.cpp b/src/address_range.cpp
index 89df754..a016ed9 100644
--- a/src/address_range.cpp
+++ b/src/address_range.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/arp.cpp b/src/arp.cpp
index 462aad9..80d11d8 100644
--- a/src/arp.cpp
+++ b/src/arp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/bootp.cpp b/src/bootp.cpp
index 666ed63..8ba8e57 100644
--- a/src/bootp.cpp
+++ b/src/bootp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/crypto.cpp b/src/crypto.cpp
index bc8adb4..eafcf4b 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/dhcp.cpp b/src/dhcp.cpp
index e5cd5cb..fcd4eec 100644
--- a/src/dhcp.cpp
+++ b/src/dhcp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/dhcpv6.cpp b/src/dhcpv6.cpp
index 4354a4c..1904bcb 100644
--- a/src/dhcpv6.cpp
+++ b/src/dhcpv6.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/dns.cpp b/src/dns.cpp
index b2bd97d..1ccea4c 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/dot11/dot11_assoc.cpp b/src/dot11/dot11_assoc.cpp
index 1bc1045..23edbd2 100644
--- a/src/dot11/dot11_assoc.cpp
+++ b/src/dot11/dot11_assoc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/dot11/dot11_auth.cpp b/src/dot11/dot11_auth.cpp
index 7da33b0..d8af8ce 100644
--- a/src/dot11/dot11_auth.cpp
+++ b/src/dot11/dot11_auth.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/dot11/dot11_base.cpp b/src/dot11/dot11_base.cpp
index cc71d47..0417064 100644
--- a/src/dot11/dot11_base.cpp
+++ b/src/dot11/dot11_base.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/dot11/dot11_beacon.cpp b/src/dot11/dot11_beacon.cpp
index 5c7753e..0c742f8 100644
--- a/src/dot11/dot11_beacon.cpp
+++ b/src/dot11/dot11_beacon.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/dot11/dot11_control.cpp b/src/dot11/dot11_control.cpp
index 83ab999..dc4ba95 100644
--- a/src/dot11/dot11_control.cpp
+++ b/src/dot11/dot11_control.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/dot11/dot11_data.cpp b/src/dot11/dot11_data.cpp
index a389d32..d346a6d 100644
--- a/src/dot11/dot11_data.cpp
+++ b/src/dot11/dot11_data.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/dot11/dot11_mgmt.cpp b/src/dot11/dot11_mgmt.cpp
index 54a3507..9c42ff9 100644
--- a/src/dot11/dot11_mgmt.cpp
+++ b/src/dot11/dot11_mgmt.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/dot11/dot11_probe.cpp b/src/dot11/dot11_probe.cpp
index a29cc21..dd06f06 100644
--- a/src/dot11/dot11_probe.cpp
+++ b/src/dot11/dot11_probe.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/dot1q.cpp b/src/dot1q.cpp
index d561957..5fca01c 100644
--- a/src/dot1q.cpp
+++ b/src/dot1q.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/dot3.cpp b/src/dot3.cpp
index 4d53d02..d4241a0 100644
--- a/src/dot3.cpp
+++ b/src/dot3.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/eapol.cpp b/src/eapol.cpp
index 1401be2..1cb74e6 100644
--- a/src/eapol.cpp
+++ b/src/eapol.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/ethernetII.cpp b/src/ethernetII.cpp
index dc81c67..df85505 100644
--- a/src/ethernetII.cpp
+++ b/src/ethernetII.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/handshake_capturer.cpp b/src/handshake_capturer.cpp
index 13dc266..80b0029 100644
--- a/src/handshake_capturer.cpp
+++ b/src/handshake_capturer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/icmp.cpp b/src/icmp.cpp
index 4aa9e68..8695ccb 100644
--- a/src/icmp.cpp
+++ b/src/icmp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/icmp_extension.cpp b/src/icmp_extension.cpp
index d00b37a..095c127 100644
--- a/src/icmp_extension.cpp
+++ b/src/icmp_extension.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/icmpv6.cpp b/src/icmpv6.cpp
index ceeb909..78cb7f5 100644
--- a/src/icmpv6.cpp
+++ b/src/icmpv6.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/internals.cpp b/src/internals.cpp
index 6c39b22..7f9b384 100644
--- a/src/internals.cpp
+++ b/src/internals.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/ip.cpp b/src/ip.cpp
index 67f1b04..ded12e5 100644
--- a/src/ip.cpp
+++ b/src/ip.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/ip_address.cpp b/src/ip_address.cpp
index e0e97d3..f1a7d44 100644
--- a/src/ip_address.cpp
+++ b/src/ip_address.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/ip_reassembler.cpp b/src/ip_reassembler.cpp
index 6bb735f..61c9578 100644
--- a/src/ip_reassembler.cpp
+++ b/src/ip_reassembler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/ipsec.cpp b/src/ipsec.cpp
index dde3007..688053b 100644
--- a/src/ipsec.cpp
+++ b/src/ipsec.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/ipv6.cpp b/src/ipv6.cpp
index 1f855b8..ba766a0 100644
--- a/src/ipv6.cpp
+++ b/src/ipv6.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/ipv6_address.cpp b/src/ipv6_address.cpp
index 9954777..3833df3 100644
--- a/src/ipv6_address.cpp
+++ b/src/ipv6_address.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/llc.cpp b/src/llc.cpp
index cb9ee68..371aa01 100644
--- a/src/llc.cpp
+++ b/src/llc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/loopback.cpp b/src/loopback.cpp
index 9b473ab..20899cf 100644
--- a/src/loopback.cpp
+++ b/src/loopback.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/mpls.cpp b/src/mpls.cpp
index 0fce533..d982b33 100644
--- a/src/mpls.cpp
+++ b/src/mpls.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/network_interface.cpp b/src/network_interface.cpp
index 2c0e9a1..47c75cc 100644
--- a/src/network_interface.cpp
+++ b/src/network_interface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/offline_packet_filter.cpp b/src/offline_packet_filter.cpp
index e909bff..74710b0 100644
--- a/src/offline_packet_filter.cpp
+++ b/src/offline_packet_filter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/packet_sender.cpp b/src/packet_sender.cpp
index 919c402..e95bdd2 100644
--- a/src/packet_sender.cpp
+++ b/src/packet_sender.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/packet_writer.cpp b/src/packet_writer.cpp
index f6f7eaf..5e74b9e 100644
--- a/src/packet_writer.cpp
+++ b/src/packet_writer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/pdu.cpp b/src/pdu.cpp
index 989bd37..203b070 100644
--- a/src/pdu.cpp
+++ b/src/pdu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/pktap.cpp b/src/pktap.cpp
index d475664..60df8a6 100644
--- a/src/pktap.cpp
+++ b/src/pktap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/ppi.cpp b/src/ppi.cpp
index 89155bb..51bd00f 100644
--- a/src/ppi.cpp
+++ b/src/ppi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/pppoe.cpp b/src/pppoe.cpp
index 2439f87..e936906 100644
--- a/src/pppoe.cpp
+++ b/src/pppoe.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/radiotap.cpp b/src/radiotap.cpp
index a994583..1477360 100644
--- a/src/radiotap.cpp
+++ b/src/radiotap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/rawpdu.cpp b/src/rawpdu.cpp
index cf056f8..1559c01 100644
--- a/src/rawpdu.cpp
+++ b/src/rawpdu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/rsn_information.cpp b/src/rsn_information.cpp
index cc58616..55c67ba 100644
--- a/src/rsn_information.cpp
+++ b/src/rsn_information.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/sll.cpp b/src/sll.cpp
index 9279da5..289b6fd 100644
--- a/src/sll.cpp
+++ b/src/sll.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/snap.cpp b/src/snap.cpp
index 6b15fc8..33010f1 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/sniffer.cpp b/src/sniffer.cpp
index 11de400..68bbe44 100644
--- a/src/sniffer.cpp
+++ b/src/sniffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/stp.cpp b/src/stp.cpp
index 77a8028..4592cec 100644
--- a/src/stp.cpp
+++ b/src/stp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/tcp.cpp b/src/tcp.cpp
index beb0d55..6a7ffe2 100644
--- a/src/tcp.cpp
+++ b/src/tcp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/tcp_ip/ack_tracker.cpp b/src/tcp_ip/ack_tracker.cpp
index 9d3e326..101a28e 100644
--- a/src/tcp_ip/ack_tracker.cpp
+++ b/src/tcp_ip/ack_tracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/tcp_ip/data_tracker.cpp b/src/tcp_ip/data_tracker.cpp
index 8b922c4..9256de2 100644
--- a/src/tcp_ip/data_tracker.cpp
+++ b/src/tcp_ip/data_tracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/tcp_ip/flow.cpp b/src/tcp_ip/flow.cpp
index 2aeee4a..0742d56 100644
--- a/src/tcp_ip/flow.cpp
+++ b/src/tcp_ip/flow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/tcp_ip/stream.cpp b/src/tcp_ip/stream.cpp
index 3e62ace..90561cd 100644
--- a/src/tcp_ip/stream.cpp
+++ b/src/tcp_ip/stream.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/tcp_ip/stream_follower.cpp b/src/tcp_ip/stream_follower.cpp
index 63c7c71..c471f32 100644
--- a/src/tcp_ip/stream_follower.cpp
+++ b/src/tcp_ip/stream_follower.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/tcp_ip/stream_identifier.cpp b/src/tcp_ip/stream_identifier.cpp
index bee1d13..1ddf80c 100644
--- a/src/tcp_ip/stream_identifier.cpp
+++ b/src/tcp_ip/stream_identifier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/tcp_stream.cpp b/src/tcp_stream.cpp
index d2cafde..cddcabf 100644
--- a/src/tcp_stream.cpp
+++ b/src/tcp_stream.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/timestamp.cpp b/src/timestamp.cpp
index 9d2517d..f69d3a0 100644
--- a/src/timestamp.cpp
+++ b/src/timestamp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/udp.cpp b/src/udp.cpp
index b52fd55..74cd93d 100644
--- a/src/udp.cpp
+++ b/src/udp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/utils.cpp b/src/utils.cpp
index cd23685..dd4a8c1 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tests/active_tests/include/active_test.h b/tests/active_tests/include/active_test.h
index f4ffd39..97bb780 100644
--- a/tests/active_tests/include/active_test.h
+++ b/tests/active_tests/include/active_test.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tests/active_tests/include/active_test_runner.h b/tests/active_tests/include/active_test_runner.h
index dfa8705..3d38173 100644
--- a/tests/active_tests/include/active_test_runner.h
+++ b/tests/active_tests/include/active_test_runner.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tests/active_tests/include/configuration.h b/tests/active_tests/include/configuration.h
index 8ec9d31..0bfca92 100644
--- a/tests/active_tests/include/configuration.h
+++ b/tests/active_tests/include/configuration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tests/active_tests/include/ipv4_tests.h b/tests/active_tests/include/ipv4_tests.h
index 5eab0cd..779f950 100644
--- a/tests/active_tests/include/ipv4_tests.h
+++ b/tests/active_tests/include/ipv4_tests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tests/active_tests/include/packet_capturer.h b/tests/active_tests/include/packet_capturer.h
index 83134d7..c09d43e 100644
--- a/tests/active_tests/include/packet_capturer.h
+++ b/tests/active_tests/include/packet_capturer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tests/active_tests/include/tcp_tests.h b/tests/active_tests/include/tcp_tests.h
index 36375dc..a7ae5bd 100644
--- a/tests/active_tests/include/tcp_tests.h
+++ b/tests/active_tests/include/tcp_tests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tests/active_tests/include/test_utils.h b/tests/active_tests/include/test_utils.h
index 5d1302b..cd50221 100644
--- a/tests/active_tests/include/test_utils.h
+++ b/tests/active_tests/include/test_utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tests/active_tests/include/utils_tests.h b/tests/active_tests/include/utils_tests.h
index 9f517af..959d46b 100644
--- a/tests/active_tests/include/utils_tests.h
+++ b/tests/active_tests/include/utils_tests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tests/active_tests/src/active_test.cpp b/tests/active_tests/src/active_test.cpp
index 6fac5aa..f6b0a0a 100644
--- a/tests/active_tests/src/active_test.cpp
+++ b/tests/active_tests/src/active_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tests/active_tests/src/active_test_runner.cpp b/tests/active_tests/src/active_test_runner.cpp
index b0f84f4..6ce9815 100644
--- a/tests/active_tests/src/active_test_runner.cpp
+++ b/tests/active_tests/src/active_test_runner.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tests/active_tests/src/configuration.cpp b/tests/active_tests/src/configuration.cpp
index d751051..a44d278 100644
--- a/tests/active_tests/src/configuration.cpp
+++ b/tests/active_tests/src/configuration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tests/active_tests/src/ipv4_tests.cpp b/tests/active_tests/src/ipv4_tests.cpp
index 6d22d4c..3e55fad 100644
--- a/tests/active_tests/src/ipv4_tests.cpp
+++ b/tests/active_tests/src/ipv4_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tests/active_tests/src/main.cpp b/tests/active_tests/src/main.cpp
index 4f9100d..cffad27 100644
--- a/tests/active_tests/src/main.cpp
+++ b/tests/active_tests/src/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tests/active_tests/src/packet_capturer.cpp b/tests/active_tests/src/packet_capturer.cpp
index 1d09abb..cf05c6e 100644
--- a/tests/active_tests/src/packet_capturer.cpp
+++ b/tests/active_tests/src/packet_capturer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tests/active_tests/src/tcp_tests.cpp b/tests/active_tests/src/tcp_tests.cpp
index 57f4484..5ca520a 100644
--- a/tests/active_tests/src/tcp_tests.cpp
+++ b/tests/active_tests/src/tcp_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tests/active_tests/src/test_utils.cpp b/tests/active_tests/src/test_utils.cpp
index 2370149..769327c 100644
--- a/tests/active_tests/src/test_utils.cpp
+++ b/tests/active_tests/src/test_utils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tests/active_tests/src/utils_test.cpp b/tests/active_tests/src/utils_test.cpp
index e9fa257..5f3ff5e 100644
--- a/tests/active_tests/src/utils_test.cpp
+++ b/tests/active_tests/src/utils_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

From c7273ddd30f2954714c334d29d9c509a77223289 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sat, 29 Apr 2017 11:23:15 -0700
Subject: [PATCH 06/73] Add PDU iterator class

---
 include/tins/pdu_iterator.h     | 312 ++++++++++++++++++++++++++++++++
 include/tins/tins.h             |   1 +
 src/CMakeLists.txt              |   1 +
 src/pdu_iterator.cpp            | 104 +++++++++++
 tests/src/CMakeLists.txt        |   1 +
 tests/src/pdu_iterator_test.cpp |  55 ++++++
 6 files changed, 474 insertions(+)
 create mode 100644 include/tins/pdu_iterator.h
 create mode 100644 src/pdu_iterator.cpp
 create mode 100644 tests/src/pdu_iterator_test.cpp

diff --git a/include/tins/pdu_iterator.h b/include/tins/pdu_iterator.h
new file mode 100644
index 0000000..abc5685
--- /dev/null
+++ b/include/tins/pdu_iterator.h
@@ -0,0 +1,312 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef TINS_PDU_ITERATOR_H
+#define TINS_PDU_ITERATOR_H
+
+#include <iterator>
+
+namespace Tins {
+
+class PDU;
+class Packet;
+
+/**
+ * Base class for PDU iterators
+ */
+template <typename Concrete>
+class PDUIteratorBase {
+public:
+    /**
+     * Iterator's category
+     */
+    typedef std::bidirectional_iterator_tag iterator_category;
+
+    /**
+     * Iterator difference type
+     */
+    typedef std::ptrdiff_t difference_type;
+
+    /**
+     * Advances this iterator
+     */
+    Concrete& operator++() {
+        advance();
+        return static_cast<Concrete&>(*this);
+    }
+
+    /**
+     * Advances this iterator
+     */
+    Concrete operator++(int) {
+        Concrete output = static_cast<Concrete&>(*this);
+        advance();
+        return output;
+    }
+
+    /**
+     * Moves this iterator back
+     */
+    Concrete& operator--() {
+        retreat();
+        return static_cast<Concrete&>(*this);
+    }
+
+    /**
+     * Moves this iterator back
+     */
+    Concrete operator--(int) {
+        Concrete output = static_cast<Concrete&>(*this);
+        retreat();
+        return output;
+    }
+private:
+    void advance() {
+        Concrete& self = static_cast<Concrete&>(*this);
+        self = Concrete(self->inner_pdu());
+    }
+
+    void retreat() {
+        Concrete& self = static_cast<Concrete&>(*this);
+        self = Concrete(self->parent_pdu());
+    }
+};
+
+/**
+ * Compares iterators for equality
+ *
+ * \param lhs The left hand side iterator to be compared
+ * \param rhs The right hand side iterator to be compared
+ */
+template <typename Concrete>
+bool operator==(const PDUIteratorBase<Concrete>& lhs, const PDUIteratorBase<Concrete>& rhs) {
+    const PDU* lhs_pdu = &*static_cast<const Concrete&>(lhs);
+    const PDU* rhs_pdu = &*static_cast<const Concrete&>(rhs);
+    return lhs_pdu == rhs_pdu;
+}
+
+/**
+ * Compares iterators for equality
+ *
+ * \param lhs The left hand side iterator to be compared
+ * \param rhs The right hand side iterator to be compared
+ */
+template <typename Concrete>
+bool operator!=(const PDUIteratorBase<Concrete>& lhs, const PDUIteratorBase<Concrete>& rhs) {
+    return !(lhs == rhs);
+}
+
+/**
+ * Iterator class for PDUs
+ */
+class PDUIterator : public PDUIteratorBase<PDUIterator> {
+public:
+    /**
+     * The used pointer type
+     */
+    typedef PDU* pointer;
+
+    /**
+     * The used reference type
+     */
+    typedef PDU& reference;
+
+    /**
+     * The used value type
+     */
+    typedef PDU& value_type;
+
+    /**
+     * Constructs an iterator using a PDU
+     *
+     * \param pdu The PDU to be used for iteration
+     */
+    PDUIterator(pointer pdu);
+
+    /**
+     * Get the stored PDU pointer
+     */
+    pointer operator->();
+
+    /**
+     * Get the stored PDU pointer
+     */
+    pointer operator->() const;
+
+    /**
+     * Dereference and get the stored PDU
+     */
+    value_type operator*();
+
+    /**
+     * Dereference and get the stored PDU
+     */
+    const value_type operator*() const;
+private:
+    pointer pdu_;
+};
+
+/**
+ * Const iterator class for PDUs
+ */
+class ConstPDUIterator : public PDUIteratorBase<PDUIterator> {
+public:
+    /**
+     * The used pointer type
+     */
+    typedef const PDU* pointer;
+
+    /**
+     * The used reference type
+     */
+    typedef const PDU& reference;
+
+    /**
+     * The used value type
+     */
+    typedef const PDU& value_type;
+
+    /**
+     * Constructs an iterator using a PDU
+     *
+     * \param pdu The PDU to be used for iteration
+     */
+    ConstPDUIterator(pointer pdu);
+
+    /**
+     * Construct from a PDU iterator
+     */
+    ConstPDUIterator(PDUIterator iterator);
+
+    /**
+     * Get the stored PDU pointer
+     */
+    pointer operator->() const;
+
+    /**
+     * Dereference and get the stored PDU
+     */
+    value_type operator*() const;
+private:
+    pointer pdu_;
+};
+
+/*
+ * \brief PDU iterator class
+ *
+ * This class allows iterating all PDUs in a packet.
+ *
+ * Note that this keeps pointers to the original PDUs so you need to guarantee that they're
+ * still in scope while you iterate them.
+ */
+template <typename Iterator>
+class PDUIteratorRange {
+public:
+    /**
+     * Constructs a PDU iterator range
+     *
+     * \param start The beginning of the range
+     * \param end The end of the range
+     */
+    PDUIteratorRange(Iterator start, Iterator end)
+    : start_(start), end_(end) {
+
+    }
+
+    template <typename OtherIterator>
+    PDUIteratorRange(const PDUIteratorRange<OtherIterator>& other)
+    : start_(&*other.begin()), end_(&*other.end()) {
+
+    } 
+
+    /*
+     * Gets the beginning of the range
+     */ 
+    Iterator begin() {
+        return start_;
+    }
+
+    /*
+     * Gets the beginning of the range
+     */ 
+    Iterator begin() const {
+        return start_;
+    }
+
+    /*
+     * Gets the end of the range
+     */ 
+    Iterator end() {
+        return end_;
+    }
+
+    /*
+     * Gets the end of the range
+     */ 
+    Iterator end() const {
+        return end_;
+    }
+private:
+    Iterator start_;
+    Iterator end_;
+};
+
+/**
+ * Creates an iterator range out of a PDU
+ */
+PDUIteratorRange<PDUIterator> iterate_pdus(PDU* pdu);
+
+/**
+ * Creates an iterator range out of a PDU
+ */
+PDUIteratorRange<PDUIterator> iterate_pdus(PDU& pdu);
+
+/**
+ * Creates an iterator range out of a PDU
+ */
+PDUIteratorRange<PDUIterator> iterate_pdus(Packet& packet);
+
+/**
+ * Creates an iterator range out of a PDU
+ */
+PDUIteratorRange<ConstPDUIterator> iterate_pdus(const PDU* pdu);
+
+/**
+ * Creates an iterator range out of a PDU
+ */
+PDUIteratorRange<ConstPDUIterator> iterate_pdus(const PDU& pdu);
+
+/**
+ * Creates an iterator range out of a packet
+ */
+PDUIteratorRange<ConstPDUIterator> iterate_pdus(const Packet& packet);
+
+} // Tins
+
+#endif // TINS_PDU_ITERATOR_H
diff --git a/include/tins/tins.h b/include/tins/tins.h
index 86ff7bf..55a5efd 100644
--- a/include/tins/tins.h
+++ b/include/tins/tins.h
@@ -74,5 +74,6 @@
 #include "ipsec.h"
 #include "ip_reassembler.h"
 #include "ppi.h"
+#include "pdu_iterator.h"
 
 #endif // TINS_TINS_H
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 82a7ae0..6f1dd91 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -46,6 +46,7 @@ set(SOURCES
     pdu.cpp
     radiotap.cpp
     address_range.cpp
+    pdu_iterator.cpp
     rawpdu.cpp
     rsn_information.cpp
     sll.cpp
diff --git a/src/pdu_iterator.cpp b/src/pdu_iterator.cpp
new file mode 100644
index 0000000..12c154d
--- /dev/null
+++ b/src/pdu_iterator.cpp
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "pdu_iterator.h"
+#include "pdu.h"
+#include "packet.h"
+
+namespace Tins {
+
+// PDUIterator
+PDUIterator::PDUIterator(pointer pdu)
+: pdu_(pdu) {
+
+}
+
+PDUIterator::pointer PDUIterator::operator->() {
+    return pdu_;
+}
+
+PDUIterator::pointer PDUIterator::operator->() const {
+    return pdu_;
+}
+
+PDUIterator::value_type PDUIterator::operator*() {
+    return *pdu_;
+}
+
+const PDUIterator::value_type PDUIterator::operator*() const {
+    return *pdu_;
+}
+
+// ConstPDUIterator
+
+ConstPDUIterator::ConstPDUIterator(pointer pdu)
+: pdu_(pdu) {
+
+}
+
+ConstPDUIterator::ConstPDUIterator(PDUIterator iterator) 
+: pdu_(&*iterator) {
+
+}
+
+ConstPDUIterator::pointer ConstPDUIterator::operator->() const {
+    return pdu_;
+}
+
+ConstPDUIterator::value_type ConstPDUIterator::operator*() const {
+    return *pdu_;
+}
+
+// Helpers
+
+PDUIteratorRange<PDUIterator> iterate_pdus(PDU* pdu) {
+    return PDUIteratorRange<PDUIterator>(pdu, 0);
+}
+
+PDUIteratorRange<PDUIterator> iterate_pdus(PDU& pdu) {
+    return PDUIteratorRange<PDUIterator>(&pdu, 0);
+}
+
+PDUIteratorRange<PDUIterator> iterate_pdus(Packet& packet) {
+    return PDUIteratorRange<PDUIterator>(packet.pdu(), 0);
+}
+
+PDUIteratorRange<ConstPDUIterator> iterate_pdus(const PDU* pdu) {
+    return PDUIteratorRange<ConstPDUIterator>(pdu, 0);
+}
+
+PDUIteratorRange<ConstPDUIterator> iterate_pdus(const PDU& pdu) {
+    return PDUIteratorRange<ConstPDUIterator>(&pdu, 0);
+}
+
+PDUIteratorRange<ConstPDUIterator> iterate_pdus(const Packet& packet) {
+    return PDUIteratorRange<ConstPDUIterator>(packet.pdu(), 0);
+}
+
+} // Tins
diff --git a/tests/src/CMakeLists.txt b/tests/src/CMakeLists.txt
index e2b5dca..d35244c 100644
--- a/tests/src/CMakeLists.txt
+++ b/tests/src/CMakeLists.txt
@@ -76,6 +76,7 @@ CREATE_TEST(matches_response)
 CREATE_TEST(mpls)
 CREATE_TEST(network_interface)
 CREATE_TEST(pdu)
+CREATE_TEST(pdu_iterator)
 CREATE_TEST(pppoe)
 CREATE_TEST(radiotap)
 CREATE_TEST(rc4_eapol)
diff --git a/tests/src/pdu_iterator_test.cpp b/tests/src/pdu_iterator_test.cpp
new file mode 100644
index 0000000..22fa529
--- /dev/null
+++ b/tests/src/pdu_iterator_test.cpp
@@ -0,0 +1,55 @@
+#include <algorithm>
+#include <map>
+#include <gtest/gtest.h>
+#include "ip.h"
+#include "tcp.h"
+#include "rawpdu.h"
+#include "pdu_iterator.h"
+
+using std::distance;
+using std::map;
+
+using namespace Tins;
+
+class PDUIteratorTest : public testing::Test {
+public:
+    template <typename Iterator>
+    void test() {
+        IP ip = IP("1.2.3.4", "4.3.2.1") / TCP(22, 23) / RawPDU("asd");
+        map<int, PDU::PDUType> pdu_types;
+        pdu_types[0] = PDU::IP;
+        pdu_types[1] = PDU::TCP;
+        pdu_types[2] = PDU::RAW;
+
+        PDUIteratorRange<Iterator> range = iterate_pdus(ip);
+        EXPECT_EQ(3, distance(range.begin(), range.end()));
+
+        size_t iteration = 0;
+        for (Iterator iter = range.begin(); iter != range.end(); iter++) {
+            EXPECT_EQ(pdu_types[iteration], iter->pdu_type());
+            EXPECT_EQ(pdu_types[iteration], (*iter).pdu_type());
+            ++iteration;
+        }
+
+        Iterator iter = range.begin();
+        ++iter;
+        iter++;
+        --iter;
+        iter--;
+        EXPECT_EQ(PDU::IP, iter->pdu_type());
+        EXPECT_EQ(iter, range.begin());
+        EXPECT_NE(iter, range.end());
+
+        const PDU& pdu = *iterate_pdus(ip).begin();
+        EXPECT_EQ(PDU::IP, pdu.pdu_type());
+        EXPECT_GT(const_cast<PDU&>(pdu).serialize().size(), 0);
+    }
+};
+
+TEST_F(PDUIteratorTest, Range) {
+    test<PDUIterator>();
+}
+
+TEST_F(PDUIteratorTest, RangeConst) {
+    test<ConstPDUIterator>();
+}

From 6f681f6519995bbfc1bf3c869bbde54382e8cd58 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 09:25:03 -0700
Subject: [PATCH 07/73] Move smart_ptr definition into new file
 detail/smart_ptr.h

---
 include/tins/CMakeLists.txt                |  1 +
 include/tins/cxxstd.h                      | 11 -----
 include/tins/detail/CMakeLists.txt         |  6 +++
 include/tins/detail/smart_ptr.h            | 51 ++++++++++++++++++++++
 src/utils.cpp                              |  1 +
 tests/src/dot11/ack_test.cpp               |  2 +-
 tests/src/dot11/assoc_request_test.cpp     |  2 +-
 tests/src/dot11/assoc_response_test.cpp    |  2 +-
 tests/src/dot11/authentication_test.cpp    |  2 +-
 tests/src/dot11/beacon_test.cpp            |  2 +-
 tests/src/dot11/block_ack_request_test.cpp |  2 +-
 tests/src/dot11/cf_end_ack_test.cpp        |  2 +-
 tests/src/dot11/cf_end_test.cpp            |  2 +-
 tests/src/dot11/data_test.cpp              |  2 +-
 tests/src/dot11/deauthentication_test.cpp  |  2 +-
 tests/src/dot11/disassoc_test.cpp          |  2 +-
 tests/src/dot11/probe_request_test.cpp     |  2 +-
 tests/src/dot11/probe_response_test.cpp    |  2 +-
 tests/src/dot11/ps_poll_test.cpp           |  2 +-
 tests/src/dot11/reassoc_request_test.cpp   |  2 +-
 tests/src/dot11/reassoc_response_test.cpp  |  2 +-
 tests/src/dot11/rts_test.cpp               |  2 +-
 22 files changed, 76 insertions(+), 28 deletions(-)
 create mode 100644 include/tins/detail/CMakeLists.txt
 create mode 100644 include/tins/detail/smart_ptr.h

diff --git a/include/tins/CMakeLists.txt b/include/tins/CMakeLists.txt
index 54f8c42..1f55d3a 100644
--- a/include/tins/CMakeLists.txt
+++ b/include/tins/CMakeLists.txt
@@ -6,3 +6,4 @@ INSTALL(
 )
 ADD_SUBDIRECTORY(dot11)
 ADD_SUBDIRECTORY(tcp_ip)
+ADD_SUBDIRECTORY(detail)
diff --git a/include/tins/cxxstd.h b/include/tins/cxxstd.h
index e37e9a5..d191c54 100644
--- a/include/tins/cxxstd.h
+++ b/include/tins/cxxstd.h
@@ -32,8 +32,6 @@
 
 #include "config.h"
 
-#include <memory>
-
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
     #define TINS_CXXSTD_GCC_FIX 1
 #else
@@ -48,15 +46,6 @@
 
 namespace Tins{
 namespace Internals {
-template<typename T>
-struct smart_ptr {
-#if TINS_IS_CXX11
-    typedef std::unique_ptr<T> type;
-#else
-    typedef std::auto_ptr<T> type;
-#endif
-};
-
 template<class T> void unused(const T&) { }
 }
 }
diff --git a/include/tins/detail/CMakeLists.txt b/include/tins/detail/CMakeLists.txt
new file mode 100644
index 0000000..5d57beb
--- /dev/null
+++ b/include/tins/detail/CMakeLists.txt
@@ -0,0 +1,6 @@
+FILE(GLOB INCLUDE_FILES "*.h")
+INSTALL(
+    FILES ${INCLUDE_FILES} 
+    DESTINATION include/tins/detail
+    COMPONENT Headers
+)
diff --git a/include/tins/detail/smart_ptr.h b/include/tins/detail/smart_ptr.h
new file mode 100644
index 0000000..48b07d8
--- /dev/null
+++ b/include/tins/detail/smart_ptr.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef TINS_SMART_PTR_H
+#define TINS_SMART_PTR_H
+
+#include <memory>
+#include "../cxxstd.h"
+
+namespace Tins {
+namespace Internals {
+
+template<typename T>
+struct smart_ptr {
+#if TINS_IS_CXX11
+    typedef std::unique_ptr<T> type;
+#else
+    typedef std::auto_ptr<T> type;
+#endif
+};
+
+} // Internals
+} // Tins
+
+#endif // TINS_SMART_PTR_H
diff --git a/src/utils.cpp b/src/utils.cpp
index dd4a8c1..c849e17 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -68,6 +68,7 @@
 #include "cxxstd.h"
 #include "hw_address.h"
 #include "memory_helpers.h"
+#include "detail/smart_ptr.h"
 
 using std::string;
 using std::set;
diff --git a/tests/src/dot11/ack_test.cpp b/tests/src/dot11/ack_test.cpp
index e78f532..e85f9f5 100644
--- a/tests/src/dot11/ack_test.cpp
+++ b/tests/src/dot11/ack_test.cpp
@@ -3,7 +3,7 @@
 
 #include <gtest/gtest.h>
 #include "tests/dot11.h"
-
+#include "detail/smart_ptr.h"
 
 using namespace std;
 using namespace Tins;
diff --git a/tests/src/dot11/assoc_request_test.cpp b/tests/src/dot11/assoc_request_test.cpp
index a2e3f3d..bfca902 100644
--- a/tests/src/dot11/assoc_request_test.cpp
+++ b/tests/src/dot11/assoc_request_test.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include "tests/dot11_mgmt.h"
-
+#include "detail/smart_ptr.h"
 
 using namespace std;
 using namespace Tins;
diff --git a/tests/src/dot11/assoc_response_test.cpp b/tests/src/dot11/assoc_response_test.cpp
index 765194e..28eaa82 100644
--- a/tests/src/dot11/assoc_response_test.cpp
+++ b/tests/src/dot11/assoc_response_test.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include "tests/dot11_mgmt.h"
-
+#include "detail/smart_ptr.h"
 
 using namespace std;
 using namespace Tins;
diff --git a/tests/src/dot11/authentication_test.cpp b/tests/src/dot11/authentication_test.cpp
index 7fe5fdf..718e140 100644
--- a/tests/src/dot11/authentication_test.cpp
+++ b/tests/src/dot11/authentication_test.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include "tests/dot11_mgmt.h"
-
+#include "detail/smart_ptr.h"
 
 using namespace std;
 using namespace Tins;
diff --git a/tests/src/dot11/beacon_test.cpp b/tests/src/dot11/beacon_test.cpp
index fc9ee2b..76fc7d2 100644
--- a/tests/src/dot11/beacon_test.cpp
+++ b/tests/src/dot11/beacon_test.cpp
@@ -5,7 +5,7 @@
 #include <gtest/gtest.h>
 #include "rsn_information.h"
 #include "tests/dot11_mgmt.h"
-
+#include "detail/smart_ptr.h"
 
 using namespace std;
 using namespace Tins;
diff --git a/tests/src/dot11/block_ack_request_test.cpp b/tests/src/dot11/block_ack_request_test.cpp
index 6686d66..02a8470 100644
--- a/tests/src/dot11/block_ack_request_test.cpp
+++ b/tests/src/dot11/block_ack_request_test.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include "tests/dot11.h"
-
+#include "detail/smart_ptr.h"
 
 using namespace std;
 using namespace Tins;
diff --git a/tests/src/dot11/cf_end_ack_test.cpp b/tests/src/dot11/cf_end_ack_test.cpp
index 4d4d721..d0a282c 100644
--- a/tests/src/dot11/cf_end_ack_test.cpp
+++ b/tests/src/dot11/cf_end_ack_test.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include "tests/dot11_control.h"
-
+#include "detail/smart_ptr.h"
 
 using namespace std;
 using namespace Tins;
diff --git a/tests/src/dot11/cf_end_test.cpp b/tests/src/dot11/cf_end_test.cpp
index 15f102e..2172840 100644
--- a/tests/src/dot11/cf_end_test.cpp
+++ b/tests/src/dot11/cf_end_test.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include "tests/dot11_control.h"
-
+#include "detail/smart_ptr.h"
 
 using namespace std;
 using namespace Tins;
diff --git a/tests/src/dot11/data_test.cpp b/tests/src/dot11/data_test.cpp
index 140062f..8866df9 100644
--- a/tests/src/dot11/data_test.cpp
+++ b/tests/src/dot11/data_test.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include "tests/dot11_data.h"
-
+#include "detail/smart_ptr.h"
 
 using namespace std;
 using namespace Tins;
diff --git a/tests/src/dot11/deauthentication_test.cpp b/tests/src/dot11/deauthentication_test.cpp
index 9bfb377..4452899 100644
--- a/tests/src/dot11/deauthentication_test.cpp
+++ b/tests/src/dot11/deauthentication_test.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include "tests/dot11_mgmt.h"
-
+#include "detail/smart_ptr.h"
 
 using namespace std;
 using namespace Tins;
diff --git a/tests/src/dot11/disassoc_test.cpp b/tests/src/dot11/disassoc_test.cpp
index 619ccef..0867809 100644
--- a/tests/src/dot11/disassoc_test.cpp
+++ b/tests/src/dot11/disassoc_test.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include "tests/dot11_mgmt.h"
-
+#include "detail/smart_ptr.h"
 
 using namespace std;
 using namespace Tins;
diff --git a/tests/src/dot11/probe_request_test.cpp b/tests/src/dot11/probe_request_test.cpp
index 403bede..b620794 100644
--- a/tests/src/dot11/probe_request_test.cpp
+++ b/tests/src/dot11/probe_request_test.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include "tests/dot11_mgmt.h"
-
+#include "detail/smart_ptr.h"
 
 using namespace std;
 using namespace Tins;
diff --git a/tests/src/dot11/probe_response_test.cpp b/tests/src/dot11/probe_response_test.cpp
index c530992..2d8a705 100644
--- a/tests/src/dot11/probe_response_test.cpp
+++ b/tests/src/dot11/probe_response_test.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include "tests/dot11_mgmt.h"
-
+#include "detail/smart_ptr.h"
 
 using namespace std;
 using namespace Tins;
diff --git a/tests/src/dot11/ps_poll_test.cpp b/tests/src/dot11/ps_poll_test.cpp
index a7bb92c..eaff858 100644
--- a/tests/src/dot11/ps_poll_test.cpp
+++ b/tests/src/dot11/ps_poll_test.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include "tests/dot11_control.h"
-
+#include "detail/smart_ptr.h"
 
 using namespace std;
 using namespace Tins;
diff --git a/tests/src/dot11/reassoc_request_test.cpp b/tests/src/dot11/reassoc_request_test.cpp
index 1f10ee8..1a9ea11 100644
--- a/tests/src/dot11/reassoc_request_test.cpp
+++ b/tests/src/dot11/reassoc_request_test.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include "tests/dot11_mgmt.h"
-
+#include "detail/smart_ptr.h"
 
 using namespace std;
 using namespace Tins;
diff --git a/tests/src/dot11/reassoc_response_test.cpp b/tests/src/dot11/reassoc_response_test.cpp
index c9a05c4..2c55896 100644
--- a/tests/src/dot11/reassoc_response_test.cpp
+++ b/tests/src/dot11/reassoc_response_test.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include "tests/dot11_mgmt.h"
-
+#include "detail/smart_ptr.h"
 
 using namespace std;
 using namespace Tins;
diff --git a/tests/src/dot11/rts_test.cpp b/tests/src/dot11/rts_test.cpp
index b01e0bb..741a4a8 100644
--- a/tests/src/dot11/rts_test.cpp
+++ b/tests/src/dot11/rts_test.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include "tests/dot11_control.h"
-
+#include "detail/smart_ptr.h"
 
 using namespace std;
 using namespace Tins;

From 22c72955f5b7d5fdfa00c98dd01db6dcd7ba1381 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 09:25:57 -0700
Subject: [PATCH 08/73] Remove Storage template parameter from HWAddress, move
 impl to cpp

This is a breaking ABI change. This might break some forward
declarations and hopefully no one was actually using the
Storage type for anything.
---
 include/tins/hw_address.h | 143 ++++++++++++--------------------------
 src/CMakeLists.txt        |   1 +
 src/hw_address.cpp        |  88 +++++++++++++++++++++++
 3 files changed, 134 insertions(+), 98 deletions(-)
 create mode 100644 src/hw_address.cpp

diff --git a/include/tins/hw_address.h b/include/tins/hw_address.h
index fde80d4..853822a 100644
--- a/include/tins/hw_address.h
+++ b/include/tins/hw_address.h
@@ -31,15 +31,32 @@
 #define TINS_HWADDRESS_H
 
 #include <stdint.h>
-#include <stdexcept>
-#include <iterator>
-#include <algorithm>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
+#include <iosfwd>
+#include <string>
+#include <cstring>
 #include "cxxstd.h"
 
 namespace Tins {
+namespace Internals {
+
+// Defined in hw_address.cpp
+/**
+ * \cond
+ */
+std::string hw_address_to_string(const uint8_t* ptr, size_t count);
+
+void string_to_hw_address(const std::string& hw_addr, uint8_t* output, size_t output_size);
+
+bool hw_address_equal_compare(const uint8_t* start1, const uint8_t* end1,
+                              const uint8_t* start2);
+
+bool hw_address_lt_compare(const uint8_t* start1, const uint8_t* end1,
+                           const uint8_t* start2, const uint8_t* end2);
+
+/**
+ * \endcond
+ */
+} // Internals
 
 /**
  * \class HWAddress
@@ -61,15 +78,13 @@ namespace Tins {
  * }
  * \endcode
  */
-template<size_t n, typename Storage = uint8_t>
+template<size_t n>
 class HWAddress {
 public:
     /**
      * \brief The type of the elements stored in the hardware address.
-     * 
-     * This is the same as the template parameter Storage.
      */
-    typedef Storage storage_type;
+    typedef uint8_t storage_type;
     
     /**
      * \brief The random access iterator type.
@@ -90,7 +105,7 @@ public:
     /**
      * \brief The broadcast address.
      */
-    static const HWAddress<n, Storage> broadcast;
+    static const HWAddress<n> broadcast;
     
     /**
      * \brief Constructor from a const storage_type*.
@@ -109,10 +124,10 @@ public:
      */
     HWAddress(const storage_type* ptr = 0) {
         if (ptr) {
-            std::copy(ptr, ptr + address_size, buffer_);
+            std::memcpy(buffer_, ptr, address_size);
         }
         else {
-            std::fill(begin(), end(), storage_type());
+            std::memset(buffer_, 0, address_size);
         }
     }
     
@@ -128,7 +143,7 @@ public:
      * \param address The hex-notation address to be parsed.
      */
     HWAddress(const std::string& address) {
-        convert(address, buffer_);
+        Internals::string_to_hw_address(address, buffer_, n);
     }
     
     /**
@@ -146,7 +161,7 @@ public:
      */
     template<size_t i>
     HWAddress(const char (&address)[i]) {
-        convert(address, buffer_);
+        Internals::string_to_hw_address(address, buffer_, n);
     }
     
     /**
@@ -163,18 +178,15 @@ public:
      */
     template<size_t i>
     HWAddress(const HWAddress<i>& rhs) {
-        // Fill extra bytes
-        std::fill(
-            // Copy as most as we can
-            std::copy(
-                rhs.begin(),
-                rhs.begin() + std::min(i, n),
-                begin()
-            ),
-            end(),
-            0
-        );
-        
+        size_t copy_threshold = i < n ? i : n;
+        for (size_t index = 0; index < n; ++index) {
+            if (index < copy_threshold) {
+                buffer_[index] = rhs[index];
+            }
+            else {
+                buffer_[index] = storage_type();
+            }
+        }
     }
     
     /**
@@ -225,7 +237,7 @@ public:
      * \return bool indicating whether addresses are equal.
      */
     bool operator==(const HWAddress& rhs) const {
-        return std::equal(begin(), end(), rhs.begin());
+        return Internals::hw_address_equal_compare(begin(), end(), rhs.begin());
     }
     
     /**
@@ -247,7 +259,7 @@ public:
      * \return bool indicating whether this address is less-than rhs.
      */
     bool operator<(const HWAddress& rhs) const {
-        return std::lexicographical_compare(begin(), end(), rhs.begin(), rhs.end());
+        return Internals::hw_address_lt_compare(begin(), end(), rhs.begin(), rhs.end());
     }
 
     /**
@@ -300,9 +312,7 @@ public:
      * \return std::string containing the hex-notation address.
      */
     std::string to_string() const {
-        std::ostringstream oss;
-        oss <<* this;
-        return oss.str();
+        return Internals::hw_address_to_string(buffer_, size());
     }
 
     /**
@@ -331,13 +341,7 @@ public:
      * \return std::ostream& pointing to the os parameter.
      */
     friend std::ostream& operator<<(std::ostream& os, const HWAddress& addr) {
-        std::transform(
-            addr.begin(), 
-            addr.end() - 1,
-            std::ostream_iterator<std::string>(os, ":"),
-            &HWAddress::storage_to_string
-        );
-        return os << storage_to_string(addr.begin()[HWAddress::address_size - 1]);
+        return os << addr.to_string();
     }
     
     /**
@@ -363,9 +367,6 @@ public:
         return output;
     }
 private:
-    template<typename OutputIterator>
-    static void convert(const std::string& hw_addr, OutputIterator output);
-    
     static HWAddress<n> make_broadcast_address() {
         // Build a buffer made of n 0xff bytes
         uint8_t buffer[n];
@@ -375,65 +376,11 @@ private:
         return HWAddress<n>(buffer);
     }
 
-    static std::string storage_to_string(storage_type element) {
-        std::ostringstream oss;
-        oss << std::hex;
-        if (element < 0x10) {
-            oss << '0';
-        }
-        oss << (unsigned)element;
-        return oss.str();
-    }
-
     storage_type buffer_[n];
 };
 
-template<size_t n, typename Storage>
-template<typename OutputIterator>
-void HWAddress<n, Storage>::convert(const std::string& hw_addr, 
-                                    OutputIterator output)  {
-    unsigned i(0);
-    size_t count(0);
-    storage_type tmp;
-    while (i < hw_addr.size() && count < n) {
-        const unsigned end = i+2;
-        tmp = storage_type();
-        while (i < end) {
-            if (hw_addr[i] >= 'a' && hw_addr[i] <= 'f') {
-                tmp = (tmp << 4) | (hw_addr[i] - 'a' + 10);
-            }
-            else if (hw_addr[i] >= 'A' && hw_addr[i] <= 'F') {
-                tmp = (tmp << 4) | (hw_addr[i] - 'A' + 10);
-            }
-            else if (hw_addr[i] >= '0' && hw_addr[i] <= '9') {
-                tmp = (tmp << 4) | (hw_addr[i] - '0');
-            }
-            else if (hw_addr[i] == ':') {
-                break;
-            }
-            else {
-                throw std::runtime_error("Invalid byte found");
-            }
-            i++;
-        }
-        *(output++) = tmp;
-        count++;
-        if (i < hw_addr.size()) {
-            if (hw_addr[i] == ':') {
-                i++;
-            }
-            else {
-                throw std::runtime_error("Invalid separator");
-            }
-        }
-    }
-    while (count++ < n) {
-        *(output++) = storage_type();
-    }
-}
-
-template<size_t n, typename Storage>
-const HWAddress<n, Storage> HWAddress<n, Storage>::broadcast = make_broadcast_address();
+template<size_t n>
+const HWAddress<n> HWAddress<n>::broadcast = make_broadcast_address();
 
 } // namespace Tins
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6f1dd91..04d069b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,6 +28,7 @@ set(SOURCES
     dot1q.cpp
     eapol.cpp
     ethernetII.cpp
+    hw_address.cpp
     icmp_extension.cpp
     icmp.cpp
     icmpv6.cpp
diff --git a/src/hw_address.cpp b/src/hw_address.cpp
new file mode 100644
index 0000000..93780c8
--- /dev/null
+++ b/src/hw_address.cpp
@@ -0,0 +1,88 @@
+#include <sstream>
+#include <iomanip>
+#include <stdexcept>
+#include <algorithm>
+#include "hw_address.h"
+
+using std::string;
+using std::ostream;
+using std::hex;
+using std::ostringstream;
+using std::lexicographical_compare;
+using std::equal;
+
+namespace Tins {
+namespace Internals {
+
+void storage_to_string(ostream& output, uint8_t value) {
+    output << hex;
+    if (value < 0x10) {
+        output << '0';
+    }
+    output << (unsigned)value;
+}
+
+string hw_address_to_string(const uint8_t* ptr, size_t count) {
+    ostringstream output;
+    for (size_t i = 0; i < count; ++i) {
+        if (i != 0) {
+            output << ":";
+        }
+        storage_to_string(output, ptr[i]);
+    }
+    return output.str();
+}
+
+void string_to_hw_address(const string& hw_addr, uint8_t* output, size_t output_size)  {
+    unsigned i = 0;
+    size_t count = 0;
+    uint8_t tmp;
+    while (i < hw_addr.size() && count < output_size) {
+        const unsigned end = i+2;
+        tmp = 0;
+        while (i < end) {
+            if (hw_addr[i] >= 'a' && hw_addr[i] <= 'f') {
+                tmp = (tmp << 4) | (hw_addr[i] - 'a' + 10);
+            }
+            else if (hw_addr[i] >= 'A' && hw_addr[i] <= 'F') {
+                tmp = (tmp << 4) | (hw_addr[i] - 'A' + 10);
+            }
+            else if (hw_addr[i] >= '0' && hw_addr[i] <= '9') {
+                tmp = (tmp << 4) | (hw_addr[i] - '0');
+            }
+            else if (hw_addr[i] == ':') {
+                break;
+            }
+            else {
+                throw std::runtime_error("Invalid byte found");
+            }
+            i++;
+        }
+        *(output++) = tmp;
+        count++;
+        if (i < hw_addr.size()) {
+            if (hw_addr[i] == ':') {
+                i++;
+            }
+            else {
+                throw std::runtime_error("Invalid separator");
+            }
+        }
+    }
+    while (count++ < output_size) {
+        *(output++) = 0;
+    }
+}
+
+bool hw_address_equal_compare(const uint8_t* start1, const uint8_t* end1,
+                              const uint8_t* start2) {
+    return equal(start1, end1, start2);
+}
+
+bool hw_address_lt_compare(const uint8_t* start1, const uint8_t* end1,
+                           const uint8_t* start2, const uint8_t* end2) {
+    return lexicographical_compare(start1, end1, start2, end2);
+}
+
+} // Internals
+} // Tins

From 3e7d30e01c9b54fac2f13fc0787e41a54ad86fd3 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 09:28:00 -0700
Subject: [PATCH 09/73] Don't include heavy STL headers like <algorithm> in
 header files

This provides a considerable compilation time reduction and most
of these were just using std::copy/fill which can be replaced by
memcpy/memset, as all of their uses were applied to POD types
---
 examples/traceroute.cpp       |  1 +
 include/tins/bootp.h          | 18 ++++++++----------
 include/tins/internals.h      |  2 --
 include/tins/ip_address.h     |  2 +-
 include/tins/ipv6_address.h   |  6 ++----
 include/tins/memory_helpers.h |  5 ++---
 include/tins/pdu_cacher.h     |  4 ++--
 include/tins/pdu_option.h     | 16 +++-------------
 include/tins/utils.h          |  2 +-
 src/dhcp.cpp                  |  1 +
 src/handshake_capturer.cpp    |  1 +
 src/icmpv6.cpp                |  1 +
 src/ip_address.cpp            |  1 +
 src/ipv6_address.cpp          |  8 +++++++-
 14 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/examples/traceroute.cpp b/examples/traceroute.cpp
index 09a7991..9a4da46 100644
--- a/examples/traceroute.cpp
+++ b/examples/traceroute.cpp
@@ -35,6 +35,7 @@
 #define _GLIBCXX_USE_NANOSLEEP
 
 #include <iostream>
+#include <iomanip>
 #include <chrono>
 #include <thread>
 #include <cstdint>
diff --git a/include/tins/bootp.h b/include/tins/bootp.h
index 7d88936..eaf3f1c 100644
--- a/include/tins/bootp.h
+++ b/include/tins/bootp.h
@@ -31,7 +31,6 @@
 #define TINS_BOOTP_H
 
 #include <stdint.h>
-#include <algorithm>
 #include <vector>
 #include "pdu.h"
 #include "macros.h"
@@ -268,15 +267,14 @@ public:
      */
     template<size_t n>
     void chaddr(const HWAddress<n>& new_chaddr) {
-        // Copy the new addr
-        uint8_t* end = std::copy(
-            new_chaddr.begin(), 
-            new_chaddr.begin() + std::min(n, sizeof(bootp_.chaddr)), 
-            bootp_.chaddr
-        );
-        // Fill what's left with zeros
-        if (end < bootp_.chaddr + chaddr_type::address_size) {
-            std::fill(end, bootp_.chaddr + chaddr_type::address_size, 0);
+        size_t copy_threshold = std::min(n, sizeof(bootp_.chaddr));
+        for (size_t i = 0; i < copy_threshold; ++i) {
+            if (i < copy_threshold) {
+                bootp_.chaddr[i] = new_chaddr[i];
+            }
+            else {
+                bootp_.chaddr[i] = 0;
+            }
         }
     }
 
diff --git a/include/tins/internals.h b/include/tins/internals.h
index 3e78030..17f4cc4 100644
--- a/include/tins/internals.h
+++ b/include/tins/internals.h
@@ -33,8 +33,6 @@
 #if TINS_IS_CXX11
 #include <type_traits>
 #endif
-
-#include <sstream>
 #include <string>
 #include <stdint.h>
 #include "constants.h"
diff --git a/include/tins/ip_address.h b/include/tins/ip_address.h
index 01055f4..bfbcb6c 100644
--- a/include/tins/ip_address.h
+++ b/include/tins/ip_address.h
@@ -31,7 +31,7 @@
 #define TINS_IPADDRESS_H
 
 #include <string>
-#include <iostream>
+#include <iosfwd>
 #include <stdint.h>
 #include "cxxstd.h"
 #include "macros.h"
diff --git a/include/tins/ipv6_address.h b/include/tins/ipv6_address.h
index e04e240..87ba039 100644
--- a/include/tins/ipv6_address.h
+++ b/include/tins/ipv6_address.h
@@ -32,6 +32,7 @@
 
 #include <string>
 #include <stdexcept>
+#include <iosfwd>
 #include <stdint.h>
 #include "cxxstd.h"
 #include "macros.h"
@@ -203,10 +204,7 @@ public:
      * \param addr The parameter to be written.
      * \return std::ostream& pointing to the os parameter.
      */
-    friend std::ostream& operator<<(std::ostream& os, const IPv6Address& addr) {
-        return os << addr.to_string();
-    }
-
+    friend std::ostream& operator<<(std::ostream& os, const IPv6Address& addr);
 
     /**
      * Applies a mask to an address
diff --git a/include/tins/memory_helpers.h b/include/tins/memory_helpers.h
index 0e7f0e8..5828365 100644
--- a/include/tins/memory_helpers.h
+++ b/include/tins/memory_helpers.h
@@ -32,7 +32,6 @@
 
 #include <stdint.h>
 #include <cstring>
-#include <algorithm>
 #include <vector>
 #include "exceptions.h"
 #include "ip_address.h"
@@ -213,7 +212,7 @@ public:
         if (TINS_UNLIKELY(size_ < length)) {
             throw serialization_error();
         }
-        std::copy(start, end, buffer_);
+        std::memcpy(buffer_, &*start, length);
         skip(length);
     }
 
@@ -238,7 +237,7 @@ public:
         if (TINS_UNLIKELY(size_ < size)) {
             throw serialization_error();
         }
-        std::fill(buffer_, buffer_ + size, value);
+        std::memset(buffer_, value, size);
         skip(size);
     }
 
diff --git a/include/tins/pdu_cacher.h b/include/tins/pdu_cacher.h
index 0e8ccdc..ab37d45 100644
--- a/include/tins/pdu_cacher.h
+++ b/include/tins/pdu_cacher.h
@@ -30,7 +30,7 @@
 #ifndef TINS_PDU_CACHER_H
 #define TINS_PDU_CACHER_H
 
-#include <algorithm>
+#include <cstring>
 #include "pdu.h"
 #include "macros.h"
 
@@ -148,7 +148,7 @@ private:
         if (cached_serialization_.size() != total_sz) {
             cached_serialization_ = cached_.serialize();
         }
-        std::copy(cached_serialization_.begin(), cached_serialization_.end(), buffer);
+        std::memcpy(buffer, &*cached_serialization_.begin(), cached_serialization_.size());
     }
 
     cached_type cached_;
diff --git a/include/tins/pdu_option.h b/include/tins/pdu_option.h
index 97d704f..dc1ecdd 100644
--- a/include/tins/pdu_option.h
+++ b/include/tins/pdu_option.h
@@ -33,9 +33,7 @@
 #include <vector>
 #include <iterator>
 #include <cstring>
-#include <algorithm>
 #include <string>
-#include <limits>
 #include <stdint.h>
 #include "exceptions.h"
 #include "endianness.h"
@@ -375,11 +373,7 @@ public:
             rhs.real_size_ = 0;
         }
         else {
-            std::copy(
-                rhs.data_ptr(),
-                rhs.data_ptr() + rhs.data_size(),
-                payload_.small_buffer
-            );
+            std::memcpy(payload_.small_buffer, rhs.data_ptr(), rhs.data_size());
         }
         return* this;
     }
@@ -516,16 +510,12 @@ private:
     template<typename ForwardIterator>
     void set_payload_contents(ForwardIterator start, ForwardIterator end) {
         size_t total_size = std::distance(start, end);
-        if (total_size > std::numeric_limits<uint16_t>::max()) {
+        if (total_size > 65535) {
             throw option_payload_too_large();
         }
         real_size_ = static_cast<uint16_t>(total_size);
         if (real_size_ <= small_buffer_size) {
-            std::copy(
-                start,
-                end,
-                payload_.small_buffer
-            );
+            std::memcpy(payload_.small_buffer, &*start, total_size);
         }
         else {
             payload_.big_buffer_ptr = new data_type[real_size_];
diff --git a/include/tins/utils.h b/include/tins/utils.h
index 7beff5d..1ac877d 100644
--- a/include/tins/utils.h
+++ b/include/tins/utils.h
@@ -48,7 +48,7 @@ class NetworkInterface;
 class PacketSender;
 class PDU;
 class IPv6Address;
-template <size_t n, typename Storage>
+template <size_t n>
 class HWAddress;
 
 /** 
diff --git a/src/dhcp.cpp b/src/dhcp.cpp
index fcd4eec..46dd78f 100644
--- a/src/dhcp.cpp
+++ b/src/dhcp.cpp
@@ -29,6 +29,7 @@
 
 #include <stdexcept>
 #include <cstring>
+#include <algorithm>
 #include "endianness.h"
 #include "dhcp.h"
 #include "ethernetII.h"
diff --git a/src/handshake_capturer.cpp b/src/handshake_capturer.cpp
index 80b0029..86aa726 100644
--- a/src/handshake_capturer.cpp
+++ b/src/handshake_capturer.cpp
@@ -31,6 +31,7 @@
 
 #ifdef TINS_HAVE_DOT11
 
+#include <algorithm>
 #include "dot11/dot11_data.h"
 
 using std::max_element;
diff --git a/src/icmpv6.cpp b/src/icmpv6.cpp
index 78cb7f5..52475eb 100644
--- a/src/icmpv6.cpp
+++ b/src/icmpv6.cpp
@@ -28,6 +28,7 @@
  */
  
 #include <cstring>
+#include <algorithm>
 #include "icmpv6.h"
 #include "ipv6.h"
 #include "rawpdu.h"
diff --git a/src/ip_address.cpp b/src/ip_address.cpp
index f1a7d44..659f736 100644
--- a/src/ip_address.cpp
+++ b/src/ip_address.cpp
@@ -35,6 +35,7 @@
 #endif // _WIN32
 #include <stdexcept>
 #include <sstream>
+#include <iostream>
 #include "ip_address.h"
 #include "endianness.h"
 #include "address_range.h"
diff --git a/src/ipv6_address.cpp b/src/ipv6_address.cpp
index 3833df3..3d32128 100644
--- a/src/ipv6_address.cpp
+++ b/src/ipv6_address.cpp
@@ -27,7 +27,6 @@
  *
  */
 
-#include <algorithm>
 #include "macros.h"
 #ifndef _WIN32
     #include <arpa/inet.h>
@@ -38,14 +37,17 @@
     #include <ws2tcpip.h>
     #include <mstcpip.h>
 #endif
+#include <algorithm>
 #include <limits>
 #include <sstream>
+#include <iostream>
 #include "ipv6_address.h"
 #include "address_range.h"
 #include "exceptions.h"
 
 using std::fill;
 using std::string;
+using std::ostream;
 
 namespace Tins {
 
@@ -132,6 +134,10 @@ bool IPv6Address::is_multicast() const {
     return multicast_range.contains(*this);
 }
 
+ostream& operator<<(ostream& os, const IPv6Address& addr) {
+    return os << addr.to_string();
+}
+
 IPv6Address operator&(const IPv6Address& lhs, const IPv6Address& rhs) {
     IPv6Address output = lhs;
     IPv6Address::iterator addr_iter = output.begin();

From 07f000f65aad01ae5b6305d4775f6689c348deb5 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 09:36:50 -0700
Subject: [PATCH 10/73] Move type traits into a separate file

---
 include/tins/detail/type_traits.h | 83 +++++++++++++++++++++++++++++++
 include/tins/internals.h          | 36 +-------------
 include/tins/utils.h              |  3 +-
 src/icmp.cpp                      |  1 +
 src/utils.cpp                     |  1 +
 5 files changed, 88 insertions(+), 36 deletions(-)
 create mode 100644 include/tins/detail/type_traits.h

diff --git a/include/tins/detail/type_traits.h b/include/tins/detail/type_traits.h
new file mode 100644
index 0000000..c2bfb38
--- /dev/null
+++ b/include/tins/detail/type_traits.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef TINS_TYPE_TRAITS_H
+#define TINS_TYPE_TRAITS_H
+
+#include <stdint.h>
+
+namespace Tins {
+namespace Internals {
+/**
+ * \cond
+ */
+
+template<bool, typename T = void>
+struct enable_if {
+    typedef T type;
+};
+
+template<typename T>
+struct enable_if<false, T> {
+
+};
+
+template<typename T>
+struct is_unsigned_integral {
+    static const bool value = false;
+};
+
+template<>
+struct is_unsigned_integral<uint8_t> {
+    static const bool value = true;
+};
+
+template<>
+struct is_unsigned_integral<uint16_t> {
+    static const bool value = true;
+};
+
+template<>
+struct is_unsigned_integral<uint32_t> {
+    static const bool value = true;
+};
+
+template<>
+struct is_unsigned_integral<uint64_t> {
+    static const bool value = true;
+};
+
+/**
+ * \endcond
+ */
+
+} // Internals
+} // Tins
+
+#endif // TINS_TYPE_TRAITS_H
diff --git a/include/tins/internals.h b/include/tins/internals.h
index 17f4cc4..a4304e5 100644
--- a/include/tins/internals.h
+++ b/include/tins/internals.h
@@ -39,6 +39,7 @@
 #include "pdu.h"
 #include "hw_address.h"
 #include "macros.h"
+#include "detail/type_traits.h"
 
 /**
  * \cond
@@ -109,16 +110,6 @@ void skip_line(std::istream& input);
 bool from_hex(const std::string& str, uint32_t& result);
 bool from_hex(const std::string& str, std::string& result);
 
-template<bool, typename T = void>
-struct enable_if {
-    typedef T type;
-};
-
-template<typename T>
-struct enable_if<false, T> {
-
-};
-
 PDU* pdu_from_flag(Constants::Ethernet::e flag, const uint8_t* buffer,
   uint32_t size, bool rawpdu_on_no_match = true);
 PDU* pdu_from_flag(Constants::IP::e flag, const uint8_t* buffer,
@@ -199,31 +190,6 @@ inline bool is_dot3(const uint8_t* ptr, size_t sz) {
     return (sz >= 13 && ptr[12] < 8);
 }
 
-template<typename T>
-struct is_unsigned_integral {
-    static const bool value = false;
-};
-
-template<>
-struct is_unsigned_integral<uint8_t> {
-    static const bool value = true;
-};
-
-template<>
-struct is_unsigned_integral<uint16_t> {
-    static const bool value = true;
-};
-
-template<>
-struct is_unsigned_integral<uint32_t> {
-    static const bool value = true;
-};
-
-template<>
-struct is_unsigned_integral<uint64_t> {
-    static const bool value = true;
-};
-
 #if TINS_IS_CXX11 && !defined(_MSC_VER)
 
 // Template metaprogramming trait to determine if a functor can accept another parameter as an argument
diff --git a/include/tins/utils.h b/include/tins/utils.h
index 1ac877d..0e9c341 100644
--- a/include/tins/utils.h
+++ b/include/tins/utils.h
@@ -37,7 +37,8 @@
 #include <stdint.h>
 #include "ip_address.h"
 #include "ipv6_address.h"
-#include "internals.h"
+#include "pdu.h"
+#include "detail/type_traits.h"
 
 // Fix for Windows interface define on combaseapi.h
 #undef interface
diff --git a/src/icmp.cpp b/src/icmp.cpp
index 8695ccb..3404c77 100644
--- a/src/icmp.cpp
+++ b/src/icmp.cpp
@@ -36,6 +36,7 @@
 #include "utils.h"
 #include "exceptions.h"
 #include "icmp.h"
+#include "internals.h"
 #include "memory_helpers.h"
 
 using std::memset;
diff --git a/src/utils.cpp b/src/utils.cpp
index c849e17..3a6e0b9 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -68,6 +68,7 @@
 #include "cxxstd.h"
 #include "hw_address.h"
 #include "memory_helpers.h"
+#include "internals.h"
 #include "detail/smart_ptr.h"
 
 using std::string;

From 730e69463c105e8d7f1e0633370d370069a47768 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 09:40:40 -0700
Subject: [PATCH 11/73] Include detail/type_traits.h rather than internals.h on
 pdu_option

---
 include/tins/pdu_option.h | 2 +-
 src/crypto.cpp            | 1 +
 src/icmpv6.cpp            | 1 +
 src/ip.cpp                | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/tins/pdu_option.h b/include/tins/pdu_option.h
index dc1ecdd..efb45a6 100644
--- a/include/tins/pdu_option.h
+++ b/include/tins/pdu_option.h
@@ -37,10 +37,10 @@
 #include <stdint.h>
 #include "exceptions.h"
 #include "endianness.h"
-#include "internals.h"
 #include "ip_address.h"
 #include "ipv6_address.h"
 #include "hw_address.h"
+#include "detail/type_traits.h"
 
 namespace Tins {
 /**
diff --git a/src/crypto.cpp b/src/crypto.cpp
index eafcf4b..9ffd2c1 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -38,6 +38,7 @@
 #endif // TINS_HAVE_WPA2_DECRYPTION
 #include "dot11/dot11_data.h"
 #include "dot11/dot11_beacon.h"
+#include "internals.h"
 #include "exceptions.h"
 
 using std::string;
diff --git a/src/icmpv6.cpp b/src/icmpv6.cpp
index 52475eb..7426efd 100644
--- a/src/icmpv6.cpp
+++ b/src/icmpv6.cpp
@@ -36,6 +36,7 @@
 #include "constants.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
+#include "internals.h"
 
 using std::memset;
 using std::vector;
diff --git a/src/ip.cpp b/src/ip.cpp
index ded12e5..3bcbdb3 100644
--- a/src/ip.cpp
+++ b/src/ip.cpp
@@ -46,6 +46,7 @@
 #include "exceptions.h"
 #include "pdu_allocator.h"
 #include "memory_helpers.h"
+#include "internals.h"
 
 using std::list;
 using std::min;

From 92bda42ac1fdae2b570cfa0817c274d39a242800 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 09:45:06 -0700
Subject: [PATCH 12/73] Move sniffer callback traits into detail/type_traits.h

---
 include/tins/detail/type_traits.h | 38 +++++++++++++++++++++++++++++++
 include/tins/internals.h          | 33 ---------------------------
 include/tins/sniffer.h            |  2 +-
 src/sniffer.cpp                   |  1 +
 4 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/include/tins/detail/type_traits.h b/include/tins/detail/type_traits.h
index c2bfb38..23aebf8 100644
--- a/include/tins/detail/type_traits.h
+++ b/include/tins/detail/type_traits.h
@@ -31,6 +31,10 @@
 #define TINS_TYPE_TRAITS_H
 
 #include <stdint.h>
+#include "cxxstd.h"
+#if TINS_IS_CXX11
+    #include <type_traits>
+#endif
 
 namespace Tins {
 namespace Internals {
@@ -73,6 +77,40 @@ struct is_unsigned_integral<uint64_t> {
     static const bool value = true;
 };
 
+#if TINS_IS_CXX11 && !defined(_MSC_VER)
+
+// Template metaprogramming trait to determine if a functor can accept another parameter as an argument
+template <typename T, typename P, typename=void>
+struct accepts_type : std::false_type { };
+
+template <typename T, typename P>
+struct accepts_type<T, P,
+    typename std::enable_if<
+        std::is_same< decltype(  std::declval<T>()(std::declval<P>())  ), bool>::value
+    >::type
+> : std::true_type { };
+
+// use enable_if to invoke the Packet&& version of the sniff_loop handler if possible - otherwise fail to old behavior
+template <typename Functor, typename Packet>
+bool invoke_loop_cb(Functor& f, Packet& p,
+                    typename std::enable_if<accepts_type<Functor, Packet>::value, bool>::type* = 0) {
+    return f(std::move(p));
+}
+
+template <typename Functor, typename Packet>
+bool invoke_loop_cb(Functor& f, Packet& p,
+                    typename std::enable_if<!accepts_type<Functor, Packet>::value && accepts_type<Functor, Packet&>::value, bool>::type* = 0) {
+    return f(p);
+}
+
+template <typename Functor, typename Packet>
+bool invoke_loop_cb(Functor& f, Packet& p,
+                    typename std::enable_if<!accepts_type<Functor, Packet>::value && !accepts_type<Functor, Packet&>::value, bool>::type* = 0) {
+    return f(*p.pdu());
+}
+
+#endif
+
 /**
  * \endcond
  */
diff --git a/include/tins/internals.h b/include/tins/internals.h
index a4304e5..38c75ca 100644
--- a/include/tins/internals.h
+++ b/include/tins/internals.h
@@ -30,9 +30,6 @@
 #ifndef TINS_INTERNALS_H
 #define TINS_INTERNALS_H
 
-#if TINS_IS_CXX11
-#include <type_traits>
-#endif
 #include <string>
 #include <stdint.h>
 #include "constants.h"
@@ -190,36 +187,6 @@ inline bool is_dot3(const uint8_t* ptr, size_t sz) {
     return (sz >= 13 && ptr[12] < 8);
 }
 
-#if TINS_IS_CXX11 && !defined(_MSC_VER)
-
-// Template metaprogramming trait to determine if a functor can accept another parameter as an argument
-template <typename T, typename P, typename=void>
-struct accepts_type : std::false_type { };
-
-template <typename T, typename P>
-struct accepts_type<T, P,
-    typename std::enable_if<
-        std::is_same< decltype(  std::declval<T>()(std::declval<P>())  ), bool>::value
-    >::type
-> : std::true_type { };
-
-// use enable_if to invoke the Packet&& version of the sniff_loop handler if possible - otherwise fail to old behavior
-template <typename Functor, typename Packet>
-bool invoke_loop_cb(Functor& f, Packet& p, typename std::enable_if<accepts_type<Functor, Packet>::value, bool>::type* = 0) {
-    return f(std::move(p));
-}
-
-template <typename Functor, typename Packet>
-bool invoke_loop_cb(Functor& f, Packet& p, typename std::enable_if<!accepts_type<Functor, Packet>::value && accepts_type<Functor, Packet&>::value, bool>::type* = 0) {
-    return f(p);
-}
-
-template <typename Functor, typename Packet>
-bool invoke_loop_cb(Functor& f, Packet& p, typename std::enable_if<!accepts_type<Functor, Packet>::value && !accepts_type<Functor, Packet&>::value, bool>::type* = 0) {
-    return f(*p.pdu());
-}
-#endif
-
 } // namespace Internals
 } // namespace Tins
 /**
diff --git a/include/tins/sniffer.h b/include/tins/sniffer.h
index a3c7144..2cd2ec0 100644
--- a/include/tins/sniffer.h
+++ b/include/tins/sniffer.h
@@ -40,7 +40,7 @@
 #include "cxxstd.h"
 #include "macros.h"
 #include "exceptions.h"
-#include "internals.h"
+#include "detail/type_traits.h"
 
 #ifdef TINS_HAVE_PCAP
 
diff --git a/src/sniffer.cpp b/src/sniffer.cpp
index 68bbe44..2b95872 100644
--- a/src/sniffer.cpp
+++ b/src/sniffer.cpp
@@ -45,6 +45,7 @@
 #include "pktap.h"
 #include "sll.h"
 #include "ppi.h"
+#include "internals.h"
 
 using std::string;
 using std::runtime_error;

From ab517873237bdeb3e16d241c93c28817277fecf2 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 09:53:11 -0700
Subject: [PATCH 13/73] Move Internals::byte_array into crypto.cpp

---
 include/tins/internals.h | 51 ----------------------------------------
 src/crypto.cpp           | 47 +++++++++++++++++++++++++++++++++++-
 2 files changed, 46 insertions(+), 52 deletions(-)

diff --git a/include/tins/internals.h b/include/tins/internals.h
index 38c75ca..f2d30f2 100644
--- a/include/tins/internals.h
+++ b/include/tins/internals.h
@@ -52,57 +52,6 @@ class ICMPExtensionsStructure;
 
 namespace Internals {
 
-template<size_t n>
-class byte_array {
-public:
-    typedef uint8_t* iterator;
-    typedef const uint8_t* const_iterator;
-
-    byte_array() {
-        std::fill(begin(), end(), 0);
-    }
-
-    template<typename InputIterator>
-    byte_array(InputIterator start, InputIterator last) {
-        std::copy(start, last, data);
-    }
-
-    template<typename InputIterator>
-    byte_array(InputIterator start) {
-        std::copy(start, n, data);
-    }
-
-    uint8_t& operator[](size_t i) {
-        return data[i];
-    }
-
-    uint8_t operator[](size_t i) const{
-        return data[i];
-    }
-
-    iterator begin() {
-        return data;
-    }
-
-    iterator end() {
-        return data + n;
-    }
-
-    const_iterator begin() const {
-        return data;
-    }
-
-    const_iterator end() const {
-        return data + n;
-    }
-
-    size_t size() const {
-        return n;
-    }
-private:
-    uint8_t data[n];
-};
-
 void skip_line(std::istream& input);
 bool from_hex(const std::string& str, uint32_t& result);
 bool from_hex(const std::string& str, std::string& result);
diff --git a/src/crypto.cpp b/src/crypto.cpp
index 9ffd2c1..4bf3071 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -38,8 +38,8 @@
 #endif // TINS_HAVE_WPA2_DECRYPTION
 #include "dot11/dot11_data.h"
 #include "dot11/dot11_beacon.h"
-#include "internals.h"
 #include "exceptions.h"
+#include "detail/type_traits.h"
 
 using std::string;
 using std::make_pair;
@@ -52,6 +52,51 @@ using std::fill;
 using std::runtime_error;
 
 namespace Tins {
+namespace Internals {
+
+template<size_t n>
+class byte_array {
+public:
+    typedef uint8_t* iterator;
+    typedef const uint8_t* const_iterator;
+
+    byte_array() {
+        std::memset(data, 0, size());
+    }
+
+    uint8_t& operator[](size_t i) {
+        return data[i];
+    }
+
+    uint8_t operator[](size_t i) const{
+        return data[i];
+    }
+
+    iterator begin() {
+        return data;
+    }
+
+    iterator end() {
+        return data + n;
+    }
+
+    const_iterator begin() const {
+        return data;
+    }
+
+    const_iterator end() const {
+        return data + n;
+    }
+
+    size_t size() const {
+        return n;
+    }
+private:
+    uint8_t data[n];
+};
+
+} // Internals
+
 namespace Crypto {
 
 WEPDecrypter::WEPDecrypter() 

From 28fa1b2f7ebbf16a031fe712d1f34b1bc17a5ebc Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 10:11:04 -0700
Subject: [PATCH 14/73] Move internal crypto stuff from the header into the
 source file

---
 include/tins/crypto.h |  73 +--------
 src/crypto.cpp        | 353 ++++++++++++++++++++++++------------------
 2 files changed, 201 insertions(+), 225 deletions(-)

diff --git a/include/tins/crypto.h b/include/tins/crypto.h
index 4207f9d..fd9c299 100644
--- a/include/tins/crypto.h
+++ b/include/tins/crypto.h
@@ -34,14 +34,10 @@
 
 #include <map>
 #include <string>
-#include <algorithm>
 #include <vector>
 #ifdef TINS_HAVE_WPA2_CALLBACKS
     #include <functional>
 #endif // TINS_HAVE_WPA2_CALLBACKS
-#include "utils.h"
-#include "snap.h"
-#include "rawpdu.h"
 #include "macros.h"
 #include "handshake_capturer.h"
 
@@ -50,11 +46,11 @@ namespace Tins {
 class PDU;
 class Dot11;
 class Dot11Data;
+class SNAP;
+class RawPDU;
 
 namespace Crypto {
 
-struct RC4Key;
-
 #ifdef TINS_HAVE_WPA2_DECRYPTION
 namespace WPA2 {
 
@@ -131,7 +127,6 @@ public:
 private:
     SNAP* ccmp_decrypt_unicast(const Dot11Data& dot11, RawPDU& raw) const;
     SNAP* tkip_decrypt_unicast(const Dot11Data& dot11, RawPDU& raw) const;
-    RC4Key generate_rc4_key(const Dot11Data& dot11, const RawPDU& raw) const;
 
     ptk_type ptk_;
     bool is_ccmp_;
@@ -177,27 +172,6 @@ private:
 } // WPA2
 #endif // TINS_HAVE_WPA2_DECRYPTION
 
-/**
- * \brief RC4 Key abstraction.
- */
-struct RC4Key {
-    static const size_t data_size = 256;
-
-    /**
-     * \brief Initializes the key using the provided iterator range.
-     * 
-     * \param start The start of the range.
-     * \param end The end of the range.
-     */
-    template<typename ForwardIterator>
-    RC4Key(ForwardIterator start, ForwardIterator end);
-
-    /**
-     * The actual key data.
-     */
-    uint8_t data[data_size];
-};
-
 /**
  * \brief Decrypts WEP-encrypted traffic.
  */
@@ -499,20 +473,6 @@ private:
     decrypter_type decrypter_;
 };
 
-/**
- * \brief Performs RC4 encription/decryption of the given byte range,
- * using the provided key.
- * 
- * The decrypted range will be copied to the OutputIterator provided.
- * 
- * \param start The beginning of the range.
- * \param start The end of the range.
- * \param key The key to be used.
- * \param output The iterator in which to write the output.
- */
-template<typename ForwardIterator, typename OutputIterator>
-void rc4(ForwardIterator start, ForwardIterator end, RC4Key& key, OutputIterator output);
-
 /**
  * \brief Wrapper function to create a DecrypterProxy using a 
  * WEPDecrypter as the Decrypter template parameter.
@@ -570,35 +530,6 @@ DecrypterProxy<Functor, WEPDecrypter> make_wep_decrypter_proxy(const Functor& fu
     return DecrypterProxy<Functor, WEPDecrypter>(functor);
 }
 
-// RC4 stuff
-
-template<typename ForwardIterator>
-RC4Key::RC4Key(ForwardIterator start, ForwardIterator end) {
-    for (size_t i = 0; i < data_size; ++i) {
-        data[i] = static_cast<uint8_t>(i);
-    }
-    size_t j = 0;
-    ForwardIterator iter = start;
-    for (size_t i = 0; i < data_size; ++i) {
-        j = (j + data[i] + *iter++) % 256;
-        if(iter == end) {
-            iter = start;
-        }
-        std::swap(data[i], data[j]);
-    }
-}
-
-template<typename ForwardIterator, typename OutputIterator>
-void rc4(ForwardIterator start, ForwardIterator end, RC4Key& key, OutputIterator output) {
-    size_t i = 0, j = 0;
-    while (start != end) {
-        i = (i + 1) % RC4Key::data_size;
-        j = (j + key.data[i]) % RC4Key::data_size;
-        std::swap(key.data[i], key.data[j]);
-        *output++ = *start++ ^ key.data[(key.data[i] + key.data[j]) % RC4Key::data_size];
-    }
-}
-
 } // Crypto
 } // Tins
 
diff --git a/src/crypto.cpp b/src/crypto.cpp
index 4bf3071..a3a9d9b 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -31,17 +31,22 @@
 
 #ifdef TINS_HAVE_DOT11
 
+#include <algorithm>
 #ifdef TINS_HAVE_WPA2_DECRYPTION
     #include <openssl/evp.h>
     #include <openssl/hmac.h>
     #include <openssl/aes.h>
 #endif // TINS_HAVE_WPA2_DECRYPTION
+#include "snap.h"
+#include "rawpdu.h"
 #include "dot11/dot11_data.h"
 #include "dot11/dot11_beacon.h"
 #include "exceptions.h"
+#include "utils.h"
 #include "detail/type_traits.h"
 
 using std::string;
+using std::vector;
 using std::make_pair;
 using std::equal;
 using std::copy;
@@ -99,95 +104,7 @@ private:
 
 namespace Crypto {
 
-WEPDecrypter::WEPDecrypter() 
-: key_buffer_(4) {
-    
-}
-
-void WEPDecrypter::add_password(const address_type& addr, const string& password) {
-    passwords_[addr] = password;
-    key_buffer_.resize(max(3 + password.size(), key_buffer_.size()));
-}
-
-void WEPDecrypter::remove_password(const address_type& addr) {
-    passwords_.erase(addr); 
-}
-
-bool WEPDecrypter::decrypt(PDU& pdu) {
-    Dot11Data* dot11 = pdu.find_pdu<Dot11Data>();
-    if (dot11) {
-        RawPDU* raw = dot11->find_pdu<RawPDU>();
-        if (raw) {
-            address_type addr;
-            if (!dot11->from_ds() && !dot11->to_ds()) {
-                addr = dot11->addr3();
-            }
-            else if (!dot11->from_ds() && dot11->to_ds()) {
-                addr = dot11->addr1();
-            }
-            else if (dot11->from_ds() && !dot11->to_ds()) {
-                addr = dot11->addr2();
-            }
-            else {
-                // ????
-                addr = dot11->addr3();
-            }
-            passwords_type::iterator it = passwords_.find(addr);
-            if (it != passwords_.end()) {
-                dot11->inner_pdu(decrypt(*raw, it->second));
-                // If its valid, then return true
-                if (dot11->inner_pdu()) {
-                    // it's no longer encrypted.
-                    dot11->wep(0);
-                    return true;
-                }
-            }
-        }
-    }
-    return false;
-}
-
-PDU* WEPDecrypter::decrypt(RawPDU& raw, const string& password) {
-    RawPDU::payload_type& pload = raw.payload();
-    // We require at least the IV, the encrypted checksum and something to decrypt
-    if (pload.size() <= 8) {
-        return 0;
-    }
-    copy(pload.begin(), pload.begin() + 3, key_buffer_.begin());
-    copy(password.begin(), password.end(), key_buffer_.begin() + 3);
-    
-    // Generate the key
-    RC4Key key(key_buffer_.begin(), key_buffer_.begin() + password.size() + 3);
-    rc4(pload.begin() + 4, pload.end(), key, pload.begin());
-    uint32_t payload_size = static_cast<uint32_t>(pload.size() - 8);
-    uint32_t crc = Utils::crc32(&pload[0], payload_size);
-    if (pload[pload.size() - 8] != (crc & 0xff) ||
-        pload[pload.size() - 7] != ((crc >> 8) & 0xff) ||
-        pload[pload.size() - 6] != ((crc >> 16) & 0xff) ||
-        pload[pload.size() - 5] != ((crc >> 24) & 0xff)) {
-        return 0;
-    }
-    
-    try {
-        return new SNAP(&pload[0], payload_size);
-    }
-    catch (exception_base&) {
-        return 0;
-    }
-}
-
-#ifdef TINS_HAVE_WPA2_DECRYPTION
-// WPA2Decrypter
-
-using WPA2::SessionKeys;
-
-const HWAddress<6>& min(const HWAddress<6>& lhs, const HWAddress<6>& rhs) {
-    return lhs < rhs ? lhs : rhs;
-}
-
-const HWAddress<6>& max(const HWAddress<6>& lhs, const HWAddress<6>& rhs) {
-    return lhs < rhs ? rhs : lhs;
-}
+// Helper stuff
 
 template<typename InputIterator1, typename InputIterator2, typename OutputIterator>
 void xor_range(InputIterator1 src1, InputIterator2 src2, OutputIterator dst, size_t sz) {
@@ -287,6 +204,198 @@ uint16_t lower_byte(uint16_t value) {
     return value & 0xff;
 }
 
+// RC4 classes/functions
+
+struct RC4Key {
+    static const size_t data_size = 256;
+
+    template<typename ForwardIterator>
+    RC4Key(ForwardIterator start, ForwardIterator end) {
+        for (size_t i = 0; i < data_size; ++i) {
+            data[i] = static_cast<uint8_t>(i);
+        }
+        size_t j = 0;
+        ForwardIterator iter = start;
+        for (size_t i = 0; i < data_size; ++i) {
+            j = (j + data[i] + *iter++) % 256;
+            if(iter == end) {
+                iter = start;
+            }
+            std::swap(data[i], data[j]);
+        }
+    }
+
+    static RC4Key from_packet(const Dot11Data& dot11, const RawPDU& raw,
+                              const vector<uint8_t>& ptk) { 
+        const RawPDU::payload_type& pload = raw.payload();
+        const uint8_t* tk = &ptk[0] + 32;
+        Internals::byte_array<16> rc4_key;
+        uint16_t ppk[6];
+        const Dot11::address_type addr = dot11.addr2();
+        // Phase 1
+        ppk[0] = join_bytes(pload[4], pload[5]);
+        ppk[1] = join_bytes(pload[6], pload[7]);
+        ppk[2] = join_bytes(addr[1], addr[0]);
+        ppk[3] = join_bytes(addr[3], addr[2]);
+        ppk[4] = join_bytes(addr[5], addr[4]);
+
+        for (size_t i = 0; i < 4; ++i) {
+            ppk[0] += sbox(ppk[4] ^ join_bytes(tk[1], tk[0]));
+            ppk[1] += sbox(ppk[0] ^ join_bytes(tk[5], tk[4]));
+            ppk[2] += sbox(ppk[1] ^ join_bytes(tk[9], tk[8]));
+            ppk[3] += sbox(ppk[2] ^ join_bytes(tk[13], tk[12]));
+            ppk[4] += sbox(ppk[3] ^ join_bytes(tk[1], tk[0])) + 2*i;
+            ppk[0] += sbox(ppk[4] ^ join_bytes(tk[3], tk[2]));
+            ppk[1] += sbox(ppk[0] ^ join_bytes(tk[7], tk[6]));
+            ppk[2] += sbox(ppk[1] ^ join_bytes(tk[11], tk[10]));
+            ppk[3] += sbox(ppk[2] ^ join_bytes(tk[15], tk[14]));
+            ppk[4] += sbox(ppk[3] ^ join_bytes(tk[3], tk[2])) + 2*i + 1;
+        }
+
+        // Phase 2, step 1
+        ppk[5] = ppk[4] + join_bytes(pload[0], pload[2]);
+
+        // Phase 2, step 2
+        ppk[0] += sbox(ppk[5] ^ join_bytes(tk[1], tk[0]));
+        ppk[1] += sbox(ppk[0] ^ join_bytes(tk[3], tk[2]));
+        ppk[2] += sbox(ppk[1] ^ join_bytes(tk[5], tk[4]));
+        ppk[3] += sbox(ppk[2] ^ join_bytes(tk[7], tk[6]));
+        ppk[4] += sbox(ppk[3] ^ join_bytes(tk[9], tk[8]));
+        ppk[5] += sbox(ppk[4] ^ join_bytes(tk[11], tk[10]));
+
+        ppk[0] += rotate(ppk[5] ^ join_bytes(tk[13], tk[12]));
+        ppk[1] += rotate(ppk[0] ^ join_bytes(tk[15], tk[14]));
+        ppk[2] += rotate(ppk[1]);
+        ppk[3] += rotate(ppk[2]);
+        ppk[4] += rotate(ppk[3]);
+        ppk[5] += rotate(ppk[4]);
+
+        // Phase 2, step 3
+        rc4_key[0] = upper_byte(join_bytes(pload[0], pload[2]));
+        rc4_key[1] = (rc4_key[0] | 0x20) & 0x7f;
+        rc4_key[2] = lower_byte(join_bytes(pload[0], pload[2]));
+        rc4_key[3] = lower_byte((ppk[5] ^ join_bytes(tk[1], tk[0])) >> 1);
+        rc4_key[4] = lower_byte(ppk[0]);
+        rc4_key[5] = upper_byte(ppk[0]);
+        rc4_key[6] = lower_byte(ppk[1]);
+        rc4_key[7] = upper_byte(ppk[1]);
+        rc4_key[8] = lower_byte(ppk[2]);
+        rc4_key[9] = upper_byte(ppk[2]);
+        rc4_key[10] = lower_byte(ppk[3]);
+        rc4_key[11] = upper_byte(ppk[3]);
+        rc4_key[12] = lower_byte(ppk[4]);
+        rc4_key[13] = upper_byte(ppk[4]);
+        rc4_key[14] = lower_byte(ppk[5]);
+        rc4_key[15] = upper_byte(ppk[5]);
+        return RC4Key(rc4_key.begin(), rc4_key.end());
+    }
+
+    uint8_t data[data_size];
+};
+
+template<typename ForwardIterator, typename OutputIterator>
+void rc4(ForwardIterator start, ForwardIterator end, RC4Key& key, OutputIterator output) {
+    size_t i = 0, j = 0;
+    while (start != end) {
+        i = (i + 1) % RC4Key::data_size;
+        j = (j + key.data[i]) % RC4Key::data_size;
+        std::swap(key.data[i], key.data[j]);
+        *output++ = *start++ ^ key.data[(key.data[i] + key.data[j]) % RC4Key::data_size];
+    }
+}
+
+// WEPDecrypter
+
+WEPDecrypter::WEPDecrypter() 
+: key_buffer_(4) {
+
+}
+
+void WEPDecrypter::add_password(const address_type& addr, const string& password) {
+    passwords_[addr] = password;
+    key_buffer_.resize(max(3 + password.size(), key_buffer_.size()));
+}
+
+void WEPDecrypter::remove_password(const address_type& addr) {
+    passwords_.erase(addr); 
+}
+
+bool WEPDecrypter::decrypt(PDU& pdu) {
+    Dot11Data* dot11 = pdu.find_pdu<Dot11Data>();
+    if (dot11) {
+        RawPDU* raw = dot11->find_pdu<RawPDU>();
+        if (raw) {
+            address_type addr;
+            if (!dot11->from_ds() && !dot11->to_ds()) {
+                addr = dot11->addr3();
+            }
+            else if (!dot11->from_ds() && dot11->to_ds()) {
+                addr = dot11->addr1();
+            }
+            else if (dot11->from_ds() && !dot11->to_ds()) {
+                addr = dot11->addr2();
+            }
+            else {
+                // ????
+                addr = dot11->addr3();
+            }
+            passwords_type::iterator it = passwords_.find(addr);
+            if (it != passwords_.end()) {
+                dot11->inner_pdu(decrypt(*raw, it->second));
+                // If its valid, then return true
+                if (dot11->inner_pdu()) {
+                    // it's no longer encrypted.
+                    dot11->wep(0);
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+}
+
+PDU* WEPDecrypter::decrypt(RawPDU& raw, const string& password) {
+    RawPDU::payload_type& pload = raw.payload();
+    // We require at least the IV, the encrypted checksum and something to decrypt
+    if (pload.size() <= 8) {
+        return 0;
+    }
+    copy(pload.begin(), pload.begin() + 3, key_buffer_.begin());
+    copy(password.begin(), password.end(), key_buffer_.begin() + 3);
+
+    // Generate the key
+    RC4Key key(key_buffer_.begin(), key_buffer_.begin() + password.size() + 3);
+    rc4(pload.begin() + 4, pload.end(), key, pload.begin());
+    uint32_t payload_size = static_cast<uint32_t>(pload.size() - 8);
+    uint32_t crc = Utils::crc32(&pload[0], payload_size);
+    if (pload[pload.size() - 8] != (crc & 0xff) ||
+        pload[pload.size() - 7] != ((crc >> 8) & 0xff) ||
+        pload[pload.size() - 6] != ((crc >> 16) & 0xff) ||
+        pload[pload.size() - 5] != ((crc >> 24) & 0xff)) {
+        return 0;
+    }
+
+    try {
+        return new SNAP(&pload[0], payload_size);
+    }
+    catch (exception_base&) {
+        return 0;
+    }
+}
+
+#ifdef TINS_HAVE_WPA2_DECRYPTION
+// WPA2Decrypter
+
+using WPA2::SessionKeys;
+
+const HWAddress<6>& min(const HWAddress<6>& lhs, const HWAddress<6>& rhs) {
+    return lhs < rhs ? lhs : rhs;
+}
+
+const HWAddress<6>& max(const HWAddress<6>& lhs, const HWAddress<6>& rhs) {
+    return lhs < rhs ? rhs : lhs;
+}
+
 HWAddress<6> get_bssid(const Dot11Data& dot11) {
     if (dot11.from_ds() && !dot11.to_ds()) {
         return dot11.addr3();
@@ -442,76 +551,12 @@ SNAP* SessionKeys::ccmp_decrypt_unicast(const Dot11Data& dot11, RawPDU& raw) con
     }
 }
 
-RC4Key SessionKeys::generate_rc4_key(const Dot11Data& dot11, const RawPDU& raw) const {
-    const RawPDU::payload_type& pload = raw.payload();
-    const uint8_t* tk = &ptk_[0] + 32;
-    Internals::byte_array<16> rc4_key;
-    uint16_t ppk[6];
-    const Dot11::address_type addr = dot11.addr2();
-    // Phase 1
-    ppk[0] = join_bytes(pload[4], pload[5]);
-    ppk[1] = join_bytes(pload[6], pload[7]);
-    ppk[2] = join_bytes(addr[1], addr[0]);
-    ppk[3] = join_bytes(addr[3], addr[2]);
-    ppk[4] = join_bytes(addr[5], addr[4]);
-    
-    for (size_t i = 0; i < 4; ++i) {
-        ppk[0] += sbox(ppk[4] ^ join_bytes(tk[1], tk[0]));
-        ppk[1] += sbox(ppk[0] ^ join_bytes(tk[5], tk[4]));
-        ppk[2] += sbox(ppk[1] ^ join_bytes(tk[9], tk[8]));
-        ppk[3] += sbox(ppk[2] ^ join_bytes(tk[13], tk[12]));
-        ppk[4] += sbox(ppk[3] ^ join_bytes(tk[1], tk[0])) + 2*i;
-        ppk[0] += sbox(ppk[4] ^ join_bytes(tk[3], tk[2]));
-        ppk[1] += sbox(ppk[0] ^ join_bytes(tk[7], tk[6]));
-        ppk[2] += sbox(ppk[1] ^ join_bytes(tk[11], tk[10]));
-        ppk[3] += sbox(ppk[2] ^ join_bytes(tk[15], tk[14]));
-        ppk[4] += sbox(ppk[3] ^ join_bytes(tk[3], tk[2])) + 2*i + 1;
-    }
-
-    // Phase 2, step 1
-    ppk[5] = ppk[4] + join_bytes(pload[0], pload[2]);
-    
-    // Phase 2, step 2
-    ppk[0] += sbox(ppk[5] ^ join_bytes(tk[1], tk[0]));
-    ppk[1] += sbox(ppk[0] ^ join_bytes(tk[3], tk[2]));
-    ppk[2] += sbox(ppk[1] ^ join_bytes(tk[5], tk[4]));
-    ppk[3] += sbox(ppk[2] ^ join_bytes(tk[7], tk[6]));
-    ppk[4] += sbox(ppk[3] ^ join_bytes(tk[9], tk[8]));
-    ppk[5] += sbox(ppk[4] ^ join_bytes(tk[11], tk[10]));
-    
-    ppk[0] += rotate(ppk[5] ^ join_bytes(tk[13], tk[12]));
-    ppk[1] += rotate(ppk[0] ^ join_bytes(tk[15], tk[14]));
-    ppk[2] += rotate(ppk[1]);
-    ppk[3] += rotate(ppk[2]);
-    ppk[4] += rotate(ppk[3]);
-    ppk[5] += rotate(ppk[4]);
-    
-    // Phase 2, step 3
-    rc4_key[0] = upper_byte(join_bytes(pload[0], pload[2]));
-    rc4_key[1] = (rc4_key[0] | 0x20) & 0x7f;
-    rc4_key[2] = lower_byte(join_bytes(pload[0], pload[2]));
-    rc4_key[3] = lower_byte((ppk[5] ^ join_bytes(tk[1], tk[0])) >> 1);
-    rc4_key[4] = lower_byte(ppk[0]);
-    rc4_key[5] = upper_byte(ppk[0]);
-    rc4_key[6] = lower_byte(ppk[1]);
-    rc4_key[7] = upper_byte(ppk[1]);
-    rc4_key[8] = lower_byte(ppk[2]);
-    rc4_key[9] = upper_byte(ppk[2]);
-    rc4_key[10] = lower_byte(ppk[3]);
-    rc4_key[11] = upper_byte(ppk[3]);
-    rc4_key[12] = lower_byte(ppk[4]);
-    rc4_key[13] = upper_byte(ppk[4]);
-    rc4_key[14] = lower_byte(ppk[5]);
-    rc4_key[15] = upper_byte(ppk[5]);
-    return RC4Key(rc4_key.begin(), rc4_key.end());
-}
-
 SNAP* SessionKeys::tkip_decrypt_unicast(const Dot11Data& dot11, RawPDU& raw) const {
     // at least 20 bytes for IV + crc + stuff
     if (raw.payload_size() <= 20) {
         return 0;
     }
-    Crypto::RC4Key key = generate_rc4_key(dot11, raw);
+    Crypto::RC4Key key = RC4Key::from_packet(dot11, raw, ptk_);
     RawPDU::payload_type& pload = raw.payload();
     rc4(pload.begin() + 8, pload.end(), key, pload.begin());
 

From af325f00d9fc0454be4b3990dd32df24b4e09fe7 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 10:13:58 -0700
Subject: [PATCH 15/73] Move functions to parse /proc/net/routes into utils.cpp

---
 include/tins/internals.h |  4 ----
 src/internals.cpp        | 50 --------------------------------------
 src/utils.cpp            | 52 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 54 deletions(-)

diff --git a/include/tins/internals.h b/include/tins/internals.h
index f2d30f2..958780d 100644
--- a/include/tins/internals.h
+++ b/include/tins/internals.h
@@ -52,10 +52,6 @@ class ICMPExtensionsStructure;
 
 namespace Internals {
 
-void skip_line(std::istream& input);
-bool from_hex(const std::string& str, uint32_t& result);
-bool from_hex(const std::string& str, std::string& result);
-
 PDU* pdu_from_flag(Constants::Ethernet::e flag, const uint8_t* buffer,
   uint32_t size, bool rawpdu_on_no_match = true);
 PDU* pdu_from_flag(Constants::IP::e flag, const uint8_t* buffer,
diff --git a/src/internals.cpp b/src/internals.cpp
index 7f9b384..4a70972 100644
--- a/src/internals.cpp
+++ b/src/internals.cpp
@@ -64,56 +64,6 @@ using Tins::Memory::InputMemoryStream;
 namespace Tins {
 namespace Internals {
 
-bool from_hex(const string& str, uint32_t& result) {
-    size_t i = 0;
-    result = 0;
-    while (i < str.size()) {
-        uint8_t tmp;
-        if (str[i] >= 'A' && str[i] <= 'F') {
-            tmp = (str[i] - 'A' + 10);
-        }
-        else if (str[i] >= '0' && str[i] <= '9') {
-            tmp = (str[i] - '0');
-        }
-        else {
-            return false;
-        }
-        result = (result << 4) | tmp;
-        i++;
-    }
-    return true;
-}
-
-bool from_hex(const string& str, string& result) {
-    result = "";
-    for (size_t i = 0; i < str.size(); i+= 2) {
-        uint8_t value = 0;
-        for (size_t j = i; j < i + 2 && j < str.size(); ++j) {
-            if (str[j] >= 'A' && str[j] <= 'F') {
-                value = (value << 4) | (str[j] - 'A' + 10);
-            }
-            else if (str[j] >= 'a' && str[j] <= 'f') {
-                value = (value << 4) | (str[j] - 'a' + 10);
-            }
-            else if (str[j] >= '0' && str[j] <= '9') {
-                value = (value << 4) | (str[j] - '0');
-            }
-            else {
-                return false;
-            }
-        }
-        result.push_back(value);
-    }
-    return true;
-}
-
-void skip_line(std::istream& input) {
-    int c = 0;
-    while (c != '\n' && input) {
-        c = input.get();
-    }
-}
-
 Tins::PDU* pdu_from_flag(Constants::Ethernet::e flag,
                          const uint8_t* buffer,
                          uint32_t size,
diff --git a/src/utils.cpp b/src/utils.cpp
index 3a6e0b9..8645607 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -72,6 +72,7 @@
 #include "detail/smart_ptr.h"
 
 using std::string;
+using std::istream;
 using std::set;
 using std::ifstream;
 using std::vector;
@@ -82,6 +83,57 @@ using Tins::Memory::InputMemoryStream;
 using Tins::Memory::OutputMemoryStream;
 
 /** \cond */
+
+bool from_hex(const string& str, uint32_t& result) {
+    size_t i = 0;
+    result = 0;
+    while (i < str.size()) {
+        uint8_t tmp;
+        if (str[i] >= 'A' && str[i] <= 'F') {
+            tmp = (str[i] - 'A' + 10);
+        }
+        else if (str[i] >= '0' && str[i] <= '9') {
+            tmp = (str[i] - '0');
+        }
+        else {
+            return false;
+        }
+        result = (result << 4) | tmp;
+        i++;
+    }
+    return true;
+}
+
+bool from_hex(const string& str, string& result) {
+    result.clear();
+    for (size_t i = 0; i < str.size(); i+= 2) {
+        uint8_t value = 0;
+        for (size_t j = i; j < i + 2 && j < str.size(); ++j) {
+            if (str[j] >= 'A' && str[j] <= 'F') {
+                value = (value << 4) | (str[j] - 'A' + 10);
+            }
+            else if (str[j] >= 'a' && str[j] <= 'f') {
+                value = (value << 4) | (str[j] - 'a' + 10);
+            }
+            else if (str[j] >= '0' && str[j] <= '9') {
+                value = (value << 4) | (str[j] - '0');
+            }
+            else {
+                return false;
+            }
+        }
+        result.push_back(value);
+    }
+    return true;
+}
+
+void skip_line(istream& input) {
+    int c = 0;
+    while (c != '\n' && input) {
+        c = input.get();
+    }
+}
+
 struct InterfaceCollector {
     set<string> ifaces;
     

From ac6927867638bf4e542cf97a58114a661d8f4818 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 10:21:26 -0700
Subject: [PATCH 16/73] Move helpers for address types in internals.h to their
 own header

---
 include/tins/address_range.h          |   2 +-
 include/tins/detail/address_helpers.h | 106 ++++++++++++++++++++++++++
 include/tins/internals.h              |  54 -------------
 src/CMakeLists.txt                    |   1 +
 src/detail/address_helpers.cpp        |  78 +++++++++++++++++++
 src/internals.cpp                     |  36 ---------
 src/ip_address.cpp                    |   1 +
 7 files changed, 187 insertions(+), 91 deletions(-)
 create mode 100644 include/tins/detail/address_helpers.h
 create mode 100644 src/detail/address_helpers.cpp

diff --git a/include/tins/address_range.h b/include/tins/address_range.h
index fb10cf6..89a753a 100644
--- a/include/tins/address_range.h
+++ b/include/tins/address_range.h
@@ -33,7 +33,7 @@
 #include <stdexcept>
 #include <iterator>
 #include "endianness.h"
-#include "internals.h"
+#include "detail/address_helpers.h"
 
 namespace Tins {
 /**
diff --git a/include/tins/detail/address_helpers.h b/include/tins/detail/address_helpers.h
new file mode 100644
index 0000000..4a8f4be
--- /dev/null
+++ b/include/tins/detail/address_helpers.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef TINS_ADDRESS_HELPERS_H
+#define TINS_ADDRESS_HELPERS_H
+
+#include "hw_address.h"
+
+/**
+ * \cond
+ */
+namespace Tins {
+
+class IPv4Address;
+class IPv6Address;
+
+namespace Internals {
+
+template<typename T>
+bool increment_buffer(T& addr) {
+    typename T::iterator it = addr.end() - 1;
+    while (it >= addr.begin() && *it == 0xff) {
+        *it = 0;
+        --it;
+    }
+    // reached end
+    if (it < addr.begin()) {
+        return true;
+    }
+    (*it)++;
+    return false;
+}
+
+template<typename T>
+bool decrement_buffer(T& addr) {
+    typename T::iterator it = addr.end() - 1;
+    while (it >= addr.begin() && *it == 0) {
+        *it = 0xff;
+        --it;
+    }
+    // reached end
+    if (it < addr.begin()) {
+        return true;
+    }
+    (*it)--;
+    return false;
+}
+
+bool increment(IPv4Address& addr);
+bool increment(IPv6Address& addr);
+bool decrement(IPv4Address& addr);
+bool decrement(IPv6Address& addr);
+template<size_t n>
+bool increment(HWAddress<n>& addr) {
+    return increment_buffer(addr);
+}
+template<size_t n>
+bool decrement(HWAddress<n>& addr) {
+    return decrement_buffer(addr);
+}
+
+IPv4Address last_address_from_mask(IPv4Address addr, IPv4Address mask);
+IPv6Address last_address_from_mask(IPv6Address addr, const IPv6Address& mask);
+template<size_t n>
+HWAddress<n> last_address_from_mask(HWAddress<n> addr, const HWAddress<n>& mask) {
+    typename HWAddress<n>::iterator addr_iter = addr.begin();
+    for (typename HWAddress<n>::const_iterator it = mask.begin(); it != mask.end(); ++it, ++addr_iter) {
+        *addr_iter = *addr_iter | ~*it;
+    }
+    return addr;
+}
+
+} // Internals
+} // Tins
+
+/**
+ * \endcond
+ */
+
+#endif // TINS_ADDRESS_HELPERS_H
diff --git a/include/tins/internals.h b/include/tins/internals.h
index 958780d..6540e1f 100644
--- a/include/tins/internals.h
+++ b/include/tins/internals.h
@@ -71,63 +71,9 @@ uint32_t get_padded_icmp_inner_pdu_size(const PDU* inner_pdu, uint32_t pad_align
 void try_parse_icmp_extensions(Memory::InputMemoryStream& stream,
     uint32_t payload_length, ICMPExtensionsStructure& extensions);
 
-template<typename T>
-bool increment_buffer(T& addr) {
-    typename T::iterator it = addr.end() - 1;
-    while (it >= addr.begin() && *it == 0xff) {
-        *it = 0;
-        --it;
-    }
-    // reached end
-    if (it < addr.begin()) {
-        return true;
-    }
-    (*it)++;
-    return false;
-}
-
-template<typename T>
-bool decrement_buffer(T& addr) {
-    typename T::iterator it = addr.end() - 1;
-    while (it >= addr.begin() && *it == 0) {
-        *it = 0xff;
-        --it;
-    }
-    // reached end
-    if (it < addr.begin()) {
-        return true;
-    }
-    (*it)--;
-    return false;
-}
-
-bool increment(IPv4Address& addr);
-bool increment(IPv6Address& addr);
-bool decrement(IPv4Address& addr);
-bool decrement(IPv6Address& addr);
-template<size_t n>
-bool increment(HWAddress<n>& addr) {
-    return increment_buffer(addr);
-}
-template<size_t n>
-bool decrement(HWAddress<n>& addr) {
-    return decrement_buffer(addr);
-}
-
 // Compares sequence numbers as defined by RFC 1982.
 int seq_compare(uint32_t seq1, uint32_t seq2);
 
-IPv4Address last_address_from_mask(IPv4Address addr, IPv4Address mask);
-IPv6Address last_address_from_mask(IPv6Address addr, const IPv6Address& mask);
-template<size_t n>
-HWAddress<n> last_address_from_mask(HWAddress<n> addr, const HWAddress<n>& mask) {
-    typename HWAddress<n>::iterator addr_iter = addr.begin();
-    for (typename HWAddress<n>::const_iterator it = mask.begin(); it != mask.end(); ++it, ++addr_iter) {
-        *addr_iter = *addr_iter | ~*it;
-    }
-    return addr;
-}
-
 inline bool is_dot3(const uint8_t* ptr, size_t sz) {
     return (sz >= 13 && ptr[12] < 8);
 }
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 04d069b..791aad7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,6 +21,7 @@ set(SOURCES
     stp.cpp
     pppoe.cpp
     crypto.cpp
+    detail/address_helpers.cpp
     dhcp.cpp
     dhcpv6.cpp
     dns.cpp
diff --git a/src/detail/address_helpers.cpp b/src/detail/address_helpers.cpp
new file mode 100644
index 0000000..2d58011
--- /dev/null
+++ b/src/detail/address_helpers.cpp
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "ip_address.h"
+#include "ipv6_address.h"
+#include "endianness.h"
+#include "detail/address_helpers.h"
+
+using Tins::IPv4Address;
+using Tins::IPv6Address;
+
+namespace Tins {
+namespace Internals {
+
+bool increment(IPv4Address &addr) {
+    uint32_t addr_int = Endian::be_to_host<uint32_t>(addr);
+    bool reached_end = ++addr_int == 0xffffffff;
+    addr = IPv4Address(Endian::be_to_host<uint32_t>(addr_int));
+    return reached_end;
+}
+
+bool increment(IPv6Address& addr) {
+    return increment_buffer(addr);
+}
+
+bool decrement(IPv4Address& addr) {
+    uint32_t addr_int = Endian::be_to_host<uint32_t>(addr);
+    bool reached_end = --addr_int == 0;
+    addr = IPv4Address(Endian::be_to_host<uint32_t>(addr_int));
+    return reached_end;
+}
+
+bool decrement(IPv6Address& addr) {
+    return decrement_buffer(addr);
+}
+
+IPv4Address last_address_from_mask(IPv4Address addr, IPv4Address mask) {
+    uint32_t addr_int = Endian::be_to_host<uint32_t>(addr),
+             mask_int = Endian::be_to_host<uint32_t>(mask);
+    return IPv4Address(Endian::host_to_be(addr_int | ~mask_int));
+}
+
+IPv6Address last_address_from_mask(IPv6Address addr, const IPv6Address& mask) {
+    IPv6Address::iterator addr_iter = addr.begin();
+    for (IPv6Address::const_iterator it = mask.begin(); it != mask.end(); ++it, ++addr_iter) {
+        *addr_iter = *addr_iter | ~*it;
+    }
+    return addr;
+}
+
+} // Internals
+} // Tins
diff --git a/src/internals.cpp b/src/internals.cpp
index 4a70972..f4122c6 100644
--- a/src/internals.cpp
+++ b/src/internals.cpp
@@ -347,28 +347,6 @@ PDU::PDUType ip_type_to_pdu_flag(Constants::IP::e flag) {
     };
 }
 
-bool increment(IPv4Address &addr) {
-    uint32_t addr_int = Endian::be_to_host<uint32_t>(addr);
-    bool reached_end = ++addr_int == 0xffffffff;
-    addr = IPv4Address(Endian::be_to_host<uint32_t>(addr_int));
-    return reached_end;
-}
-
-bool increment(IPv6Address& addr) {
-    return increment_buffer(addr);
-}
-
-bool decrement(IPv4Address& addr) {
-    uint32_t addr_int = Endian::be_to_host<uint32_t>(addr);
-    bool reached_end = --addr_int == 0;
-    addr = IPv4Address(Endian::be_to_host<uint32_t>(addr_int));
-    return reached_end;
-}
-
-bool decrement(IPv6Address& addr) {
-    return decrement_buffer(addr);
-}
-
 int seq_compare(uint32_t seq1, uint32_t seq2) {
     // As defined by RFC 1982 - 2 ^ (SERIAL_BITS - 1)
     static const uint32_t seq_number_diff = 2147483648U;
@@ -383,19 +361,5 @@ int seq_compare(uint32_t seq1, uint32_t seq2) {
     }
 }
 
-IPv4Address last_address_from_mask(IPv4Address addr, IPv4Address mask) {
-    uint32_t addr_int = Endian::be_to_host<uint32_t>(addr),
-             mask_int = Endian::be_to_host<uint32_t>(mask);
-    return IPv4Address(Endian::host_to_be(addr_int | ~mask_int));
-}
-
-IPv6Address last_address_from_mask(IPv6Address addr, const IPv6Address& mask) {
-    IPv6Address::iterator addr_iter = addr.begin();
-    for (IPv6Address::const_iterator it = mask.begin(); it != mask.end(); ++it, ++addr_iter) {
-        *addr_iter = *addr_iter | ~*it;
-    }
-    return addr;
-}
-
 } // namespace Internals
 } // namespace Tins
diff --git a/src/ip_address.cpp b/src/ip_address.cpp
index 659f736..740ab4c 100644
--- a/src/ip_address.cpp
+++ b/src/ip_address.cpp
@@ -39,6 +39,7 @@
 #include "ip_address.h"
 #include "endianness.h"
 #include "address_range.h"
+#include "exceptions.h"
 
 using std::string;
 using std::ostringstream;

From c50c4c105c6db886a602ae71f388f9b5f4110deb Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 10:30:55 -0700
Subject: [PATCH 17/73] Add relative includes on detail headers

---
 include/tins/detail/address_helpers.h | 2 +-
 include/tins/detail/type_traits.h     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/tins/detail/address_helpers.h b/include/tins/detail/address_helpers.h
index 4a8f4be..587bba8 100644
--- a/include/tins/detail/address_helpers.h
+++ b/include/tins/detail/address_helpers.h
@@ -30,7 +30,7 @@
 #ifndef TINS_ADDRESS_HELPERS_H
 #define TINS_ADDRESS_HELPERS_H
 
-#include "hw_address.h"
+#include "../hw_address.h"
 
 /**
  * \cond
diff --git a/include/tins/detail/type_traits.h b/include/tins/detail/type_traits.h
index 23aebf8..f133d5c 100644
--- a/include/tins/detail/type_traits.h
+++ b/include/tins/detail/type_traits.h
@@ -31,7 +31,7 @@
 #define TINS_TYPE_TRAITS_H
 
 #include <stdint.h>
-#include "cxxstd.h"
+#include "../cxxstd.h"
 #if TINS_IS_CXX11
     #include <type_traits>
 #endif

From 6f32a1982a079803b88bf9967228e14a36562ca0 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 10:31:11 -0700
Subject: [PATCH 18/73] Remove useless stdexcept includes

---
 include/tins/ipv6.h          | 1 -
 include/tins/ipv6_address.h  | 1 -
 include/tins/packet_sender.h | 1 -
 include/tins/packet_writer.h | 1 -
 include/tins/sniffer.h       | 1 -
 include/tins/tcp.h           | 1 -
 6 files changed, 6 deletions(-)

diff --git a/include/tins/ipv6.h b/include/tins/ipv6.h
index 727bd2b..95d3e30 100644
--- a/include/tins/ipv6.h
+++ b/include/tins/ipv6.h
@@ -31,7 +31,6 @@
 #define TINS_IPV6_h
 
 #include <list>
-#include <stdexcept>
 #include "macros.h"
 #include "pdu.h"
 #include "endianness.h"
diff --git a/include/tins/ipv6_address.h b/include/tins/ipv6_address.h
index 87ba039..fcec9b3 100644
--- a/include/tins/ipv6_address.h
+++ b/include/tins/ipv6_address.h
@@ -31,7 +31,6 @@
 #define TINS_IPV6_ADDRESS
 
 #include <string>
-#include <stdexcept>
 #include <iosfwd>
 #include <stdint.h>
 #include "cxxstd.h"
diff --git a/include/tins/packet_sender.h b/include/tins/packet_sender.h
index 130a9b2..eb6b09c 100644
--- a/include/tins/packet_sender.h
+++ b/include/tins/packet_sender.h
@@ -32,7 +32,6 @@
 
 
 #include <string>
-#include <stdexcept>
 #include <vector>
 #include <stdint.h>
 #include <map>
diff --git a/include/tins/packet_writer.h b/include/tins/packet_writer.h
index ef9f2c9..79b7b8e 100644
--- a/include/tins/packet_writer.h
+++ b/include/tins/packet_writer.h
@@ -32,7 +32,6 @@
 
 #include "utils.h"
 #include <string>
-#include <iterator>
 #include "macros.h"
 #include "cxxstd.h"
 
diff --git a/include/tins/sniffer.h b/include/tins/sniffer.h
index 2cd2ec0..d0c8f11 100644
--- a/include/tins/sniffer.h
+++ b/include/tins/sniffer.h
@@ -33,7 +33,6 @@
 
 #include <string>
 #include <memory>
-#include <stdexcept>
 #include <iterator>
 #include "pdu.h"
 #include "packet.h"
diff --git a/include/tins/tcp.h b/include/tins/tcp.h
index 0f11fa4..4f762d6 100644
--- a/include/tins/tcp.h
+++ b/include/tins/tcp.h
@@ -34,7 +34,6 @@
 #include <list>
 #include <vector>
 #include <stdint.h>
-#include <stdexcept>
 #include <utility>
 #include "pdu.h"
 #include "macros.h"

From 110adc58dc76ec346329e7ff43bf27ccb00cd96c Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 10:53:21 -0700
Subject: [PATCH 19/73] Move ICMP extension helpers into their own file

---
 include/tins/detail/icmp_extension_helpers.h | 61 ++++++++++++++
 include/tins/internals.h                     |  4 -
 src/CMakeLists.txt                           |  1 +
 src/detail/icmp_extension_helpers.cpp        | 86 ++++++++++++++++++++
 src/icmp.cpp                                 |  2 +-
 src/icmpv6.cpp                               |  2 +-
 src/internals.cpp                            | 45 ----------
 7 files changed, 150 insertions(+), 51 deletions(-)
 create mode 100644 include/tins/detail/icmp_extension_helpers.h
 create mode 100644 src/detail/icmp_extension_helpers.cpp

diff --git a/include/tins/detail/icmp_extension_helpers.h b/include/tins/detail/icmp_extension_helpers.h
new file mode 100644
index 0000000..cfd6bd1
--- /dev/null
+++ b/include/tins/detail/icmp_extension_helpers.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef TINS_ICMP_EXTENSION_HELPERS_H
+#define TINS_ICMP_EXTENSION_HELPERS_H
+
+#include <stdint.h>
+
+/**
+ * \cond
+ */
+namespace Tins {
+
+class PDU;
+class ICMPExtensionsStructure;
+
+namespace Memory {
+class InputMemoryStream;
+} // Memory
+
+namespace Internals {
+
+uint32_t get_padded_icmp_inner_pdu_size(const PDU* inner_pdu, uint32_t pad_alignment);
+void try_parse_icmp_extensions(Memory::InputMemoryStream& stream, uint32_t payload_length,
+                               ICMPExtensionsStructure& extensions);
+
+
+} // Internals
+} // Tins
+
+/**
+ * \endcond
+ */
+
+#endif // TINS_ICMP_EXTENSION_HELPERS_H
diff --git a/include/tins/internals.h b/include/tins/internals.h
index 6540e1f..caddac4 100644
--- a/include/tins/internals.h
+++ b/include/tins/internals.h
@@ -67,10 +67,6 @@ PDU::PDUType ether_type_to_pdu_flag(Constants::Ethernet::e flag);
 Constants::IP::e pdu_flag_to_ip_type(PDU::PDUType flag);
 PDU::PDUType ip_type_to_pdu_flag(Constants::IP::e flag);
 
-uint32_t get_padded_icmp_inner_pdu_size(const PDU* inner_pdu, uint32_t pad_alignment);
-void try_parse_icmp_extensions(Memory::InputMemoryStream& stream,
-    uint32_t payload_length, ICMPExtensionsStructure& extensions);
-
 // Compares sequence numbers as defined by RFC 1982.
 int seq_compare(uint32_t seq1, uint32_t seq2);
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 791aad7..f340fb6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,6 +22,7 @@ set(SOURCES
     pppoe.cpp
     crypto.cpp
     detail/address_helpers.cpp
+    detail/icmp_extension_helpers.cpp
     dhcp.cpp
     dhcpv6.cpp
     dns.cpp
diff --git a/src/detail/icmp_extension_helpers.cpp b/src/detail/icmp_extension_helpers.cpp
new file mode 100644
index 0000000..a2eea40
--- /dev/null
+++ b/src/detail/icmp_extension_helpers.cpp
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "detail/icmp_extension_helpers.h"
+#include "memory_helpers.h"
+#include "pdu.h"
+#include "icmp_extension.h"
+
+using Tins::Memory::InputMemoryStream;
+
+namespace Tins {
+namespace Internals {
+
+uint32_t get_padded_icmp_inner_pdu_size(const PDU* inner_pdu, uint32_t pad_alignment) {
+        // This gets the size of the next pdu, padded to the next 32 bit word boundary
+    if (inner_pdu) {
+        uint32_t inner_pdu_size = inner_pdu->size();
+        uint32_t padding = inner_pdu_size % pad_alignment;
+        inner_pdu_size = padding ? (inner_pdu_size - padding + pad_alignment) : inner_pdu_size;
+        return inner_pdu_size;
+    }
+    else {
+        return 0;
+    }
+}
+
+void try_parse_icmp_extensions(InputMemoryStream& stream,
+                               uint32_t payload_length,
+                               ICMPExtensionsStructure& extensions) {
+    if (!stream) {
+        return;
+    }
+    // Check if this is one of the types defined in RFC 4884
+    const uint32_t minimum_payload = ICMPExtensionsStructure::MINIMUM_ICMP_PAYLOAD;
+    // Check if we actually have this amount of data and whether it's more than
+    // the minimum encapsulated packet size
+    const uint8_t* extensions_ptr;
+    uint32_t extensions_size;
+    if (stream.can_read(payload_length) && payload_length >= minimum_payload) {
+        extensions_ptr = stream.pointer() + payload_length;
+        extensions_size = stream.size() - payload_length;
+    }
+    else if (stream.can_read(minimum_payload)) {
+        // This packet might be non-rfc compliant. In that case the length
+        // field can contain garbage.
+        extensions_ptr = stream.pointer() + minimum_payload;
+        extensions_size = stream.size() - minimum_payload;
+    }
+    else {
+        // No more special cases, this doesn't have extensions
+        return;
+    }
+    if (ICMPExtensionsStructure::validate_extensions(extensions_ptr, extensions_size)) {
+        extensions = ICMPExtensionsStructure(extensions_ptr, extensions_size);
+        stream.size(stream.size() - extensions_size);
+    }
+}
+
+} // Internals
+} // Tins
diff --git a/src/icmp.cpp b/src/icmp.cpp
index 3404c77..419399f 100644
--- a/src/icmp.cpp
+++ b/src/icmp.cpp
@@ -36,8 +36,8 @@
 #include "utils.h"
 #include "exceptions.h"
 #include "icmp.h"
-#include "internals.h"
 #include "memory_helpers.h"
+#include "detail/icmp_extension_helpers.h"
 
 using std::memset;
 using std::max;
diff --git a/src/icmpv6.cpp b/src/icmpv6.cpp
index 7426efd..d503eb6 100644
--- a/src/icmpv6.cpp
+++ b/src/icmpv6.cpp
@@ -36,7 +36,7 @@
 #include "constants.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
-#include "internals.h"
+#include "detail/icmp_extension_helpers.h"
 
 using std::memset;
 using std::vector;
diff --git a/src/internals.cpp b/src/internals.cpp
index f4122c6..740d9eb 100644
--- a/src/internals.cpp
+++ b/src/internals.cpp
@@ -279,51 +279,6 @@ Constants::IP::e pdu_flag_to_ip_type(PDU::PDUType flag) {
     };
 }
 
-uint32_t get_padded_icmp_inner_pdu_size(const PDU* inner_pdu, uint32_t pad_alignment) {
-        // This gets the size of the next pdu, padded to the next 32 bit word boundary
-    if (inner_pdu) {
-        uint32_t inner_pdu_size = inner_pdu->size();
-        uint32_t padding = inner_pdu_size % pad_alignment;
-        inner_pdu_size = padding ? (inner_pdu_size - padding + pad_alignment) : inner_pdu_size;
-        return inner_pdu_size;
-    }
-    else {
-        return 0;
-    }
-}
-
-void try_parse_icmp_extensions(InputMemoryStream& stream,
-                               uint32_t payload_length,
-                               ICMPExtensionsStructure& extensions) {
-    if (!stream) {
-        return;
-    }
-    // Check if this is one of the types defined in RFC 4884
-    const uint32_t minimum_payload = ICMPExtensionsStructure::MINIMUM_ICMP_PAYLOAD;
-    // Check if we actually have this amount of data and whether it's more than
-    // the minimum encapsulated packet size
-    const uint8_t* extensions_ptr;
-    uint32_t extensions_size;
-    if (stream.can_read(payload_length) && payload_length >= minimum_payload) {
-        extensions_ptr = stream.pointer() + payload_length;
-        extensions_size = stream.size() - payload_length;
-    }
-    else if (stream.can_read(minimum_payload)) {
-        // This packet might be non-rfc compliant. In that case the length
-        // field can contain garbage.
-        extensions_ptr = stream.pointer() + minimum_payload;
-        extensions_size = stream.size() - minimum_payload;
-    }
-    else {
-        // No more special cases, this doesn't have extensions
-        return;
-    }
-    if (ICMPExtensionsStructure::validate_extensions(extensions_ptr, extensions_size)) {
-        extensions = ICMPExtensionsStructure(extensions_ptr, extensions_size);
-        stream.size(stream.size() - extensions_size);
-    }
-}
-
 PDU::PDUType ip_type_to_pdu_flag(Constants::IP::e flag) {
     switch(flag) {
         case Constants::IP::PROTO_IPIP:

From 89202c5dd5bd1a44e356a0c6d68660d20ddd4a58 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 11:59:02 -0700
Subject: [PATCH 20/73] Move checksum utils into their own file

---
 include/tins/CMakeLists.txt         |   1 +
 include/tins/utils.h                |  58 +-----------
 include/tins/utils/CMakeLists.txt   |   6 ++
 include/tins/utils/checksum_utils.h | 106 ++++++++++++++++++++++
 src/CMakeLists.txt                  |   1 +
 src/icmp.cpp                        |   2 +-
 src/icmpv6.cpp                      |   2 +-
 src/ip.cpp                          |   2 +-
 src/radiotap.cpp                    |   1 +
 src/tcp.cpp                         |   2 +-
 src/udp.cpp                         |   2 +-
 src/utils.cpp                       |  84 ------------------
 src/utils/checksum_utils.cpp        | 131 ++++++++++++++++++++++++++++
 13 files changed, 252 insertions(+), 146 deletions(-)
 create mode 100644 include/tins/utils/CMakeLists.txt
 create mode 100644 include/tins/utils/checksum_utils.h
 create mode 100644 src/utils/checksum_utils.cpp

diff --git a/include/tins/CMakeLists.txt b/include/tins/CMakeLists.txt
index 1f55d3a..1b67728 100644
--- a/include/tins/CMakeLists.txt
+++ b/include/tins/CMakeLists.txt
@@ -7,3 +7,4 @@ INSTALL(
 ADD_SUBDIRECTORY(dot11)
 ADD_SUBDIRECTORY(tcp_ip)
 ADD_SUBDIRECTORY(detail)
+ADD_SUBDIRECTORY(utils)
diff --git a/include/tins/utils.h b/include/tins/utils.h
index 0e9c341..e2a54e2 100644
--- a/include/tins/utils.h
+++ b/include/tins/utils.h
@@ -39,6 +39,7 @@
 #include "ipv6_address.h"
 #include "pdu.h"
 #include "detail/type_traits.h"
+#include "utils/checksum_utils.h"
 
 // Fix for Windows interface define on combaseapi.h
 #undef interface
@@ -215,13 +216,6 @@ TINS_API std::vector<RouteEntry> route_entries();
  */
 TINS_API std::vector<Route6Entry> route6_entries();
 
-/** \brief Returns the 32 bit crc of the given buffer.
- *
- * \param data The input buffer.
- * \param data_size The size of the input buffer.
- */
-TINS_API uint32_t crc32(const uint8_t* data, uint32_t data_size);
-
 /**
  * \brief Converts a channel number to its mhz representation.
  * \param channel The channel number.
@@ -243,56 +237,6 @@ TINS_API uint16_t mhz_to_channel(uint16_t mhz);
  */
 TINS_API std::string to_string(PDU::PDUType pduType);
 
-/** 
- * \brief Does the 16 bits sum of all 2 bytes elements between start and end.
- *
- * This is the checksum used by IP, UDP and TCP. If there's and odd number of
- * bytes, the last one is padded and added to the checksum. 
- * \param start The pointer to the start of the buffer.
- * \param end The pointer to the end of the buffer(excluding the last element).
- * \return Returns the checksum between start and end (non inclusive) 
- * in network endian
- */
-TINS_API uint32_t do_checksum(const uint8_t* start, const uint8_t* end);
-
-/** 
- * \brief Computes the 16 bit sum of the input buffer.
- *
- * If there's and odd number of bytes in the buffer, the last one is padded and 
- * added to the checksum. 
- * \param start The pointer to the start of the buffer.
- * \param end The pointer to the end of the buffer(excluding the last element).
- * \return Returns the checksum between start and end (non inclusive) 
- * in network endian
- */
-TINS_API uint16_t sum_range(const uint8_t* start, const uint8_t* end);
-
-/** \brief Performs the pseudo header checksum used in TCP and UDP PDUs.
- *
- * \param source_ip The source ip address.
- * \param dest_ip The destination ip address.
- * \param len The length to be included in the pseudo header.
- * \param flag The flag to use in the protocol field of the pseudo header.
- * \return The pseudo header checksum.
- */
-TINS_API uint32_t pseudoheader_checksum(IPv4Address source_ip,
-                                        IPv4Address dest_ip,
-                                        uint16_t len,
-                                        uint16_t flag);
-
-/** \brief Performs the pseudo header checksum used in TCP and UDP PDUs.
- *
- * \param source_ip The source ip address.
- * \param dest_ip The destination ip address.
- * \param len The length to be included in the pseudo header.
- * \param flag The flag to use in the protocol field of the pseudo header.
- * \return The pseudo header checksum.
- */
-TINS_API uint32_t pseudoheader_checksum(IPv6Address source_ip,  
-                                        IPv6Address dest_ip,
-                                        uint16_t len,
-                                        uint16_t flag);
-
 template <typename T>
 struct is_pdu {  
     template <typename U>
diff --git a/include/tins/utils/CMakeLists.txt b/include/tins/utils/CMakeLists.txt
new file mode 100644
index 0000000..04ddc8b
--- /dev/null
+++ b/include/tins/utils/CMakeLists.txt
@@ -0,0 +1,6 @@
+FILE(GLOB INCLUDE_FILES "*.h")
+INSTALL(
+    FILES ${INCLUDE_FILES} 
+    DESTINATION include/tins/utils
+    COMPONENT Headers
+)
diff --git a/include/tins/utils/checksum_utils.h b/include/tins/utils/checksum_utils.h
new file mode 100644
index 0000000..1c4b407
--- /dev/null
+++ b/include/tins/utils/checksum_utils.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef TINS_CHECKSUM_UTILS_H
+#define TINS_CHECKSUM_UTILS_H
+
+#include <stdint.h>
+#include "../macros.h"
+
+namespace Tins {
+
+class IPv4Address;
+class IPv6Address;
+
+namespace Utils {
+
+/** 
+ * \brief Does the 16 bits sum of all 2 bytes elements between start and end.
+ *
+ * This is the checksum used by IP, UDP and TCP. If there's and odd number of
+ * bytes, the last one is padded and added to the checksum. 
+ * \param start The pointer to the start of the buffer.
+ * \param end The pointer to the end of the buffer(excluding the last element).
+ * \return Returns the checksum between start and end (non inclusive) 
+ * in network endian
+ */
+TINS_API uint32_t do_checksum(const uint8_t* start, const uint8_t* end);
+
+/** 
+ * \brief Computes the 16 bit sum of the input buffer.
+ *
+ * If there's and odd number of bytes in the buffer, the last one is padded and 
+ * added to the checksum. 
+ * \param start The pointer to the start of the buffer.
+ * \param end The pointer to the end of the buffer(excluding the last element).
+ * \return Returns the checksum between start and end (non inclusive) 
+ * in network endian
+ */
+TINS_API uint16_t sum_range(const uint8_t* start, const uint8_t* end);
+
+/**
+ * \brief Performs the pseudo header checksum used in TCP and UDP PDUs.
+ *
+ * \param source_ip The source ip address.
+ * \param dest_ip The destination ip address.
+ * \param len The length to be included in the pseudo header.
+ * \param flag The flag to use in the protocol field of the pseudo header.
+ * \return The pseudo header checksum.
+ */
+TINS_API uint32_t pseudoheader_checksum(IPv4Address source_ip,
+                                        IPv4Address dest_ip,
+                                        uint16_t len,
+                                        uint16_t flag);
+
+/**
+ * \brief Performs the pseudo header checksum used in TCP and UDP PDUs.
+ *
+ * \param source_ip The source ip address.
+ * \param dest_ip The destination ip address.
+ * \param len The length to be included in the pseudo header.
+ * \param flag The flag to use in the protocol field of the pseudo header.
+ * \return The pseudo header checksum.
+ */
+TINS_API uint32_t pseudoheader_checksum(IPv6Address source_ip,  
+                                        IPv6Address dest_ip,
+                                        uint16_t len,
+                                        uint16_t flag);
+
+/**
+ * \brief Returns the 32 bit crc of the given buffer.
+ *
+ * \param data The input buffer.
+ * \param data_size The size of the input buffer.
+ */
+TINS_API uint32_t crc32(const uint8_t* data, uint32_t data_size);
+
+} // Utils
+} // Tins
+
+#endif // TINS_CHECKSUM_UTILS_H
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f340fb6..07334c0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -72,6 +72,7 @@ set(SOURCES
     dot11/dot11_auth.cpp
     dot11/dot11_probe.cpp
     dot11/dot11_control.cpp
+    utils/checksum_utils.cpp
 )
 
 SET(PCAP_DEPENDENT_SOURCES
diff --git a/src/icmp.cpp b/src/icmp.cpp
index 419399f..5b14f0c 100644
--- a/src/icmp.cpp
+++ b/src/icmp.cpp
@@ -33,11 +33,11 @@
     #include <netinet/in.h>
 #endif
 #include "rawpdu.h"
-#include "utils.h"
 #include "exceptions.h"
 #include "icmp.h"
 #include "memory_helpers.h"
 #include "detail/icmp_extension_helpers.h"
+#include "utils/checksum_utils.h"
 
 using std::memset;
 using std::max;
diff --git a/src/icmpv6.cpp b/src/icmpv6.cpp
index d503eb6..457ca46 100644
--- a/src/icmpv6.cpp
+++ b/src/icmpv6.cpp
@@ -32,11 +32,11 @@
 #include "icmpv6.h"
 #include "ipv6.h"
 #include "rawpdu.h"
-#include "utils.h"
 #include "constants.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
 #include "detail/icmp_extension_helpers.h"
+#include "utils/checksum_utils.h"
 
 using std::memset;
 using std::vector;
diff --git a/src/ip.cpp b/src/ip.cpp
index 3bcbdb3..6eb0c7a 100644
--- a/src/ip.cpp
+++ b/src/ip.cpp
@@ -39,7 +39,6 @@
 #endif
 #include "ip.h"
 #include "rawpdu.h"
-#include "utils.h"
 #include "packet_sender.h"
 #include "constants.h"
 #include "network_interface.h"
@@ -47,6 +46,7 @@
 #include "pdu_allocator.h"
 #include "memory_helpers.h"
 #include "internals.h"
+#include "utils/checksum_utils.h"
 
 using std::list;
 using std::min;
diff --git a/src/radiotap.cpp b/src/radiotap.cpp
index 1477360..6198fa1 100644
--- a/src/radiotap.cpp
+++ b/src/radiotap.cpp
@@ -48,6 +48,7 @@
 #include "packet_sender.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
+#include "utils/checksum_utils.h"
 
 using std::memcpy;
 
diff --git a/src/tcp.cpp b/src/tcp.cpp
index 6a7ffe2..fec72fa 100644
--- a/src/tcp.cpp
+++ b/src/tcp.cpp
@@ -34,10 +34,10 @@
 #include "ipv6.h"
 #include "constants.h"
 #include "rawpdu.h"
-#include "utils.h"
 #include "exceptions.h"
 #include "internals.h"
 #include "memory_helpers.h"
+#include "utils/checksum_utils.h"
 
 using std::find_if;
 using std::min;
diff --git a/src/udp.cpp b/src/udp.cpp
index 74cd93d..fbec788 100644
--- a/src/udp.cpp
+++ b/src/udp.cpp
@@ -31,12 +31,12 @@
 #include <cstring>
 #include "udp.h"
 #include "constants.h"
-#include "utils.h"
 #include "ip.h"
 #include "ipv6.h"
 #include "rawpdu.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
+#include "utils/checksum_utils.h"
 
 using Tins::Memory::InputMemoryStream;
 using Tins::Memory::OutputMemoryStream;
diff --git a/src/utils.cpp b/src/utils.cpp
index 8645607..f815e99 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -595,89 +595,5 @@ string to_string(PDU::PDUType pduType) {
 #undef ENUM_TEXT
 }
 
-uint32_t do_checksum(const uint8_t* start, const uint8_t* end) {
-    return Endian::host_to_be<uint32_t>(sum_range(start, end));
-}
-
-uint16_t sum_range(const uint8_t* start, const uint8_t* end) {
-    uint32_t checksum(0);
-    const uint8_t* last = end;
-    uint16_t buffer = 0;
-    uint16_t padding = 0;
-    const uint8_t* ptr = start;
-
-    if (((end - start) & 1) == 1) {
-        last = end - 1;
-        padding = Endian::host_to_le<uint16_t>(*(end - 1));
-    }
-
-    while (ptr < last) {
-        memcpy(&buffer, ptr, sizeof(uint16_t));
-        checksum += buffer;
-        ptr += sizeof(uint16_t);
-    }
-
-    checksum += padding;
-    while (checksum >> 16) {
-        checksum = (checksum & 0xffff) + (checksum >> 16);
-    }
-    return checksum;  
-}
-
-template <size_t buffer_size, typename AddressType>
-uint32_t generic_pseudoheader_checksum(const AddressType& source_ip, 
-                                       const AddressType& dest_ip,
-                                       uint16_t len,
-                                       uint16_t flag) {
-    uint8_t buffer[buffer_size];
-    OutputMemoryStream stream(buffer, sizeof(buffer));
-    stream.write(source_ip);
-    stream.write(dest_ip);
-    stream.write(Endian::host_to_be(flag));
-    stream.write(Endian::host_to_be(len));
-
-    InputMemoryStream input_stream(buffer, sizeof(buffer));
-    uint32_t checksum = 0;
-    while (input_stream) {
-        checksum += input_stream.read<uint16_t>();
-    }
-    return checksum;
-}
-
-uint32_t pseudoheader_checksum(IPv4Address source_ip, 
-                               IPv4Address dest_ip,
-                               uint16_t len,
-                               uint16_t flag) {
-    return generic_pseudoheader_checksum<sizeof(uint32_t) * 3>(
-        source_ip, dest_ip, len, flag
-    );
-}
-
-uint32_t pseudoheader_checksum(IPv6Address source_ip,
-                               IPv6Address dest_ip,
-                               uint16_t len,
-                               uint16_t flag) {
-    return generic_pseudoheader_checksum<IPv6Address::address_size * 2 + sizeof(uint16_t) * 2>(
-        source_ip, dest_ip, len, flag
-    );
-}
-
-uint32_t crc32(const uint8_t* data, uint32_t data_size) {
-    uint32_t i, crc = 0;
-    static uint32_t crc_table[] = {
-        0x4DBDF21C, 0x500AE278, 0x76D3D2D4, 0x6B64C2B0,
-        0x3B61B38C, 0x26D6A3E8, 0x000F9344, 0x1DB88320,
-        0xA005713C, 0xBDB26158, 0x9B6B51F4, 0x86DC4190,
-        0xD6D930AC, 0xCB6E20C8, 0xEDB71064, 0xF0000000
-    };
-
-    for (i = 0; i < data_size; ++i) {
-        crc = (crc >> 4) ^ crc_table[(crc ^ data[i]) & 0x0F];
-        crc = (crc >> 4) ^ crc_table[(crc ^ (data[i] >> 4)) & 0x0F];
-    }
-
-    return crc;
-}
-
 } // Utils
 } // Tins
diff --git a/src/utils/checksum_utils.cpp b/src/utils/checksum_utils.cpp
new file mode 100644
index 0000000..3038ec0
--- /dev/null
+++ b/src/utils/checksum_utils.cpp
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "utils/checksum_utils.h"
+#include <cstring>
+#include "ip_address.h"
+#include "ipv6_address.h"
+#include "endianness.h"
+#include "memory_helpers.h"
+
+using std::memcpy;
+
+using Tins::Memory::InputMemoryStream;
+using Tins::Memory::OutputMemoryStream;
+
+namespace Tins {
+namespace Utils {
+
+uint32_t do_checksum(const uint8_t* start, const uint8_t* end) {
+    return Endian::host_to_be<uint32_t>(sum_range(start, end));
+}
+
+uint16_t sum_range(const uint8_t* start, const uint8_t* end) {
+    uint32_t checksum(0);
+    const uint8_t* last = end;
+    uint16_t buffer = 0;
+    uint16_t padding = 0;
+    const uint8_t* ptr = start;
+
+    if (((end - start) & 1) == 1) {
+        last = end - 1;
+        padding = Endian::host_to_le<uint16_t>(*(end - 1));
+    }
+
+    while (ptr < last) {
+        memcpy(&buffer, ptr, sizeof(uint16_t));
+        checksum += buffer;
+        ptr += sizeof(uint16_t);
+    }
+
+    checksum += padding;
+    while (checksum >> 16) {
+        checksum = (checksum & 0xffff) + (checksum >> 16);
+    }
+    return checksum;  
+}
+
+template <size_t buffer_size, typename AddressType>
+uint32_t generic_pseudoheader_checksum(const AddressType& source_ip, 
+                                       const AddressType& dest_ip,
+                                       uint16_t len,
+                                       uint16_t flag) {
+    uint8_t buffer[buffer_size];
+    OutputMemoryStream stream(buffer, sizeof(buffer));
+    stream.write(source_ip);
+    stream.write(dest_ip);
+    stream.write(Endian::host_to_be(flag));
+    stream.write(Endian::host_to_be(len));
+
+    InputMemoryStream input_stream(buffer, sizeof(buffer));
+    uint32_t checksum = 0;
+    while (input_stream) {
+        checksum += input_stream.read<uint16_t>();
+    }
+    return checksum;
+}
+
+uint32_t pseudoheader_checksum(IPv4Address source_ip, 
+                               IPv4Address dest_ip,
+                               uint16_t len,
+                               uint16_t flag) {
+    return generic_pseudoheader_checksum<sizeof(uint32_t) * 3>(
+        source_ip, dest_ip, len, flag
+    );
+}
+
+uint32_t pseudoheader_checksum(IPv6Address source_ip,
+                               IPv6Address dest_ip,
+                               uint16_t len,
+                               uint16_t flag) {
+    return generic_pseudoheader_checksum<IPv6Address::address_size * 2 + sizeof(uint16_t) * 2>(
+        source_ip, dest_ip, len, flag
+    );
+}
+
+uint32_t crc32(const uint8_t* data, uint32_t data_size) {
+    uint32_t i, crc = 0;
+    static uint32_t crc_table[] = {
+        0x4DBDF21C, 0x500AE278, 0x76D3D2D4, 0x6B64C2B0,
+        0x3B61B38C, 0x26D6A3E8, 0x000F9344, 0x1DB88320,
+        0xA005713C, 0xBDB26158, 0x9B6B51F4, 0x86DC4190,
+        0xD6D930AC, 0xCB6E20C8, 0xEDB71064, 0xF0000000
+    };
+
+    for (i = 0; i < data_size; ++i) {
+        crc = (crc >> 4) ^ crc_table[(crc ^ data[i]) & 0x0F];
+        crc = (crc >> 4) ^ crc_table[(crc ^ (data[i] >> 4)) & 0x0F];
+    }
+
+    return crc;
+}
+
+
+} // Utils
+} // Tins

From 36fedf4f65dd5d411d199d92df18d18c94810acd Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 11:59:10 -0700
Subject: [PATCH 21/73] Remove useless includes for utils.h on tests

---
 tests/src/arp_test.cpp               | 1 -
 tests/src/dns_test.cpp               | 1 -
 tests/src/dot11/dot11_test.cpp       | 1 -
 tests/src/ethernet_test.cpp          | 1 -
 tests/src/icmp_test.cpp              | 1 -
 tests/src/icmpv6_test.cpp            | 1 -
 tests/src/ip_address_test.cpp        | 1 -
 tests/src/ip_test.cpp                | 1 -
 tests/src/ipv6_address_test.cpp      | 1 -
 tests/src/ipv6_test.cpp              | 1 -
 tests/src/network_interface_test.cpp | 1 -
 tests/src/rc4_eapol_test.cpp         | 1 -
 tests/src/rsn_eapol_test.cpp         | 1 -
 tests/src/snap_test.cpp              | 1 -
 tests/src/tcp_ip_test.cpp            | 1 -
 tests/src/tcp_stream_test.cpp        | 1 -
 tests/src/tcp_test.cpp               | 1 -
 17 files changed, 17 deletions(-)

diff --git a/tests/src/arp_test.cpp b/tests/src/arp_test.cpp
index 036d8e4..09a25d9 100644
--- a/tests/src/arp_test.cpp
+++ b/tests/src/arp_test.cpp
@@ -4,7 +4,6 @@
 #include <iostream>
 #include <stdint.h>
 #include "arp.h"
-#include "utils.h"
 #include "ip_address.h"
 
 
diff --git a/tests/src/dns_test.cpp b/tests/src/dns_test.cpp
index d19daa5..55641a4 100644
--- a/tests/src/dns_test.cpp
+++ b/tests/src/dns_test.cpp
@@ -2,7 +2,6 @@
 #include <iostream>
 #include "dns.h"
 #include "ipv6_address.h"
-#include "utils.h"
 
 using namespace Tins;
 
diff --git a/tests/src/dot11/dot11_test.cpp b/tests/src/dot11/dot11_test.cpp
index d1308c4..6fd9a25 100644
--- a/tests/src/dot11/dot11_test.cpp
+++ b/tests/src/dot11/dot11_test.cpp
@@ -4,7 +4,6 @@
 
 #include <gtest/gtest.h>
 #include "tests/dot11.h"
-#include "utils.h"
 
 using namespace std;
 using namespace Tins;
diff --git a/tests/src/ethernet_test.cpp b/tests/src/ethernet_test.cpp
index 0307685..56267e8 100644
--- a/tests/src/ethernet_test.cpp
+++ b/tests/src/ethernet_test.cpp
@@ -1,7 +1,6 @@
 #include <algorithm>
 #include <gtest/gtest.h>
 #include "ethernetII.h"
-#include "utils.h"
 #include "macros.h"
 #include "ipv6.h"
 #include "ip.h"
diff --git a/tests/src/icmp_test.cpp b/tests/src/icmp_test.cpp
index ba17f85..a49cdc8 100644
--- a/tests/src/icmp_test.cpp
+++ b/tests/src/icmp_test.cpp
@@ -5,7 +5,6 @@
 #include "icmp.h"
 #include "ip.h"
 #include "ethernetII.h"
-#include "utils.h"
 #include "mpls.h"
 #include "rawpdu.h"
 
diff --git a/tests/src/icmpv6_test.cpp b/tests/src/icmpv6_test.cpp
index 4d8f231..9305ac6 100644
--- a/tests/src/icmpv6_test.cpp
+++ b/tests/src/icmpv6_test.cpp
@@ -6,7 +6,6 @@
 #include "ethernetII.h"
 #include "ip.h"
 #include "tcp.h"
-#include "utils.h"
 #include "rawpdu.h"
 #include "hw_address.h"
 
diff --git a/tests/src/ip_address_test.cpp b/tests/src/ip_address_test.cpp
index f61208d..8bbc920 100644
--- a/tests/src/ip_address_test.cpp
+++ b/tests/src/ip_address_test.cpp
@@ -4,7 +4,6 @@
 #include <sstream>
 #include <stdint.h>
 #include "ip_address.h"
-#include "utils.h"
 
 using namespace Tins;
 
diff --git a/tests/src/ip_test.cpp b/tests/src/ip_test.cpp
index e2d6b8e..bbe4e75 100644
--- a/tests/src/ip_test.cpp
+++ b/tests/src/ip_test.cpp
@@ -9,7 +9,6 @@
 #include "icmp_extension.h"
 #include "rawpdu.h"
 #include "ip_address.h"
-#include "utils.h"
 #include "ethernetII.h"
 
 using namespace std;
diff --git a/tests/src/ipv6_address_test.cpp b/tests/src/ipv6_address_test.cpp
index c355abe..7556101 100644
--- a/tests/src/ipv6_address_test.cpp
+++ b/tests/src/ipv6_address_test.cpp
@@ -5,7 +5,6 @@
 #include <sstream>
 #include <stdint.h>
 #include "ipv6_address.h"
-#include "utils.h"
 
 using namespace Tins;
 
diff --git a/tests/src/ipv6_test.cpp b/tests/src/ipv6_test.cpp
index 5f0c283..72809b6 100644
--- a/tests/src/ipv6_test.cpp
+++ b/tests/src/ipv6_test.cpp
@@ -10,7 +10,6 @@
 #include "rawpdu.h"
 #include "ethernetII.h"
 #include "ipv6_address.h"
-#include "utils.h"
 
 using namespace std;
 using namespace Tins;
diff --git a/tests/src/network_interface_test.cpp b/tests/src/network_interface_test.cpp
index 346d668..c3c708d 100644
--- a/tests/src/network_interface_test.cpp
+++ b/tests/src/network_interface_test.cpp
@@ -2,7 +2,6 @@
 #include <string>
 #include <vector>
 #include "network_interface.h"
-#include "utils.h"
 #include "macros.h"
 
 using namespace Tins;
diff --git a/tests/src/rc4_eapol_test.cpp b/tests/src/rc4_eapol_test.cpp
index 5d39554..7f6fabf 100644
--- a/tests/src/rc4_eapol_test.cpp
+++ b/tests/src/rc4_eapol_test.cpp
@@ -3,7 +3,6 @@
 #include <string>
 #include <stdint.h>
 #include "eapol.h"
-#include "utils.h"
 
 using namespace std;
 using namespace Tins;
diff --git a/tests/src/rsn_eapol_test.cpp b/tests/src/rsn_eapol_test.cpp
index 3339251..705492f 100644
--- a/tests/src/rsn_eapol_test.cpp
+++ b/tests/src/rsn_eapol_test.cpp
@@ -4,7 +4,6 @@
 #include <stdint.h>
 #include "eapol.h"
 #include "snap.h"
-#include "utils.h"
 #include "ethernetII.h"
 #include "rsn_information.h"
 
diff --git a/tests/src/snap_test.cpp b/tests/src/snap_test.cpp
index a716cee..17e4d89 100644
--- a/tests/src/snap_test.cpp
+++ b/tests/src/snap_test.cpp
@@ -3,7 +3,6 @@
 #include <string>
 #include <stdint.h>
 #include "snap.h"
-#include "utils.h"
 
 using namespace std;
 using namespace Tins;
diff --git a/tests/src/tcp_ip_test.cpp b/tests/src/tcp_ip_test.cpp
index ae9f600..896b0a0 100644
--- a/tests/src/tcp_ip_test.cpp
+++ b/tests/src/tcp_ip_test.cpp
@@ -17,7 +17,6 @@
 #include "ethernetII.h"
 #include "rawpdu.h"
 #include "packet.h"
-#include "utils.h"
 #include "config.h"
 #ifdef TINS_HAVE_ACK_TRACKER
     #include "tcp_ip/ack_tracker.h"
diff --git a/tests/src/tcp_stream_test.cpp b/tests/src/tcp_stream_test.cpp
index 9df9459..9933acd 100644
--- a/tests/src/tcp_stream_test.cpp
+++ b/tests/src/tcp_stream_test.cpp
@@ -5,7 +5,6 @@
 #include "tcp_stream.h"
 #include "tcp.h"
 #include "ethernetII.h"
-#include "utils.h"
 
 using namespace Tins;
 
diff --git a/tests/src/tcp_test.cpp b/tests/src/tcp_test.cpp
index 4aef600..a7ed226 100644
--- a/tests/src/tcp_test.cpp
+++ b/tests/src/tcp_test.cpp
@@ -6,7 +6,6 @@
 #include "tcp.h"
 #include "ip.h"
 #include "ethernetII.h"
-#include "utils.h"
 
 using namespace std;
 using namespace Tins;

From d061fced7e3aa4352f47aa68276e58c18054fba6 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 12:06:42 -0700
Subject: [PATCH 22/73] Move frequency (channel) utils into their own file

---
 include/tins/utils.h                 | 15 +-------
 include/tins/utils/frequency_utils.h | 56 ++++++++++++++++++++++++++++
 src/CMakeLists.txt                   |  1 +
 src/radiotap.cpp                     |  2 +-
 src/utils.cpp                        |  8 ----
 src/utils/frequency_utils.cpp        | 44 ++++++++++++++++++++++
 6 files changed, 103 insertions(+), 23 deletions(-)
 create mode 100644 include/tins/utils/frequency_utils.h
 create mode 100644 src/utils/frequency_utils.cpp

diff --git a/include/tins/utils.h b/include/tins/utils.h
index e2a54e2..f445af3 100644
--- a/include/tins/utils.h
+++ b/include/tins/utils.h
@@ -40,6 +40,7 @@
 #include "pdu.h"
 #include "detail/type_traits.h"
 #include "utils/checksum_utils.h"
+#include "utils/frequency_utils.h"
 
 // Fix for Windows interface define on combaseapi.h
 #undef interface
@@ -216,20 +217,6 @@ TINS_API std::vector<RouteEntry> route_entries();
  */
 TINS_API std::vector<Route6Entry> route6_entries();
 
-/**
- * \brief Converts a channel number to its mhz representation.
- * \param channel The channel number.
- * \return The channel's mhz representation.
- */
-TINS_API uint16_t channel_to_mhz(uint16_t channel);
-
-/**
- * \brief Converts mhz units to the appropriate channel number.
- * \param mhz The mhz units to be converted.
- * \return The channel number.
- */
-TINS_API uint16_t mhz_to_channel(uint16_t mhz);
-
 /**
  * \brief Converts a PDUType to a string.
  * \param pduType The PDUType to be converted.
diff --git a/include/tins/utils/frequency_utils.h b/include/tins/utils/frequency_utils.h
new file mode 100644
index 0000000..dfc34d5
--- /dev/null
+++ b/include/tins/utils/frequency_utils.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef TINS_FREQUENCY_UTILS_H
+#define TINS_FREQUENCY_UTILS_H
+
+#include <stdint.h>
+#include "../macros.h"
+
+namespace Tins {
+namespace Utils {
+
+/**
+ * \brief Converts a channel number to its mhz representation.
+ * \param channel The channel number.
+ * \return The channel's mhz representation.
+ */
+TINS_API uint16_t channel_to_mhz(uint16_t channel);
+
+/**
+ * \brief Converts mhz units to the appropriate channel number.
+ * \param mhz The mhz units to be converted.
+ * \return The channel number.
+ */
+TINS_API uint16_t mhz_to_channel(uint16_t mhz);
+
+} // Utils
+} // Tins
+
+#endif // TINS_FREQUENCY_UTILS_H
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 07334c0..6ba788f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -73,6 +73,7 @@ set(SOURCES
     dot11/dot11_probe.cpp
     dot11/dot11_control.cpp
     utils/checksum_utils.cpp
+    utils/frequency_utils.cpp
 )
 
 SET(PCAP_DEPENDENT_SOURCES
diff --git a/src/radiotap.cpp b/src/radiotap.cpp
index 6198fa1..d6a7a04 100644
--- a/src/radiotap.cpp
+++ b/src/radiotap.cpp
@@ -44,11 +44,11 @@
     #include <net/ethernet.h>
 #endif
 #include "dot11/dot11_base.h"
-#include "utils.h"
 #include "packet_sender.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
 #include "utils/checksum_utils.h"
+#include "utils/frequency_utils.h"
 
 using std::memcpy;
 
diff --git a/src/utils.cpp b/src/utils.cpp
index f815e99..413d713 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -524,14 +524,6 @@ set<string> network_interfaces() {
     return output;
 }
 #endif // _WIN32
-
-uint16_t channel_to_mhz(uint16_t channel) {
-    return 2407 + (channel * 5);
-}
-
-uint16_t mhz_to_channel(uint16_t mhz) {
-    return (mhz - 2407) / 5;
-}
     
 string to_string(PDU::PDUType pduType) {
 #define ENUM_TEXT(p) case(PDU::p): return #p;
diff --git a/src/utils/frequency_utils.cpp b/src/utils/frequency_utils.cpp
new file mode 100644
index 0000000..9c27d06
--- /dev/null
+++ b/src/utils/frequency_utils.cpp
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "utils/frequency_utils.h"
+
+namespace Tins {
+namespace Utils {
+
+uint16_t channel_to_mhz(uint16_t channel) {
+    return 2407 + (channel * 5);
+}
+
+uint16_t mhz_to_channel(uint16_t mhz) {
+    return (mhz - 2407) / 5;
+}
+
+} // Utils
+} // Tins

From 714b8d9810f05d5203d38780006faba2fa92d595 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 12:07:06 -0700
Subject: [PATCH 23/73] Use checksum utils on crypto and icmp extension source
 files

---
 src/crypto.cpp         | 2 +-
 src/icmp_extension.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/crypto.cpp b/src/crypto.cpp
index a3a9d9b..6cf076a 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -42,7 +42,7 @@
 #include "dot11/dot11_data.h"
 #include "dot11/dot11_beacon.h"
 #include "exceptions.h"
-#include "utils.h"
+#include "utils/checksum_utils.h"
 #include "detail/type_traits.h"
 
 using std::string;
diff --git a/src/icmp_extension.cpp b/src/icmp_extension.cpp
index 095c127..13eeabb 100644
--- a/src/icmp_extension.cpp
+++ b/src/icmp_extension.cpp
@@ -31,9 +31,9 @@
 #include <cstring>
 #include "icmp_extension.h"
 #include "exceptions.h"
-#include "utils.h"
 #include "memory_helpers.h"
 #include "mpls.h"
+#include "utils/checksum_utils.h"
 
 using std::runtime_error;
 

From 35e65d018cb8e3aead6d1a21494611368bb981c8 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 12:32:16 -0700
Subject: [PATCH 24/73] Move routing related functions into their own header
 file

---
 include/tins/utils.h               | 103 +------
 include/tins/utils/routing_utils.h | 148 ++++++++++
 src/CMakeLists.txt                 |   1 +
 src/network_interface.cpp          |   2 +-
 src/utils.cpp                      | 370 +------------------------
 src/utils/routing_utils.cpp        | 429 +++++++++++++++++++++++++++++
 6 files changed, 581 insertions(+), 472 deletions(-)
 create mode 100644 include/tins/utils/routing_utils.h
 create mode 100644 src/utils/routing_utils.cpp

diff --git a/include/tins/utils.h b/include/tins/utils.h
index f445af3..27d2128 100644
--- a/include/tins/utils.h
+++ b/include/tins/utils.h
@@ -32,8 +32,6 @@
 
 #include "macros.h"
 #include <string>
-#include <set>
-#include <vector>
 #include <stdint.h>
 #include "ip_address.h"
 #include "ipv6_address.h"
@@ -41,6 +39,7 @@
 #include "detail/type_traits.h"
 #include "utils/checksum_utils.h"
 #include "utils/frequency_utils.h"
+#include "utils/routing_utils.h"
 
 // Fix for Windows interface define on combaseapi.h
 #undef interface
@@ -63,66 +62,6 @@ class HWAddress;
  */
 namespace Utils {
 
-/**
- * Struct that represents an entry the routing table
- */
-struct RouteEntry {
-    /**
-     * This interface's name.
-     */
-    std::string interface;
-    
-    /**
-     * This route entry's destination.
-     */
-    IPv4Address destination;
-    
-    /**
-     * This route entry's gateway.
-     */
-    IPv4Address gateway;
-    
-    /**
-     * This route entry's subnet mask.
-     */
-    IPv4Address mask;
-
-    /**
-     * This route entry's metric.
-     */
-    int metric;
-};
-
-/**
- * Struct that represents an entry the IPv6 routing table
- */
-struct Route6Entry {
-    /**
-     * This interface's name.
-     */
-    std::string interface;
-
-    /**
-     * This route entry's destination.
-     */
-    IPv6Address destination;
-
-    /**
-     * This route entry's subnet mask.
-     */
-    IPv6Address mask;
-
-    /**
-     * This route entry's next hop.
-     */
-    IPv6Address gateway;
-
-    /**
-     * This route entry's metric.
-     */
-    int metric;
-};
-
 /** 
  * \brief Resolves a domain name and returns its corresponding ip address.
  *
@@ -173,14 +112,6 @@ TINS_API HWAddress<6> resolve_hwaddr(const NetworkInterface& iface,
  */
 TINS_API HWAddress<6> resolve_hwaddr(IPv4Address ip, PacketSender& sender);
 
-/** \brief List all network interfaces.
- *
- * Returns a set of strings, each of them representing the name
- * of a network interface. These names can be used as the input
- * interface for Utils::interface_ip, Utils::interface_hwaddr, etc.
- */
-TINS_API std::set<std::string> network_interfaces();
-
 /**
  * \brief Finds the gateway's IP address for the given IP 
  * address.
@@ -194,29 +125,6 @@ TINS_API std::set<std::string> network_interfaces();
  */
 TINS_API bool gateway_from_ip(IPv4Address ip, IPv4Address& gw_addr);
 
-
-/**
- * \brief Retrieves entries in the routing table.
- * 
- * \brief output ForwardIterator in which entries will be stored.
- */
-template<typename ForwardIterator>
-void route_entries(ForwardIterator output);
-
-/**
- * \brief Retrieves entries in the routing table.
- * 
- * \return a vector which contains all of the route entries.
- */
-TINS_API std::vector<RouteEntry> route_entries();
-
-/**
- * \brief Retrieves entries in the routing table.
- * 
- * \return a vector which contains all of the route entries.
- */
-TINS_API std::vector<Route6Entry> route6_entries();
-
 /**
  * \brief Converts a PDUType to a string.
  * \param pduType The PDUType to be converted.
@@ -259,13 +167,4 @@ dereference_until_pdu(T& value) {
 } // Utils
 } // Tins
 
-template<typename ForwardIterator>
-void Tins::Utils::route_entries(ForwardIterator output) {
-    std::vector<RouteEntry> entries = route_entries();
-    for (size_t i = 0; i < entries.size(); ++i) {
-        *output = entries[i];
-        ++output;
-    }
-}
-
 #endif // TINS_UTILS_H
diff --git a/include/tins/utils/routing_utils.h b/include/tins/utils/routing_utils.h
new file mode 100644
index 0000000..71a5863
--- /dev/null
+++ b/include/tins/utils/routing_utils.h
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef TINS_ROUTING_UTILS_H
+#define TINS_ROUTING_UTILS_H
+
+#include <vector>
+#include <set>
+#include "../macros.h"
+#include "../ip_address.h"
+#include "../ipv6_address.h"
+
+// Fix for Windows interface define on combaseapi.h
+#undef interface
+
+namespace Tins {
+namespace Utils {
+
+/**
+ * Struct that represents an entry the routing table
+ */
+struct RouteEntry {
+    /**
+     * This interface's name.
+     */
+    std::string interface;
+    
+    /**
+     * This route entry's destination.
+     */
+    IPv4Address destination;
+    
+    /**
+     * This route entry's gateway.
+     */
+    IPv4Address gateway;
+    
+    /**
+     * This route entry's subnet mask.
+     */
+    IPv4Address mask;
+
+    /**
+     * This route entry's metric.
+     */
+    int metric;
+};
+
+/**
+ * Struct that represents an entry the IPv6 routing table
+ */
+struct Route6Entry {
+    /**
+     * This interface's name.
+     */
+    std::string interface;
+
+    /**
+     * This route entry's destination.
+     */
+    IPv6Address destination;
+
+    /**
+     * This route entry's subnet mask.
+     */
+    IPv6Address mask;
+
+    /**
+     * This route entry's next hop.
+     */
+    IPv6Address gateway;
+
+    /**
+     * This route entry's metric.
+     */
+    int metric;
+};
+
+/**
+ * \brief Retrieves entries in the routing table.
+ * 
+ * \brief output ForwardIterator in which entries will be stored.
+ */
+template<typename ForwardIterator>
+void route_entries(ForwardIterator output);
+
+/**
+ * \brief Retrieves entries in the routing table.
+ * 
+ * \return a vector which contains all of the route entries.
+ */
+TINS_API std::vector<RouteEntry> route_entries();
+
+/**
+ * \brief Retrieves entries in the routing table.
+ * 
+ * \return a vector which contains all of the route entries.
+ */
+TINS_API std::vector<Route6Entry> route6_entries();
+
+/**
+ * \brief List all network interfaces.
+ *
+ * Returns a set of strings, each of them representing the name
+ * of a network interface. These names can be used as the input
+ * interface for Utils::interface_ip, Utils::interface_hwaddr, etc.
+ */
+TINS_API std::set<std::string> network_interfaces();
+
+} // Utils
+} // Tins
+
+template<typename ForwardIterator>
+void Tins::Utils::route_entries(ForwardIterator output) {
+    std::vector<RouteEntry> entries = route_entries();
+    for (size_t i = 0; i < entries.size(); ++i) {
+        *output = entries[i];
+        ++output;
+    }
+}
+
+#endif // TINS_ROUTING_UTILS_H
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6ba788f..9e709e5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -74,6 +74,7 @@ set(SOURCES
     dot11/dot11_control.cpp
     utils/checksum_utils.cpp
     utils/frequency_utils.cpp
+    utils/routing_utils.cpp
 )
 
 SET(PCAP_DEPENDENT_SOURCES
diff --git a/src/network_interface.cpp b/src/network_interface.cpp
index 47c75cc..cd191be 100644
--- a/src/network_interface.cpp
+++ b/src/network_interface.cpp
@@ -31,7 +31,6 @@
 #include <vector>
 #include <cstring>
 #include "macros.h"
-#include "utils.h"
 #ifndef _WIN32
     #include <netinet/in.h>
     #if defined(BSD) || defined(__FreeBSD_kernel__)
@@ -52,6 +51,7 @@
 #include "network_interface.h"
 #include "endianness.h"
 #include "exceptions.h"
+#include "utils/routing_utils.h"
 
 using std::string;
 using std::wstring;
diff --git a/src/utils.cpp b/src/utils.cpp
index 413d713..9940c91 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -28,10 +28,7 @@
  */
 
 #include <stdexcept>
-#include <sstream>
-#include <memory>
 #include <cstring>
-#include <fstream>
 #include "macros.h"
 #ifndef _WIN32
     #if defined(BSD) || defined(__FreeBSD_kernel__)
@@ -59,22 +56,19 @@
     #undef interface
 #endif
 #include "utils.h"
-#include "pdu.h"
 #include "arp.h"
 #include "ethernetII.h"
-#include "endianness.h"
 #include "network_interface.h"
 #include "packet_sender.h"
 #include "cxxstd.h"
 #include "hw_address.h"
 #include "memory_helpers.h"
-#include "internals.h"
+#include "detail/smart_ptr.h"
 #include "detail/smart_ptr.h"
 
 using std::string;
 using std::istream;
 using std::set;
-using std::ifstream;
 using std::vector;
 using std::back_inserter;
 using std::runtime_error;
@@ -84,72 +78,6 @@ using Tins::Memory::OutputMemoryStream;
 
 /** \cond */
 
-bool from_hex(const string& str, uint32_t& result) {
-    size_t i = 0;
-    result = 0;
-    while (i < str.size()) {
-        uint8_t tmp;
-        if (str[i] >= 'A' && str[i] <= 'F') {
-            tmp = (str[i] - 'A' + 10);
-        }
-        else if (str[i] >= '0' && str[i] <= '9') {
-            tmp = (str[i] - '0');
-        }
-        else {
-            return false;
-        }
-        result = (result << 4) | tmp;
-        i++;
-    }
-    return true;
-}
-
-bool from_hex(const string& str, string& result) {
-    result.clear();
-    for (size_t i = 0; i < str.size(); i+= 2) {
-        uint8_t value = 0;
-        for (size_t j = i; j < i + 2 && j < str.size(); ++j) {
-            if (str[j] >= 'A' && str[j] <= 'F') {
-                value = (value << 4) | (str[j] - 'A' + 10);
-            }
-            else if (str[j] >= 'a' && str[j] <= 'f') {
-                value = (value << 4) | (str[j] - 'a' + 10);
-            }
-            else if (str[j] >= '0' && str[j] <= '9') {
-                value = (value << 4) | (str[j] - '0');
-            }
-            else {
-                return false;
-            }
-        }
-        result.push_back(value);
-    }
-    return true;
-}
-
-void skip_line(istream& input) {
-    int c = 0;
-    while (c != '\n' && input) {
-        c = input.get();
-    }
-}
-
-struct InterfaceCollector {
-    set<string> ifaces;
-    
-    #ifdef _WIN32
-    bool operator() (PIP_ADAPTER_ADDRESSES addr) {
-        ifaces.insert(addr->AdapterName);
-        return false;
-    }
-    #else
-    bool operator() (struct ifaddrs* addr) {
-        ifaces.insert(addr->ifa_name);
-        return false;
-    }
-    #endif
-};
-
 addrinfo* resolve_domain(const string& to_resolve, int family) {
     addrinfo* result, hints = addrinfo();
     hints.ai_socktype = SOCK_STREAM;
@@ -163,47 +91,6 @@ addrinfo* resolve_domain(const string& to_resolve, int family) {
     }
 }
 
-#if defined(BSD) || defined(__FreeBSD_kernel__)
-vector<char> query_route_table(int family) {
-    int mib[6];
-    vector<char> buf;
-    size_t len;
-
-    mib[0] = CTL_NET;
-    mib[1] = AF_ROUTE;
-    mib[2] = 0;
-    mib[3] = family;
-    mib[4] = NET_RT_DUMP;
-    mib[5] = 0; 
-    if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0) {
-        throw runtime_error("sysctl failed");
-    }
-
-    buf.resize(len);
-    if (sysctl(mib, 6, &buf[0], &len, NULL, 0) < 0) {
-        throw runtime_error("sysctl failed");
-    }
-
-    return buf;
-}
-
-void parse_header(struct rt_msghdr* rtm, vector<sockaddr*>& addrs) {
-    char* ptr = (char *)(rtm + 1);
-    // Iterate from RTA_DST (0) to RTA_NETMASK (2)
-    for (int i = 0; i < 3; ++i) {
-        sockaddr* sa = 0;
-        if ((rtm->rtm_addrs & (1 << i)) != 0) {
-            sa = (struct sockaddr *)ptr;
-            ptr += sa->sa_len;
-            if (sa->sa_family == 0) {
-                sa = 0;
-            }
-        } 
-        addrs[i] = sa;
-    }
-}
-#endif
-
 namespace Tins {
 
 /** \endcond */
@@ -256,230 +143,6 @@ HWAddress<6> resolve_hwaddr(IPv4Address ip, PacketSender& sender) {
     return resolve_hwaddr(sender.default_interface(), ip, sender);
 }
 
-#if defined(BSD) || defined(__FreeBSD_kernel__)
-
-vector<RouteEntry> route_entries() {
-    vector<RouteEntry> output;
-    vector<char> buffer = query_route_table(AF_INET);
-    char* next = &buffer[0], *end = &buffer[buffer.size()];
-    rt_msghdr* rtm;
-    vector<sockaddr*> sa(32);
-    char iface_name[IF_NAMESIZE];
-    while (next < end) {
-        rtm = (rt_msghdr*)next;
-        // Filter:
-        // * RTF_STATIC (only manually added routes)
-        if ((rtm->rtm_flags & (RTF_STATIC)) != 0) {
-            parse_header(rtm, sa);
-            if (sa[RTAX_DST] && sa[RTAX_GATEWAY] && if_indextoname(rtm->rtm_index, iface_name)) {
-                RouteEntry entry;
-                entry.destination = IPv4Address(((struct sockaddr_in *)sa[RTAX_DST])->sin_addr.s_addr);
-                entry.gateway = IPv4Address(((struct sockaddr_in *)sa[RTAX_GATEWAY])->sin_addr.s_addr);
-                if (sa[RTAX_NETMASK]) {
-                    entry.mask = IPv4Address(((struct sockaddr_in *)sa[RTAX_NETMASK])->sin_addr.s_addr);
-                }
-                entry.interface = iface_name;
-                entry.metric = 0;
-                output.push_back(entry);
-            }
-        }
-        next += rtm->rtm_msglen;
-    }
-    return output;
-}
-
-vector<Route6Entry> route6_entries() {
-    vector<Route6Entry> output;
-    vector<char> buffer = query_route_table(AF_INET6);
-    char* next = &buffer[0], *end = &buffer[buffer.size()];
-    rt_msghdr* rtm;
-    vector<sockaddr*> sa(9);
-    char iface_name[IF_NAMESIZE];
-    while (next < end) {
-        rtm = (rt_msghdr*)next;
-        // Filter protocol-cloned entries
-        bool process_entry = true;
-        // These were removed in recent versions of FreeBSD
-        #if defined(RTF_WASCLONED) && defined(RTF_PRCLONING)
-            process_entry = (rtm->rtm_flags & RTF_WASCLONED) == 0 ||
-                            (rtm->rtm_flags & RTF_PRCLONING) == 0;
-        #endif
-        if (process_entry) {
-            parse_header(rtm, sa);
-            if (sa[RTAX_DST] && sa[RTAX_GATEWAY] && if_indextoname(rtm->rtm_index, iface_name)) {
-                Route6Entry entry;
-                entry.destination = IPv6Address(((struct sockaddr_in6 *)sa[RTAX_DST])->sin6_addr.s6_addr);
-                entry.gateway = IPv6Address(((struct sockaddr_in6 *)sa[RTAX_GATEWAY])->sin6_addr.s6_addr);
-                int prefix_length = 0;
-                if (sa[RTAX_NETMASK]) {
-                    struct sockaddr_in6  *sin = (struct sockaddr_in6 *)sa[RTAX_NETMASK];
-                    for (size_t i = 0; i < 16; ++i) {
-                        uint8_t this_byte = sin->sin6_addr.s6_addr[i];
-                        // Stop when we find a zero byte
-                        if (this_byte == 0) {
-                            break;
-                        }
-                        switch (this_byte) {
-                            case 0xff:
-                                prefix_length += 8;
-                                break;
-                            case 0xfe:
-                                prefix_length += 7;
-                                break;
-                            case 0xfc:
-                                prefix_length += 6;
-                                break;
-                            case 0xf8:
-                                prefix_length += 5;
-                                break;
-                            case 0xf0:
-                                prefix_length += 4;
-                                break;
-                            case 0xe0:
-                                prefix_length += 3;
-                                break;
-                            case 0xc0:
-                                prefix_length += 2;
-                                break;
-                            case 0x80:
-                                prefix_length += 1;
-                                break;
-                            default:
-                                break;
-                        }
-                    }
-                }
-                entry.mask = IPv6Address::from_prefix_length(prefix_length);
-                entry.interface = iface_name;
-                entry.metric = 0;
-                output.push_back(entry);
-            }
-        }
-        next += rtm->rtm_msglen;
-    }
-    return output;
-}
-
-#elif defined(_WIN32)
-
-vector<RouteEntry> route_entries() {
-    vector<RouteEntry> output;
-    MIB_IPFORWARDTABLE* table;
-    ULONG size = 0;
-    GetIpForwardTable(0, &size, 0);
-    vector<uint8_t> buffer(size);
-    table = (MIB_IPFORWARDTABLE*)&buffer[0];
-    GetIpForwardTable(table, &size, 0);
-    
-    for (DWORD i = 0; i < table->dwNumEntries; i++) {
-        MIB_IPFORWARDROW* row = &table->table[i];
-        if (row->dwForwardType == MIB_IPROUTE_TYPE_INDIRECT || 
-            row->dwForwardType == MIB_IPROUTE_TYPE_DIRECT) {
-            RouteEntry entry;
-            entry.interface = NetworkInterface::from_index(row->dwForwardIfIndex).name();
-            entry.destination = IPv4Address(row->dwForwardDest);
-            entry.mask = IPv4Address(row->dwForwardMask);
-            entry.gateway = IPv4Address(row->dwForwardNextHop);
-            entry.metric = row->dwForwardMetric1;
-            output.push_back(entry);
-        }
-    }
-    return output;
-}
-
-vector<Route6Entry> route6_entries() {
-    vector<Route6Entry> output;
-    MIB_IPFORWARD_TABLE2* table;
-    GetIpForwardTable2(AF_INET6, &table);
-    for (ULONG i = 0; i < table->NumEntries; i++) {
-        MIB_IPFORWARD_ROW2* row = &table->Table[i];
-        if (true) {
-            try {
-                Route6Entry entry;
-                entry.interface = NetworkInterface::from_index(row->InterfaceIndex).name();
-                entry.destination = IPv6Address(row->DestinationPrefix.Prefix.Ipv6.sin6_addr.s6_addr);
-                entry.mask = IPv6Address::from_prefix_length(row->DestinationPrefix.PrefixLength);
-                entry.gateway = IPv6Address(row->NextHop.Ipv6.sin6_addr.s6_addr);
-                entry.metric = row->Metric;
-                output.push_back(entry);
-            }
-            catch (invalid_interface&) {
-                
-            }
-        }
-    }
-    FreeMibTable(table);
-    return output;
-}
-
-#else // GNU/LINUX
-
-vector<RouteEntry> route_entries() {
-    using namespace Tins::Internals;
-    vector<RouteEntry> output;
-    ifstream input("/proc/net/route");
-    string destination, mask, metric, gw;
-    uint32_t dummy;
-    skip_line(input);
-    RouteEntry entry;
-    while (input >> entry.interface >> destination >> gw) {
-        for (unsigned i(0); i < 4; ++i) {
-            input >> metric;
-        }
-        input >> mask;
-        from_hex(destination, dummy);
-        entry.destination = IPv4Address(dummy);
-        from_hex(mask, dummy);
-        entry.mask = IPv4Address(dummy);
-        from_hex(gw, dummy);
-        entry.gateway = IPv4Address(dummy);
-        from_hex(metric, dummy);
-        entry.metric = dummy;
-        skip_line(input);
-        output.push_back(entry);
-    }
-    return output;
-}
-
-vector<Route6Entry> route6_entries() {
-    using namespace Tins::Internals;
-    vector<Route6Entry> output;
-    ifstream input("/proc/net/ipv6_route");
-    string destination, mask_length, metric, next_hop, dummy, flags;
-    Route6Entry entry;
-    while (input >> destination >> mask_length) {
-        string temporary;
-        uint32_t temporary_int;
-        for (unsigned i(0); i < 2; ++i) {
-            input >> dummy;
-        }
-        input >> next_hop;
-        input >> metric;
-        for (unsigned i(0); i < 2; ++i) {
-            input >> dummy;
-        }
-        input >> flags >> entry.interface;
-        from_hex(destination, temporary);
-        entry.destination = IPv6Address((const uint8_t*)&temporary[0]);
-        from_hex(mask_length, temporary_int);
-        entry.mask = IPv6Address::from_prefix_length(temporary_int);
-        from_hex(next_hop, temporary);
-        entry.gateway = IPv6Address((const uint8_t*)&temporary[0]);
-        from_hex(metric, temporary_int);
-        entry.metric = temporary_int;
-        // Process flags
-        from_hex(flags, temporary_int);
-        // Skip:
-        // * 0x01000000 -> cache entries
-        if ((temporary_int & 0x01000000) == 0) {
-            output.push_back(entry);
-        }
-    }
-    return output;
-}
-
-#endif
-
 bool gateway_from_ip(IPv4Address ip, IPv4Address& gw_addr) {
     typedef vector<RouteEntry> entries_type;
     entries_type entries;
@@ -493,37 +156,6 @@ bool gateway_from_ip(IPv4Address ip, IPv4Address& gw_addr) {
     }
     return false;
 }
-
-#ifdef _WIN32
-set<string> network_interfaces() {
-    set<string> output;
-    ULONG size;
-    ::GetAdaptersAddresses(AF_INET, 0, 0, 0, &size);
-    std::vector<uint8_t> buffer(size);
-    if (::GetAdaptersAddresses(AF_INET, 0, 0, (IP_ADAPTER_ADDRESSES *)&buffer[0], &size) == ERROR_SUCCESS) {
-        PIP_ADAPTER_ADDRESSES iface = (IP_ADAPTER_ADDRESSES *)&buffer[0];
-        while (iface) {
-            output.insert(iface->AdapterName);
-            iface = iface->Next;
-        }
-    }
-    return output;
-}
-#else
-set<string> network_interfaces() {
-    set<string> output;
-    struct ifaddrs* ifaddrs = 0;
-    struct ifaddrs* if_it = 0;
-    getifaddrs(&ifaddrs);
-    for (if_it = ifaddrs; if_it; if_it = if_it->ifa_next) {
-        output.insert(if_it->ifa_name);
-    }
-    if (ifaddrs) {
-        freeifaddrs(ifaddrs);
-    }
-    return output;
-}
-#endif // _WIN32
     
 string to_string(PDU::PDUType pduType) {
 #define ENUM_TEXT(p) case(PDU::p): return #p;
diff --git a/src/utils/routing_utils.cpp b/src/utils/routing_utils.cpp
new file mode 100644
index 0000000..31fca0d
--- /dev/null
+++ b/src/utils/routing_utils.cpp
@@ -0,0 +1,429 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "utils/routing_utils.h"
+#ifndef _WIN32
+    #if defined(BSD) || defined(__FreeBSD_kernel__)
+        #include <sys/socket.h>
+        #include <sys/file.h>
+        #include <sys/sysctl.h>
+        #include <net/route.h>
+        #include <net/if_dl.h>
+        #include <net/if.h>
+        #include <netinet/in.h>
+    #else
+        #include <netpacket/packet.h>
+    #endif
+    #include <ifaddrs.h>
+    #include <netdb.h>
+    #include <net/if.h>
+    #ifdef __ANDROID_API__
+        #include <linux/in.h>
+        #include <linux/in6.h>
+    #endif
+#else
+    #include <winsock2.h>
+    #include <ws2tcpip.h>
+    #include <iphlpapi.h>
+    #undef interface
+#endif
+#include <set>
+#include <fstream>
+#include "network_interface.h"
+
+using std::vector;
+using std::string;
+using std::set;
+using std::ifstream;
+using std::istream;
+
+namespace Tins {
+namespace Utils {
+
+struct InterfaceCollector {
+    set<string> ifaces;
+    
+    #ifdef _WIN32
+    bool operator() (PIP_ADAPTER_ADDRESSES addr) {
+        ifaces.insert(addr->AdapterName);
+        return false;
+    }
+    #else
+    bool operator() (struct ifaddrs* addr) {
+        ifaces.insert(addr->ifa_name);
+        return false;
+    }
+    #endif
+};
+
+bool from_hex(const string& str, uint32_t& result) {
+    size_t i = 0;
+    result = 0;
+    while (i < str.size()) {
+        uint8_t tmp;
+        if (str[i] >= 'A' && str[i] <= 'F') {
+            tmp = (str[i] - 'A' + 10);
+        }
+        else if (str[i] >= '0' && str[i] <= '9') {
+            tmp = (str[i] - '0');
+        }
+        else {
+            return false;
+        }
+        result = (result << 4) | tmp;
+        i++;
+    }
+    return true;
+}
+
+bool from_hex(const string& str, string& result) {
+    result.clear();
+    for (size_t i = 0; i < str.size(); i+= 2) {
+        uint8_t value = 0;
+        for (size_t j = i; j < i + 2 && j < str.size(); ++j) {
+            if (str[j] >= 'A' && str[j] <= 'F') {
+                value = (value << 4) | (str[j] - 'A' + 10);
+            }
+            else if (str[j] >= 'a' && str[j] <= 'f') {
+                value = (value << 4) | (str[j] - 'a' + 10);
+            }
+            else if (str[j] >= '0' && str[j] <= '9') {
+                value = (value << 4) | (str[j] - '0');
+            }
+            else {
+                return false;
+            }
+        }
+        result.push_back(value);
+    }
+    return true;
+}
+
+void skip_line(istream& input) {
+    int c = 0;
+    while (c != '\n' && input) {
+        c = input.get();
+    }
+}
+
+#if defined(BSD) || defined(__FreeBSD_kernel__)
+vector<char> query_route_table(int family) {
+    int mib[6];
+    vector<char> buf;
+    size_t len;
+
+    mib[0] = CTL_NET;
+    mib[1] = AF_ROUTE;
+    mib[2] = 0;
+    mib[3] = family;
+    mib[4] = NET_RT_DUMP;
+    mib[5] = 0; 
+    if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0) {
+        throw runtime_error("sysctl failed");
+    }
+
+    buf.resize(len);
+    if (sysctl(mib, 6, &buf[0], &len, NULL, 0) < 0) {
+        throw runtime_error("sysctl failed");
+    }
+
+    return buf;
+}
+
+void parse_header(struct rt_msghdr* rtm, vector<sockaddr*>& addrs) {
+    char* ptr = (char *)(rtm + 1);
+    // Iterate from RTA_DST (0) to RTA_NETMASK (2)
+    for (int i = 0; i < 3; ++i) {
+        sockaddr* sa = 0;
+        if ((rtm->rtm_addrs & (1 << i)) != 0) {
+            sa = (struct sockaddr *)ptr;
+            ptr += sa->sa_len;
+            if (sa->sa_family == 0) {
+                sa = 0;
+            }
+        } 
+        addrs[i] = sa;
+    }
+}
+
+vector<RouteEntry> route_entries() {
+    vector<RouteEntry> output;
+    vector<char> buffer = query_route_table(AF_INET);
+    char* next = &buffer[0], *end = &buffer[buffer.size()];
+    rt_msghdr* rtm;
+    vector<sockaddr*> sa(32);
+    char iface_name[IF_NAMESIZE];
+    while (next < end) {
+        rtm = (rt_msghdr*)next;
+        // Filter:
+        // * RTF_STATIC (only manually added routes)
+        if ((rtm->rtm_flags & (RTF_STATIC)) != 0) {
+            parse_header(rtm, sa);
+            if (sa[RTAX_DST] && sa[RTAX_GATEWAY] && if_indextoname(rtm->rtm_index, iface_name)) {
+                RouteEntry entry;
+                entry.destination = IPv4Address(((struct sockaddr_in *)sa[RTAX_DST])->sin_addr.s_addr);
+                entry.gateway = IPv4Address(((struct sockaddr_in *)sa[RTAX_GATEWAY])->sin_addr.s_addr);
+                if (sa[RTAX_NETMASK]) {
+                    entry.mask = IPv4Address(((struct sockaddr_in *)sa[RTAX_NETMASK])->sin_addr.s_addr);
+                }
+                entry.interface = iface_name;
+                entry.metric = 0;
+                output.push_back(entry);
+            }
+        }
+        next += rtm->rtm_msglen;
+    }
+    return output;
+}
+
+vector<Route6Entry> route6_entries() {
+    vector<Route6Entry> output;
+    vector<char> buffer = query_route_table(AF_INET6);
+    char* next = &buffer[0], *end = &buffer[buffer.size()];
+    rt_msghdr* rtm;
+    vector<sockaddr*> sa(9);
+    char iface_name[IF_NAMESIZE];
+    while (next < end) {
+        rtm = (rt_msghdr*)next;
+        // Filter protocol-cloned entries
+        bool process_entry = true;
+        // These were removed in recent versions of FreeBSD
+        #if defined(RTF_WASCLONED) && defined(RTF_PRCLONING)
+            process_entry = (rtm->rtm_flags & RTF_WASCLONED) == 0 ||
+                            (rtm->rtm_flags & RTF_PRCLONING) == 0;
+        #endif
+        if (process_entry) {
+            parse_header(rtm, sa);
+            if (sa[RTAX_DST] && sa[RTAX_GATEWAY] && if_indextoname(rtm->rtm_index, iface_name)) {
+                Route6Entry entry;
+                entry.destination = IPv6Address(((struct sockaddr_in6 *)sa[RTAX_DST])->sin6_addr.s6_addr);
+                entry.gateway = IPv6Address(((struct sockaddr_in6 *)sa[RTAX_GATEWAY])->sin6_addr.s6_addr);
+                int prefix_length = 0;
+                if (sa[RTAX_NETMASK]) {
+                    struct sockaddr_in6  *sin = (struct sockaddr_in6 *)sa[RTAX_NETMASK];
+                    for (size_t i = 0; i < 16; ++i) {
+                        uint8_t this_byte = sin->sin6_addr.s6_addr[i];
+                        // Stop when we find a zero byte
+                        if (this_byte == 0) {
+                            break;
+                        }
+                        switch (this_byte) {
+                            case 0xff:
+                                prefix_length += 8;
+                                break;
+                            case 0xfe:
+                                prefix_length += 7;
+                                break;
+                            case 0xfc:
+                                prefix_length += 6;
+                                break;
+                            case 0xf8:
+                                prefix_length += 5;
+                                break;
+                            case 0xf0:
+                                prefix_length += 4;
+                                break;
+                            case 0xe0:
+                                prefix_length += 3;
+                                break;
+                            case 0xc0:
+                                prefix_length += 2;
+                                break;
+                            case 0x80:
+                                prefix_length += 1;
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                }
+                entry.mask = IPv6Address::from_prefix_length(prefix_length);
+                entry.interface = iface_name;
+                entry.metric = 0;
+                output.push_back(entry);
+            }
+        }
+        next += rtm->rtm_msglen;
+    }
+    return output;
+}
+
+#elif defined(_WIN32)
+
+vector<RouteEntry> route_entries() {
+    vector<RouteEntry> output;
+    MIB_IPFORWARDTABLE* table;
+    ULONG size = 0;
+    GetIpForwardTable(0, &size, 0);
+    vector<uint8_t> buffer(size);
+    table = (MIB_IPFORWARDTABLE*)&buffer[0];
+    GetIpForwardTable(table, &size, 0);
+    
+    for (DWORD i = 0; i < table->dwNumEntries; i++) {
+        MIB_IPFORWARDROW* row = &table->table[i];
+        if (row->dwForwardType == MIB_IPROUTE_TYPE_INDIRECT || 
+            row->dwForwardType == MIB_IPROUTE_TYPE_DIRECT) {
+            RouteEntry entry;
+            entry.interface = NetworkInterface::from_index(row->dwForwardIfIndex).name();
+            entry.destination = IPv4Address(row->dwForwardDest);
+            entry.mask = IPv4Address(row->dwForwardMask);
+            entry.gateway = IPv4Address(row->dwForwardNextHop);
+            entry.metric = row->dwForwardMetric1;
+            output.push_back(entry);
+        }
+    }
+    return output;
+}
+
+vector<Route6Entry> route6_entries() {
+    vector<Route6Entry> output;
+    MIB_IPFORWARD_TABLE2* table;
+    GetIpForwardTable2(AF_INET6, &table);
+    for (ULONG i = 0; i < table->NumEntries; i++) {
+        MIB_IPFORWARD_ROW2* row = &table->Table[i];
+        if (true) {
+            try {
+                Route6Entry entry;
+                entry.interface = NetworkInterface::from_index(row->InterfaceIndex).name();
+                entry.destination = IPv6Address(row->DestinationPrefix.Prefix.Ipv6.sin6_addr.s6_addr);
+                entry.mask = IPv6Address::from_prefix_length(row->DestinationPrefix.PrefixLength);
+                entry.gateway = IPv6Address(row->NextHop.Ipv6.sin6_addr.s6_addr);
+                entry.metric = row->Metric;
+                output.push_back(entry);
+            }
+            catch (invalid_interface&) {
+                
+            }
+        }
+    }
+    FreeMibTable(table);
+    return output;
+}
+
+#else // GNU/LINUX
+
+vector<RouteEntry> route_entries() {
+    using namespace Tins::Internals;
+    vector<RouteEntry> output;
+    ifstream input("/proc/net/route");
+    string destination, mask, metric, gw;
+    uint32_t dummy;
+    skip_line(input);
+    RouteEntry entry;
+    while (input >> entry.interface >> destination >> gw) {
+        for (unsigned i(0); i < 4; ++i) {
+            input >> metric;
+        }
+        input >> mask;
+        from_hex(destination, dummy);
+        entry.destination = IPv4Address(dummy);
+        from_hex(mask, dummy);
+        entry.mask = IPv4Address(dummy);
+        from_hex(gw, dummy);
+        entry.gateway = IPv4Address(dummy);
+        from_hex(metric, dummy);
+        entry.metric = dummy;
+        skip_line(input);
+        output.push_back(entry);
+    }
+    return output;
+}
+
+vector<Route6Entry> route6_entries() {
+    using namespace Tins::Internals;
+    vector<Route6Entry> output;
+    ifstream input("/proc/net/ipv6_route");
+    string destination, mask_length, metric, next_hop, dummy, flags;
+    Route6Entry entry;
+    while (input >> destination >> mask_length) {
+        string temporary;
+        uint32_t temporary_int;
+        for (unsigned i(0); i < 2; ++i) {
+            input >> dummy;
+        }
+        input >> next_hop;
+        input >> metric;
+        for (unsigned i(0); i < 2; ++i) {
+            input >> dummy;
+        }
+        input >> flags >> entry.interface;
+        from_hex(destination, temporary);
+        entry.destination = IPv6Address((const uint8_t*)&temporary[0]);
+        from_hex(mask_length, temporary_int);
+        entry.mask = IPv6Address::from_prefix_length(temporary_int);
+        from_hex(next_hop, temporary);
+        entry.gateway = IPv6Address((const uint8_t*)&temporary[0]);
+        from_hex(metric, temporary_int);
+        entry.metric = temporary_int;
+        // Process flags
+        from_hex(flags, temporary_int);
+        // Skip:
+        // * 0x01000000 -> cache entries
+        if ((temporary_int & 0x01000000) == 0) {
+            output.push_back(entry);
+        }
+    }
+    return output;
+}
+
+#endif
+
+#ifdef _WIN32
+set<string> network_interfaces() {
+    set<string> output;
+    ULONG size;
+    ::GetAdaptersAddresses(AF_INET, 0, 0, 0, &size);
+    vector<uint8_t> buffer(size);
+    if (::GetAdaptersAddresses(AF_INET, 0, 0, (IP_ADAPTER_ADDRESSES *)&buffer[0], &size) == ERROR_SUCCESS) {
+        PIP_ADAPTER_ADDRESSES iface = (IP_ADAPTER_ADDRESSES *)&buffer[0];
+        while (iface) {
+            output.insert(iface->AdapterName);
+            iface = iface->Next;
+        }
+    }
+    return output;
+}
+#else
+set<string> network_interfaces() {
+    set<string> output;
+    struct ifaddrs* ifaddrs = 0;
+    struct ifaddrs* if_it = 0;
+    getifaddrs(&ifaddrs);
+    for (if_it = ifaddrs; if_it; if_it = if_it->ifa_next) {
+        output.insert(if_it->ifa_name);
+    }
+    if (ifaddrs) {
+        freeifaddrs(ifaddrs);
+    }
+    return output;
+}
+#endif // _WIN32
+
+} // Utils
+} // Tins

From 4e4f7a239073f7f338d5fe5023d3671230c21581 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 13:12:39 -0700
Subject: [PATCH 25/73] Move Utils::gateway_from_ip into routing utils files

---
 include/tins/utils.h               | 13 -------------
 include/tins/utils/routing_utils.h | 13 +++++++++++++
 src/utils.cpp                      | 14 --------------
 src/utils/routing_utils.cpp        | 13 +++++++++++++
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/include/tins/utils.h b/include/tins/utils.h
index 27d2128..d4665cb 100644
--- a/include/tins/utils.h
+++ b/include/tins/utils.h
@@ -112,19 +112,6 @@ TINS_API HWAddress<6> resolve_hwaddr(const NetworkInterface& iface,
  */
 TINS_API HWAddress<6> resolve_hwaddr(IPv4Address ip, PacketSender& sender);
 
-/**
- * \brief Finds the gateway's IP address for the given IP 
- * address.
- * 
- * \param ip The IP address for which the default gateway will
- * be searched.
- * \param gw_addr This parameter will contain the gateway's IP
- * address in case it is found.
- * 
- * \return bool indicating whether the lookup was successfull.
- */
-TINS_API bool gateway_from_ip(IPv4Address ip, IPv4Address& gw_addr);
-
 /**
  * \brief Converts a PDUType to a string.
  * \param pduType The PDUType to be converted.
diff --git a/include/tins/utils/routing_utils.h b/include/tins/utils/routing_utils.h
index 71a5863..a162841 100644
--- a/include/tins/utils/routing_utils.h
+++ b/include/tins/utils/routing_utils.h
@@ -133,6 +133,19 @@ TINS_API std::vector<Route6Entry> route6_entries();
  */
 TINS_API std::set<std::string> network_interfaces();
 
+/**
+ * \brief Finds the gateway's IP address for the given IP 
+ * address.
+ * 
+ * \param ip The IP address for which the default gateway will
+ * be searched.
+ * \param gw_addr This parameter will contain the gateway's IP
+ * address in case it is found.
+ * 
+ * \return bool indicating whether the lookup was successfull.
+ */
+TINS_API bool gateway_from_ip(IPv4Address ip, IPv4Address& gw_addr);
+
 } // Utils
 } // Tins
 
diff --git a/src/utils.cpp b/src/utils.cpp
index 9940c91..8d91f8b 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -142,20 +142,6 @@ HWAddress<6> resolve_hwaddr(const NetworkInterface& iface,
 HWAddress<6> resolve_hwaddr(IPv4Address ip, PacketSender& sender) {
     return resolve_hwaddr(sender.default_interface(), ip, sender);
 }
-
-bool gateway_from_ip(IPv4Address ip, IPv4Address& gw_addr) {
-    typedef vector<RouteEntry> entries_type;
-    entries_type entries;
-    uint32_t ip_int = ip;
-    route_entries(back_inserter(entries));
-    for (entries_type::const_iterator it(entries.begin()); it != entries.end(); ++it) {
-        if ((ip_int & it->mask) == it->destination) {
-            gw_addr = it->gateway;
-            return true;
-        }
-    }
-    return false;
-}
     
 string to_string(PDU::PDUType pduType) {
 #define ENUM_TEXT(p) case(PDU::p): return #p;
diff --git a/src/utils/routing_utils.cpp b/src/utils/routing_utils.cpp
index 31fca0d..c2d3229 100644
--- a/src/utils/routing_utils.cpp
+++ b/src/utils/routing_utils.cpp
@@ -425,5 +425,18 @@ set<string> network_interfaces() {
 }
 #endif // _WIN32
 
+bool gateway_from_ip(IPv4Address ip, IPv4Address& gw_addr) {
+    typedef vector<RouteEntry> entries_type;
+    entries_type entries = route_entries();
+    uint32_t ip_int = ip;
+    for (entries_type::const_iterator it(entries.begin()); it != entries.end(); ++it) {
+        if ((ip_int & it->mask) == it->destination) {
+            gw_addr = it->gateway;
+            return true;
+        }
+    }
+    return false;
+}
+
 } // Utils
 } // Tins

From e556f4147f01dd2daa359c708b815ab3baebb9fe Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 13:21:13 -0700
Subject: [PATCH 26/73] Move resolution utils into their own file

---
 include/tins/utils.h               |  51 +----------
 include/tins/utils/resolve_utils.h | 100 ++++++++++++++++++++++
 src/CMakeLists.txt                 |   1 +
 src/utils.cpp                      |  64 --------------
 src/utils/resolve_utils.cpp        | 133 +++++++++++++++++++++++++++++
 5 files changed, 235 insertions(+), 114 deletions(-)
 create mode 100644 include/tins/utils/resolve_utils.h
 create mode 100644 src/utils/resolve_utils.cpp

diff --git a/include/tins/utils.h b/include/tins/utils.h
index d4665cb..249ec8c 100644
--- a/include/tins/utils.h
+++ b/include/tins/utils.h
@@ -40,6 +40,7 @@
 #include "utils/checksum_utils.h"
 #include "utils/frequency_utils.h"
 #include "utils/routing_utils.h"
+#include "utils/resolve_utils.h"
 
 // Fix for Windows interface define on combaseapi.h
 #undef interface
@@ -62,56 +63,6 @@ class HWAddress;
  */
 namespace Utils {
 
-/** 
- * \brief Resolves a domain name and returns its corresponding ip address.
- *
- * If an ip address is given, its integer representation is returned.
- * Otherwise, the domain name is resolved and its ip address is returned.
- *
- * \param to_resolve The domain name/ip address to resolve.
- */
-TINS_API IPv4Address resolve_domain(const std::string& to_resolve);
-
-/** 
- * \brief Resolves a domain name and returns its corresponding ip address.
- *
- * If an ip address is given, its integer representation is returned.
- * Otherwise, the domain name is resolved and its ip address is returned.
- *
- * \param to_resolve The domain name/ip address to resolve.
- */
-TINS_API IPv6Address resolve_domain6(const std::string& to_resolve);
-
-/** 
- * \brief Resolves the hardware address for a given ip.
- *
- * If the address can't be resolved, a std::runtime_error
- * exception is thrown.
- * 
- * \param iface The interface in which the packet will be sent.
- * \param ip The ip to resolve, in integer format.
- * \param sender The sender to use to send and receive the ARP requests.
- * \return HWAddress<6> containing the resolved hardware address.
- */
-TINS_API HWAddress<6> resolve_hwaddr(const NetworkInterface& iface, 
-                                     IPv4Address ip,
-                                     PacketSender& sender);
-
-/** 
- * \brief Resolves the hardware address for a given ip.
- *
- * If the address can't be resolved, a std::runtime_error
- * exception is thrown.
- * 
- * This method sends and receives the packet through
- * PacketSender::default_interface.
- * 
- * \param ip The ip to resolve, in integer format.
- * \param sender The sender to use to send and receive the ARP requests.
- * \return HWAddress<6> containing the resolved hardware address.
- */
-TINS_API HWAddress<6> resolve_hwaddr(IPv4Address ip, PacketSender& sender);
-
 /**
  * \brief Converts a PDUType to a string.
  * \param pduType The PDUType to be converted.
diff --git a/include/tins/utils/resolve_utils.h b/include/tins/utils/resolve_utils.h
new file mode 100644
index 0000000..b3c45d8
--- /dev/null
+++ b/include/tins/utils/resolve_utils.h
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef TINS_RESOLVE_UTILS_H
+#define TINS_RESOLVE_UTILS_H
+
+#include <string>
+#include "../macros.h"
+
+namespace Tins {
+
+class PacketSender;
+class NetworkInterface;
+class IPv4Address;
+class IPv6Address;
+template <size_t n>
+class HWAddress;
+
+namespace Utils {
+
+/** 
+ * \brief Resolves a domain name and returns its corresponding ip address.
+ *
+ * If an ip address is given, its integer representation is returned.
+ * Otherwise, the domain name is resolved and its ip address is returned.
+ *
+ * \param to_resolve The domain name/ip address to resolve.
+ */
+TINS_API IPv4Address resolve_domain(const std::string& to_resolve);
+
+/** 
+ * \brief Resolves a domain name and returns its corresponding ip address.
+ *
+ * If an ip address is given, its integer representation is returned.
+ * Otherwise, the domain name is resolved and its ip address is returned.
+ *
+ * \param to_resolve The domain name/ip address to resolve.
+ */
+TINS_API IPv6Address resolve_domain6(const std::string& to_resolve);
+
+/** 
+ * \brief Resolves the hardware address for a given ip.
+ *
+ * If the address can't be resolved, a std::runtime_error
+ * exception is thrown.
+ * 
+ * \param iface The interface in which the packet will be sent.
+ * \param ip The ip to resolve, in integer format.
+ * \param sender The sender to use to send and receive the ARP requests.
+ * \return HWAddress<6> containing the resolved hardware address.
+ */
+TINS_API HWAddress<6> resolve_hwaddr(const NetworkInterface& iface, 
+                                     IPv4Address ip,
+                                     PacketSender& sender);
+
+/** 
+ * \brief Resolves the hardware address for a given ip.
+ *
+ * If the address can't be resolved, a std::runtime_error
+ * exception is thrown.
+ * 
+ * This method sends and receives the packet through
+ * PacketSender::default_interface.
+ * 
+ * \param ip The ip to resolve, in integer format.
+ * \param sender The sender to use to send and receive the ARP requests.
+ * \return HWAddress<6> containing the resolved hardware address.
+ */
+TINS_API HWAddress<6> resolve_hwaddr(IPv4Address ip, PacketSender& sender);
+
+} // Utils
+} // Tins
+
+#endif // TINS_RESOLVE_UTILS_H
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9e709e5..6279a2f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -75,6 +75,7 @@ set(SOURCES
     utils/checksum_utils.cpp
     utils/frequency_utils.cpp
     utils/routing_utils.cpp
+    utils/resolve_utils.cpp
 )
 
 SET(PCAP_DEPENDENT_SOURCES
diff --git a/src/utils.cpp b/src/utils.cpp
index 8d91f8b..d5f9300 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -76,72 +76,8 @@ using std::runtime_error;
 using Tins::Memory::InputMemoryStream;
 using Tins::Memory::OutputMemoryStream;
 
-/** \cond */
-
-addrinfo* resolve_domain(const string& to_resolve, int family) {
-    addrinfo* result, hints = addrinfo();
-    hints.ai_socktype = SOCK_STREAM;
-    hints.ai_protocol = IPPROTO_TCP;
-    hints.ai_family = family;
-    if (!getaddrinfo(to_resolve.c_str(), 0, &hints, &result)) {
-        return result;
-    }
-    else {
-        throw runtime_error("Could not resolve address");
-    }
-}
-
 namespace Tins {
-
-/** \endcond */
 namespace Utils {
-
-IPv4Address resolve_domain(const string& to_resolve) {
-    addrinfo* result = ::resolve_domain(to_resolve, AF_INET);
-    IPv4Address addr(((sockaddr_in*)result->ai_addr)->sin_addr.s_addr);
-    freeaddrinfo(result);
-    return addr;
-}
-
-IPv6Address resolve_domain6(const string& to_resolve) {
-    addrinfo* result = ::resolve_domain(to_resolve, AF_INET6);
-    IPv6Address addr((const uint8_t*)&((sockaddr_in6*)result->ai_addr)->sin6_addr);
-    freeaddrinfo(result);
-    return addr;
-}
-
-HWAddress<6> resolve_hwaddr(const NetworkInterface& iface,
-                            IPv4Address ip,
-                            PacketSender& sender) {
-    NetworkInterface::Info info(iface.addresses());
-    #ifdef _WIN32
-        // On Windows, use SendARP
-        IPAddr source;
-        IPAddr dest;
-        ULONG hw_address[2];
-        ULONG address_length = 6;
-        source = static_cast<uint32_t>(info.ip_addr);
-        dest = static_cast<uint32_t>(ip);
-        if (SendARP(dest, source, &hw_address, &address_length) == NO_ERROR && address_length == 6) {
-            return HWAddress<6>((const uint8_t*)hw_address);
-        }
-    #else
-        // On other platforms, just do the ARP resolution ourselves
-        EthernetII packet = ARP::make_arp_request(ip, info.ip_addr, info.hw_addr);
-        Internals::smart_ptr<PDU>::type response(sender.send_recv(packet, iface));
-        if (response.get()) {
-            const ARP* arp_resp = response->find_pdu<ARP>();
-            if (arp_resp) {
-                return arp_resp->sender_hw_addr();
-            }
-        }
-    #endif 
-    throw runtime_error("Could not resolve hardware address");
-}
-
-HWAddress<6> resolve_hwaddr(IPv4Address ip, PacketSender& sender) {
-    return resolve_hwaddr(sender.default_interface(), ip, sender);
-}
     
 string to_string(PDU::PDUType pduType) {
 #define ENUM_TEXT(p) case(PDU::p): return #p;
diff --git a/src/utils/resolve_utils.cpp b/src/utils/resolve_utils.cpp
new file mode 100644
index 0000000..05c6747
--- /dev/null
+++ b/src/utils/resolve_utils.cpp
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "utils/resolve_utils.h"
+ #ifndef _WIN32
+    #if defined(BSD) || defined(__FreeBSD_kernel__)
+        #include <sys/socket.h>
+        #include <netinet/in.h>
+    #else
+        #include <netpacket/packet.h>
+    #endif
+    #include <ifaddrs.h>
+    #include <netdb.h>
+    #include <net/if.h>
+    #ifdef __ANDROID_API__
+        #include <linux/in.h>
+        #include <linux/in6.h>
+    #endif
+#else
+    #include <winsock2.h>
+    #include <ws2tcpip.h>
+    #include <iphlpapi.h>
+    #undef interface
+#endif
+#include <stdexcept>
+#include "ip_address.h"
+#include "ipv6_address.h"
+#include "hw_address.h"
+#include "ethernetII.h"
+#include "arp.h"
+#include "packet_sender.h"
+#include "network_interface.h"
+#include "detail/smart_ptr.h"
+
+using std::string;
+using std::runtime_error;
+
+/** \cond */
+
+addrinfo* resolve_domain(const string& to_resolve, int family) {
+    addrinfo* result, hints = addrinfo();
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_protocol = IPPROTO_TCP;
+    hints.ai_family = family;
+    if (!getaddrinfo(to_resolve.c_str(), 0, &hints, &result)) {
+        return result;
+    }
+    else {
+        throw runtime_error("Could not resolve address");
+    }
+}
+
+/** \endcond */
+
+namespace Tins {
+namespace Utils {
+
+IPv4Address resolve_domain(const string& to_resolve) {
+    addrinfo* result = ::resolve_domain(to_resolve, AF_INET);
+    IPv4Address addr(((sockaddr_in*)result->ai_addr)->sin_addr.s_addr);
+    freeaddrinfo(result);
+    return addr;
+}
+
+IPv6Address resolve_domain6(const string& to_resolve) {
+    addrinfo* result = ::resolve_domain(to_resolve, AF_INET6);
+    IPv6Address addr((const uint8_t*)&((sockaddr_in6*)result->ai_addr)->sin6_addr);
+    freeaddrinfo(result);
+    return addr;
+}
+
+HWAddress<6> resolve_hwaddr(const NetworkInterface& iface,
+                            IPv4Address ip,
+                            PacketSender& sender) {
+    NetworkInterface::Info info(iface.addresses());
+    #ifdef _WIN32
+        // On Windows, use SendARP
+        IPAddr source;
+        IPAddr dest;
+        ULONG hw_address[2];
+        ULONG address_length = 6;
+        source = static_cast<uint32_t>(info.ip_addr);
+        dest = static_cast<uint32_t>(ip);
+        if (SendARP(dest, source, &hw_address, &address_length) == NO_ERROR && address_length == 6) {
+            return HWAddress<6>((const uint8_t*)hw_address);
+        }
+    #else
+        // On other platforms, just do the ARP resolution ourselves
+        EthernetII packet = ARP::make_arp_request(ip, info.ip_addr, info.hw_addr);
+        Internals::smart_ptr<PDU>::type response(sender.send_recv(packet, iface));
+        if (response.get()) {
+            const ARP* arp_resp = response->find_pdu<ARP>();
+            if (arp_resp) {
+                return arp_resp->sender_hw_addr();
+            }
+        }
+    #endif 
+    throw runtime_error("Could not resolve hardware address");
+}
+
+HWAddress<6> resolve_hwaddr(IPv4Address ip, PacketSender& sender) {
+    return resolve_hwaddr(sender.default_interface(), ip, sender);
+}
+
+
+} // Utils
+} // Tins

From 3d4f9285c92a3c86ee7d977b34ce5f3adb318086 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 13:29:33 -0700
Subject: [PATCH 27/73] Move PDU utils into their own file

---
 include/tins/packet_writer.h           |  2 +-
 include/tins/tcp_stream.h              |  2 +-
 include/tins/utils.h                   | 59 +-----------------
 include/tins/utils/pdu_utils.h         | 83 ++++++++++++++++++++++++++
 src/CMakeLists.txt                     |  2 +-
 src/{utils.cpp => utils/pdu_utils.cpp} | 49 +--------------
 6 files changed, 90 insertions(+), 107 deletions(-)
 create mode 100644 include/tins/utils/pdu_utils.h
 rename src/{utils.cpp => utils/pdu_utils.cpp} (74%)

diff --git a/include/tins/packet_writer.h b/include/tins/packet_writer.h
index 79b7b8e..07fa53e 100644
--- a/include/tins/packet_writer.h
+++ b/include/tins/packet_writer.h
@@ -30,10 +30,10 @@
 #ifndef TINS_PACKET_WRITER_H
 #define TINS_PACKET_WRITER_H
 
-#include "utils.h"
 #include <string>
 #include "macros.h"
 #include "cxxstd.h"
+#include "utils/pdu_utils.h"
 
 #ifdef TINS_HAVE_PCAP
 #include <pcap.h>
diff --git a/include/tins/tcp_stream.h b/include/tins/tcp_stream.h
index 0952176..eb0a838 100644
--- a/include/tins/tcp_stream.h
+++ b/include/tins/tcp_stream.h
@@ -38,9 +38,9 @@
 #include <stdint.h>
 #include "macros.h"
 #include "tcp.h"
-#include "utils.h"
 #include "ip.h"
 #include "ip_address.h"
+#include "utils/pdu_utils.h"
 
 #ifdef TINS_HAVE_PCAP
 
diff --git a/include/tins/utils.h b/include/tins/utils.h
index 249ec8c..ea13730 100644
--- a/include/tins/utils.h
+++ b/include/tins/utils.h
@@ -30,30 +30,14 @@
 #ifndef TINS_UTILS_H
 #define TINS_UTILS_H
 
-#include "macros.h"
-#include <string>
-#include <stdint.h>
-#include "ip_address.h"
-#include "ipv6_address.h"
-#include "pdu.h"
-#include "detail/type_traits.h"
 #include "utils/checksum_utils.h"
 #include "utils/frequency_utils.h"
 #include "utils/routing_utils.h"
 #include "utils/resolve_utils.h"
-
-// Fix for Windows interface define on combaseapi.h
-#undef interface
-
+#include "utils/pdu_utils.h"
+ 
 namespace Tins {
 
-class NetworkInterface;
-class PacketSender;
-class PDU;
-class IPv6Address;
-template <size_t n>
-class HWAddress;
-
 /** 
  * \brief Network utils namespace.
  *
@@ -63,45 +47,6 @@ class HWAddress;
  */
 namespace Utils {
 
-/**
- * \brief Converts a PDUType to a string.
- * \param pduType The PDUType to be converted.
- * \return A string representation, for example "DOT11_QOS_DATA".
- */
-TINS_API std::string to_string(PDU::PDUType pduType);
-
-template <typename T>
-struct is_pdu {  
-    template <typename U>
-    static char test(typename U::PDUType*);
-     
-    template <typename U>
-    static long test(...);
- 
-    static const bool value = sizeof(test<T>(0)) == 1;
-};
-
-/**
- * Returns the argument.
- */
-inline PDU& dereference_until_pdu(PDU& pdu) {
-    return pdu;
-}
-
-/**
- * \brief Dereferences the parameter until a PDU is found.
- * 
- * This function dereferences the parameter until a PDU object
- * is found. When it's found, it is returned. 
- * 
- * \param value The parameter to be dereferenced.
- */
-template<typename T> 
-inline typename Internals::enable_if<!is_pdu<T>::value, PDU&>::type 
-dereference_until_pdu(T& value) {
-    return dereference_until_pdu(*value);
-}
-
 } // Utils
 } // Tins
 
diff --git a/include/tins/utils/pdu_utils.h b/include/tins/utils/pdu_utils.h
new file mode 100644
index 0000000..2e91217
--- /dev/null
+++ b/include/tins/utils/pdu_utils.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef TINS_PDU_UTILS_H
+#define TINS_PDU_UTILS_H
+
+#include "../macros.h"
+#include "../pdu.h"
+#include "../detail/type_traits.h"
+
+namespace Tins {
+namespace Utils {
+
+/**
+ * \brief Converts a PDUType to a string.
+ * \param pduType The PDUType to be converted.
+ * \return A string representation, for example "DOT11_QOS_DATA".
+ */
+TINS_API std::string to_string(PDU::PDUType pduType);
+
+template <typename T>
+struct is_pdu {  
+    template <typename U>
+    static char test(typename U::PDUType*);
+     
+    template <typename U>
+    static long test(...);
+ 
+    static const bool value = sizeof(test<T>(0)) == 1;
+};
+
+/**
+ * Returns the argument.
+ */
+inline PDU& dereference_until_pdu(PDU& pdu) {
+    return pdu;
+}
+
+/**
+ * \brief Dereferences the parameter until a PDU is found.
+ * 
+ * This function dereferences the parameter until a PDU object
+ * is found. When it's found, it is returned. 
+ * 
+ * \param value The parameter to be dereferenced.
+ */
+template<typename T> 
+inline typename Internals::enable_if<!is_pdu<T>::value, PDU&>::type 
+dereference_until_pdu(T& value) {
+    return dereference_until_pdu(*value);
+}
+
+} // Utils
+} // Tins
+
+
+#endif // TINS_PDU_UTILS_H
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6279a2f..b4f1730 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -63,7 +63,6 @@ set(SOURCES
     tcp_ip/stream_identifier.cpp
     timestamp.cpp
     udp.cpp
-    utils.cpp
     dot11/dot11_base.cpp
     dot11/dot11_data.cpp
     dot11/dot11_mgmt.cpp
@@ -76,6 +75,7 @@ set(SOURCES
     utils/frequency_utils.cpp
     utils/routing_utils.cpp
     utils/resolve_utils.cpp
+    utils/pdu_utils.cpp
 )
 
 SET(PCAP_DEPENDENT_SOURCES
diff --git a/src/utils.cpp b/src/utils/pdu_utils.cpp
similarity index 74%
rename from src/utils.cpp
rename to src/utils/pdu_utils.cpp
index d5f9300..a268539 100644
--- a/src/utils.cpp
+++ b/src/utils/pdu_utils.cpp
@@ -27,58 +27,13 @@
  *
  */
 
-#include <stdexcept>
-#include <cstring>
-#include "macros.h"
-#ifndef _WIN32
-    #if defined(BSD) || defined(__FreeBSD_kernel__)
-        #include <sys/socket.h>
-        #include <sys/file.h>
-        #include <sys/sysctl.h>
-        #include <net/route.h>
-        #include <net/if_dl.h>
-        #include <net/if.h>
-        #include <netinet/in.h>
-    #else
-        #include <netpacket/packet.h>
-    #endif
-    #include <ifaddrs.h>
-    #include <netdb.h>
-    #include <net/if.h>
-    #ifdef __ANDROID_API__
-        #include <linux/in.h>
-        #include <linux/in6.h>
-    #endif
-#else
-    #include <winsock2.h>
-    #include <ws2tcpip.h>
-    #include <iphlpapi.h>
-    #undef interface
-#endif
-#include "utils.h"
-#include "arp.h"
-#include "ethernetII.h"
-#include "network_interface.h"
-#include "packet_sender.h"
-#include "cxxstd.h"
-#include "hw_address.h"
-#include "memory_helpers.h"
-#include "detail/smart_ptr.h"
-#include "detail/smart_ptr.h"
+#include "utils/pdu_utils.h"
 
 using std::string;
-using std::istream;
-using std::set;
-using std::vector;
-using std::back_inserter;
-using std::runtime_error;
-
-using Tins::Memory::InputMemoryStream;
-using Tins::Memory::OutputMemoryStream;
 
 namespace Tins {
 namespace Utils {
-    
+
 string to_string(PDU::PDUType pduType) {
 #define ENUM_TEXT(p) case(PDU::p): return #p;
     switch (pduType){

From 3e7188edf775f530c3e48be7b9109fae9150bc88 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 13:49:50 -0700
Subject: [PATCH 28/73] Move internals' PDU helpers into their own files

---
 include/tins/detail/pdu_helpers.h |  66 +++++++
 include/tins/detail/type_traits.h |   1 +
 include/tins/internals.h          |  32 +---
 src/CMakeLists.txt                |   1 +
 src/detail/pdu_helpers.cpp        | 298 ++++++++++++++++++++++++++++++
 src/dhcp.cpp                      |   1 -
 src/dot1q.cpp                     |   2 +-
 src/ethernetII.cpp                |   3 +-
 src/internals.cpp                 | 270 ---------------------------
 src/ip.cpp                        |   3 +-
 src/ip_reassembler.cpp            |   2 +-
 src/ipsec.cpp                     |   2 +-
 src/ipv6.cpp                      |   3 +-
 src/pktap.cpp                     |   2 +-
 src/sll.cpp                       |   2 +-
 src/snap.cpp                      |   2 +-
 src/tcp.cpp                       |   1 -
 17 files changed, 382 insertions(+), 309 deletions(-)
 create mode 100644 include/tins/detail/pdu_helpers.h
 create mode 100644 src/detail/pdu_helpers.cpp

diff --git a/include/tins/detail/pdu_helpers.h b/include/tins/detail/pdu_helpers.h
new file mode 100644
index 0000000..77cc767
--- /dev/null
+++ b/include/tins/detail/pdu_helpers.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef TINS_PDU_HELPERS_H
+#define TINS_PDU_HELPERS_H
+
+#include "../constants.h"
+#include "../config.h"
+#include "../pdu.h"
+
+/**
+ * \cond
+ */
+
+namespace Tins {
+namespace Internals {
+
+PDU* pdu_from_flag(Constants::Ethernet::e flag, const uint8_t* buffer,
+                   uint32_t size, bool rawpdu_on_no_match = true);
+PDU* pdu_from_flag(Constants::IP::e flag, const uint8_t* buffer,
+                   uint32_t size, bool rawpdu_on_no_match = true);
+#ifdef TINS_HAVE_PCAP
+PDU* pdu_from_dlt_flag(int flag, const uint8_t* buffer,
+                       uint32_t size, bool rawpdu_on_no_match = true);
+#endif // TINS_HAVE_PCAP
+PDU* pdu_from_flag(PDU::PDUType type, const uint8_t* buffer, uint32_t size);
+
+Constants::Ethernet::e pdu_flag_to_ether_type(PDU::PDUType flag);
+PDU::PDUType ether_type_to_pdu_flag(Constants::Ethernet::e flag);
+Constants::IP::e pdu_flag_to_ip_type(PDU::PDUType flag);
+PDU::PDUType ip_type_to_pdu_flag(Constants::IP::e flag);
+
+} // Internals
+} // Tins
+
+/**
+ * \endcond
+ */
+
+#endif // TINS_PDU_HELPERS_H
diff --git a/include/tins/detail/type_traits.h b/include/tins/detail/type_traits.h
index f133d5c..99fbc4b 100644
--- a/include/tins/detail/type_traits.h
+++ b/include/tins/detail/type_traits.h
@@ -34,6 +34,7 @@
 #include "../cxxstd.h"
 #if TINS_IS_CXX11
     #include <type_traits>
+    #include <utility>
 #endif
 
 namespace Tins {
diff --git a/include/tins/internals.h b/include/tins/internals.h
index caddac4..d6697af 100644
--- a/include/tins/internals.h
+++ b/include/tins/internals.h
@@ -30,43 +30,19 @@
 #ifndef TINS_INTERNALS_H
 #define TINS_INTERNALS_H
 
-#include <string>
 #include <stdint.h>
-#include "constants.h"
-#include "pdu.h"
-#include "hw_address.h"
-#include "macros.h"
 #include "detail/type_traits.h"
+#include "detail/address_helpers.h"
+#include "detail/icmp_extension_helpers.h"
+#include "detail/smart_ptr.h"
+#include "detail/pdu_helpers.h"
 
 /**
  * \cond
  */
 namespace Tins {
-namespace Memory {
-
-class InputMemoryStream;
-} // Memory
-class IPv4Address;
-class IPv6Address;
-class ICMPExtensionsStructure;
-
 namespace Internals {
 
-PDU* pdu_from_flag(Constants::Ethernet::e flag, const uint8_t* buffer,
-  uint32_t size, bool rawpdu_on_no_match = true);
-PDU* pdu_from_flag(Constants::IP::e flag, const uint8_t* buffer,
-  uint32_t size, bool rawpdu_on_no_match = true);
-#ifdef TINS_HAVE_PCAP
-PDU* pdu_from_dlt_flag(int flag, const uint8_t* buffer,
-  uint32_t size, bool rawpdu_on_no_match = true);
-#endif // TINS_HAVE_PCAP
-PDU* pdu_from_flag(PDU::PDUType type, const uint8_t* buffer, uint32_t size);
-
-Constants::Ethernet::e pdu_flag_to_ether_type(PDU::PDUType flag);
-PDU::PDUType ether_type_to_pdu_flag(Constants::Ethernet::e flag);
-Constants::IP::e pdu_flag_to_ip_type(PDU::PDUType flag);
-PDU::PDUType ip_type_to_pdu_flag(Constants::IP::e flag);
-
 // Compares sequence numbers as defined by RFC 1982.
 int seq_compare(uint32_t seq1, uint32_t seq2);
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b4f1730..58e4920 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,6 +23,7 @@ set(SOURCES
     crypto.cpp
     detail/address_helpers.cpp
     detail/icmp_extension_helpers.cpp
+    detail/pdu_helpers.cpp
     dhcp.cpp
     dhcpv6.cpp
     dns.cpp
diff --git a/src/detail/pdu_helpers.cpp b/src/detail/pdu_helpers.cpp
new file mode 100644
index 0000000..ea15ee5
--- /dev/null
+++ b/src/detail/pdu_helpers.cpp
@@ -0,0 +1,298 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "detail/pdu_helpers.h"
+#ifdef TINS_HAVE_PCAP
+    #include <pcap.h>
+#endif // TINS_HAVE_PCAP
+#include "ip.h"
+#include "ethernetII.h"
+#include "ieee802_3.h"
+#include "radiotap.h"
+#include "dot11/dot11_base.h"
+#include "ipv6.h"
+#include "tcp.h"
+#include "udp.h"
+#include "ipsec.h"
+#include "icmp.h"
+#include "loopback.h"
+#include "sll.h"
+#include "ppi.h"
+#include "icmpv6.h"
+#include "mpls.h"
+#include "arp.h"
+#include "eapol.h"
+#include "rawpdu.h"
+#include "dot1q.h"
+#include "pppoe.h"
+#include "pdu_allocator.h"
+
+namespace Tins {
+namespace Internals {
+
+Tins::PDU* pdu_from_flag(Constants::Ethernet::e flag,
+                         const uint8_t* buffer,
+                         uint32_t size,
+                         bool rawpdu_on_no_match) {
+    switch (flag) {
+        case Tins::Constants::Ethernet::IP:
+            return new IP(buffer, size);
+        case Constants::Ethernet::IPV6:
+            return new IPv6(buffer, size);
+        case Tins::Constants::Ethernet::ARP:
+            return new ARP(buffer, size);
+        case Tins::Constants::Ethernet::PPPOED:
+        case Tins::Constants::Ethernet::PPPOES:
+            return new PPPoE(buffer, size);
+        case Tins::Constants::Ethernet::EAPOL:
+            return EAPOL::from_bytes(buffer, size);
+        case Tins::Constants::Ethernet::VLAN:
+        case Tins::Constants::Ethernet::QINQ:
+        case Tins::Constants::Ethernet::OLD_QINQ:
+            return new Dot1Q(buffer, size);
+        case Tins::Constants::Ethernet::MPLS:
+            return new MPLS(buffer, size);
+        default:
+            {
+                PDU* pdu = Internals::allocate<EthernetII>(
+                    static_cast<uint16_t>(flag),
+                    buffer,
+                    size
+                );
+                if (pdu) {
+                    return pdu;
+                }
+            }
+            return rawpdu_on_no_match ? new RawPDU(buffer, size) : 0;
+    };
+}
+
+Tins::PDU* pdu_from_flag(Constants::IP::e flag,
+                         const uint8_t* buffer,
+                         uint32_t size,
+                         bool rawpdu_on_no_match) {
+    switch (flag) {
+        case Constants::IP::PROTO_IPIP:
+            return new Tins::IP(buffer, size);
+        case Constants::IP::PROTO_TCP:
+            return new Tins::TCP(buffer, size);
+        case Constants::IP::PROTO_UDP:
+            return new Tins::UDP(buffer, size);
+        case Constants::IP::PROTO_ICMP:
+            return new Tins::ICMP(buffer, size);
+        case Constants::IP::PROTO_ICMPV6:
+            return new Tins::ICMPv6(buffer, size);
+        case Constants::IP::PROTO_IPV6:
+            return new Tins::IPv6(buffer, size);
+        case Constants::IP::PROTO_AH:
+            return new Tins::IPSecAH(buffer, size);
+        case Constants::IP::PROTO_ESP:
+            return new Tins::IPSecESP(buffer, size);
+        default:
+            break;
+    }
+    if (rawpdu_on_no_match) {
+        return new Tins::RawPDU(buffer, size);
+    }
+    return 0;
+}
+
+#ifdef TINS_HAVE_PCAP
+PDU* pdu_from_dlt_flag(int flag,
+                       const uint8_t* buffer,
+                       uint32_t size,
+                       bool rawpdu_on_no_match) {
+    switch (flag) {
+        case DLT_EN10MB:
+            return new EthernetII(buffer, size);
+
+        #ifdef TINS_HAVE_DOT11
+        case DLT_IEEE802_11_RADIO:
+            return new RadioTap(buffer, size);
+        case DLT_IEEE802_11:
+            return Dot11::from_bytes(buffer, size);
+        #else // TINS_HAVE_DOT11
+        case DLT_IEEE802_11_RADIO:
+        case DLT_IEEE802_11:
+            throw protocol_disabled();
+        #endif // TINS_HAVE_DOT11
+
+        case DLT_NULL:
+            return new Loopback(buffer, size);
+        case DLT_LINUX_SLL:
+            return new SLL(buffer, size);
+        case DLT_PPI:
+            return new PPI(buffer, size);
+        default:
+            return rawpdu_on_no_match ? new RawPDU(buffer, size) : 0;
+    };
+}
+#endif // TINS_HAVE_PCAP
+
+Tins::PDU* pdu_from_flag(PDU::PDUType type, const uint8_t* buffer, uint32_t size) {
+    switch(type) {
+        case Tins::PDU::ETHERNET_II:
+            return new Tins::EthernetII(buffer, size);
+        case Tins::PDU::IP:
+            return new Tins::IP(buffer, size);
+        case Tins::PDU::IPv6:
+            return new Tins::IPv6(buffer, size);
+        case Tins::PDU::ARP:
+            return new Tins::ARP(buffer, size);
+        case Tins::PDU::IEEE802_3:
+            return new Tins::IEEE802_3(buffer, size);
+        case Tins::PDU::PPPOE:
+            return new Tins::PPPoE(buffer, size);
+        #ifdef TINS_HAVE_DOT11
+            case Tins::PDU::RADIOTAP:
+                return new Tins::RadioTap(buffer, size);
+            case Tins::PDU::DOT11:
+            case Tins::PDU::DOT11_ACK:
+            case Tins::PDU::DOT11_ASSOC_REQ:
+            case Tins::PDU::DOT11_ASSOC_RESP:
+            case Tins::PDU::DOT11_AUTH:
+            case Tins::PDU::DOT11_BEACON:
+            case Tins::PDU::DOT11_BLOCK_ACK:
+            case Tins::PDU::DOT11_BLOCK_ACK_REQ:
+            case Tins::PDU::DOT11_CF_END:
+            case Tins::PDU::DOT11_DATA:
+            case Tins::PDU::DOT11_CONTROL:
+            case Tins::PDU::DOT11_DEAUTH:
+            case Tins::PDU::DOT11_DIASSOC:
+            case Tins::PDU::DOT11_END_CF_ACK:
+            case Tins::PDU::DOT11_MANAGEMENT:
+            case Tins::PDU::DOT11_PROBE_REQ:
+            case Tins::PDU::DOT11_PROBE_RESP:
+            case Tins::PDU::DOT11_PS_POLL:
+            case Tins::PDU::DOT11_REASSOC_REQ:
+            case Tins::PDU::DOT11_REASSOC_RESP:
+            case Tins::PDU::DOT11_RTS:
+            case Tins::PDU::DOT11_QOS_DATA:
+                return Tins::Dot11::from_bytes(buffer, size);
+        #endif // TINS_HAVE_DOT11
+        default:
+            return 0;
+    };
+}
+
+Constants::Ethernet::e pdu_flag_to_ether_type(PDU::PDUType flag) {
+    switch (flag) {
+        case PDU::IP:
+            return Constants::Ethernet::IP;
+        case PDU::IPv6:
+            return Constants::Ethernet::IPV6;
+        case PDU::ARP:
+            return Constants::Ethernet::ARP;
+        case PDU::DOT1Q:
+            return Constants::Ethernet::VLAN;
+        case PDU::PPPOE:
+            return Constants::Ethernet::PPPOED;
+        case PDU::MPLS:
+            return Constants::Ethernet::MPLS;
+        case PDU::RSNEAPOL:
+        case PDU::RC4EAPOL:
+            return Constants::Ethernet::EAPOL;
+        default:
+            if (Internals::pdu_type_registered<EthernetII>(flag)) {
+                return static_cast<Constants::Ethernet::e>(
+                    Internals::pdu_type_to_id<EthernetII>(flag)
+                );
+            }
+            return Constants::Ethernet::UNKNOWN;
+    }
+}
+
+PDU::PDUType ether_type_to_pdu_flag(Constants::Ethernet::e flag) {
+    switch (flag) {
+        case Constants::Ethernet::IP:
+            return PDU::IP;
+        case Constants::Ethernet::IPV6:
+            return PDU::IPv6;
+        case Constants::Ethernet::ARP:
+            return PDU::ARP;
+        case Constants::Ethernet::VLAN:
+            return PDU::DOT1Q;
+        case Constants::Ethernet::PPPOED:
+            return PDU::PPPOE;
+        //case PDU::RSNEAPOL
+        //case PDU::RC4EAPOL:
+        //    return Constants::Ethernet::EAPOL;
+        default:
+            return PDU::UNKNOWN;
+    }
+}
+
+Constants::IP::e pdu_flag_to_ip_type(PDU::PDUType flag) {
+    switch(flag) {
+        case PDU::IP:
+            return Constants::IP::PROTO_IPIP;
+        case PDU::IPv6:
+            return Constants::IP::PROTO_IPV6;
+        case PDU::TCP:
+            return Constants::IP::PROTO_TCP;
+        case PDU::UDP:
+            return Constants::IP::PROTO_UDP;
+        case PDU::ICMP:
+            return Constants::IP::PROTO_ICMP;
+        case PDU::ICMPv6:
+            return Constants::IP::PROTO_ICMPV6;
+        case PDU::IPSEC_AH:
+            return Constants::IP::PROTO_AH;
+        case PDU::IPSEC_ESP:
+            return Constants::IP::PROTO_ESP;
+        default:
+            return static_cast<Constants::IP::e>(0xff);
+    };
+}
+
+PDU::PDUType ip_type_to_pdu_flag(Constants::IP::e flag) {
+    switch(flag) {
+        case Constants::IP::PROTO_IPIP:
+            return PDU::IP;
+        case Constants::IP::PROTO_IPV6:
+            return PDU::IPv6;
+        case Constants::IP::PROTO_TCP:
+            return PDU::TCP;
+        case Constants::IP::PROTO_UDP:
+            return PDU::UDP;
+        case Constants::IP::PROTO_ICMP:
+            return PDU::ICMP;
+        case Constants::IP::PROTO_ICMPV6:
+            return PDU::ICMPv6;
+        case Constants::IP::PROTO_AH:
+            return PDU::IPSEC_AH;
+        case Constants::IP::PROTO_ESP:
+            return PDU::IPSEC_ESP;
+        default:
+            return PDU::UNKNOWN;
+    };
+}
+
+} // Internals
+} // Tins
\ No newline at end of file
diff --git a/src/dhcp.cpp b/src/dhcp.cpp
index 46dd78f..051e303 100644
--- a/src/dhcp.cpp
+++ b/src/dhcp.cpp
@@ -33,7 +33,6 @@
 #include "endianness.h"
 #include "dhcp.h"
 #include "ethernetII.h"
-#include "internals.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
 
diff --git a/src/dot1q.cpp b/src/dot1q.cpp
index 5fca01c..f3f5fed 100644
--- a/src/dot1q.cpp
+++ b/src/dot1q.cpp
@@ -30,9 +30,9 @@
 #include <stdexcept>
 #include <cstring>
 #include "dot1q.h"
-#include "internals.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
+#include "detail/pdu_helpers.h"
 
 using Tins::Memory::InputMemoryStream;
 using Tins::Memory::OutputMemoryStream;
diff --git a/src/ethernetII.cpp b/src/ethernetII.cpp
index df85505..8dcdbaa 100644
--- a/src/ethernetII.cpp
+++ b/src/ethernetII.cpp
@@ -39,8 +39,8 @@
     #include <netinet/in.h>
     #include <net/ethernet.h>
 #endif
-#include "config.h"
 #include "ethernetII.h"
+#include "config.h"
 #include "packet_sender.h"
 #include "rawpdu.h"
 #include "pppoe.h"
@@ -51,6 +51,7 @@
 #include "internals.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
+#include "detail/pdu_helpers.h"
 
 using std::equal;
 
diff --git a/src/internals.cpp b/src/internals.cpp
index 740d9eb..78c63fb 100644
--- a/src/internals.cpp
+++ b/src/internals.cpp
@@ -28,280 +28,10 @@
  */
 
 #include "internals.h"
-#ifdef TINS_HAVE_PCAP
-    #include <pcap.h>
-#endif // TINS_HAVE_PCAP
-#include "ip.h"
-#include "ethernetII.h"
-#include "ieee802_3.h"
-#include "radiotap.h"
-#include "dot11/dot11_base.h"
-#include "ipv6.h"
-#include "tcp.h"
-#include "udp.h"
-#include "ipsec.h"
-#include "icmp.h"
-#include "loopback.h"
-#include "sll.h"
-#include "ppi.h"
-#include "icmpv6.h"
-#include "mpls.h"
-#include "arp.h"
-#include "eapol.h"
-#include "rawpdu.h"
-#include "dot1q.h"
-#include "pppoe.h"
-#include "exceptions.h"
-#include "ip_address.h"
-#include "ipv6_address.h"
-#include "pdu_allocator.h"
-#include "memory_helpers.h"
-
-using std::string;
-
-using Tins::Memory::InputMemoryStream;
 
 namespace Tins {
 namespace Internals {
 
-Tins::PDU* pdu_from_flag(Constants::Ethernet::e flag,
-                         const uint8_t* buffer,
-                         uint32_t size,
-                         bool rawpdu_on_no_match) {
-    switch (flag) {
-        case Tins::Constants::Ethernet::IP:
-            return new IP(buffer, size);
-        case Constants::Ethernet::IPV6:
-            return new IPv6(buffer, size);
-        case Tins::Constants::Ethernet::ARP:
-            return new ARP(buffer, size);
-        case Tins::Constants::Ethernet::PPPOED:
-        case Tins::Constants::Ethernet::PPPOES:
-            return new PPPoE(buffer, size);
-        case Tins::Constants::Ethernet::EAPOL:
-            return EAPOL::from_bytes(buffer, size);
-        case Tins::Constants::Ethernet::VLAN:
-        case Tins::Constants::Ethernet::QINQ:
-        case Tins::Constants::Ethernet::OLD_QINQ:
-            return new Dot1Q(buffer, size);
-        case Tins::Constants::Ethernet::MPLS:
-            return new MPLS(buffer, size);
-        default:
-            {
-                PDU* pdu = Internals::allocate<EthernetII>(
-                    static_cast<uint16_t>(flag),
-                    buffer,
-                    size
-                );
-                if (pdu) {
-                    return pdu;
-                }
-            }
-            return rawpdu_on_no_match ? new RawPDU(buffer, size) : 0;
-    };
-}
-
-Tins::PDU* pdu_from_flag(Constants::IP::e flag,
-                         const uint8_t* buffer,
-                         uint32_t size,
-                         bool rawpdu_on_no_match) {
-    switch (flag) {
-        case Constants::IP::PROTO_IPIP:
-            return new Tins::IP(buffer, size);
-        case Constants::IP::PROTO_TCP:
-            return new Tins::TCP(buffer, size);
-        case Constants::IP::PROTO_UDP:
-            return new Tins::UDP(buffer, size);
-        case Constants::IP::PROTO_ICMP:
-            return new Tins::ICMP(buffer, size);
-        case Constants::IP::PROTO_ICMPV6:
-            return new Tins::ICMPv6(buffer, size);
-        case Constants::IP::PROTO_IPV6:
-            return new Tins::IPv6(buffer, size);
-        case Constants::IP::PROTO_AH:
-            return new Tins::IPSecAH(buffer, size);
-        case Constants::IP::PROTO_ESP:
-            return new Tins::IPSecESP(buffer, size);
-        default:
-            break;
-    }
-    if (rawpdu_on_no_match) {
-        return new Tins::RawPDU(buffer, size);
-    }
-    return 0;
-}
-
-#ifdef TINS_HAVE_PCAP
-PDU* pdu_from_dlt_flag(int flag,
-                       const uint8_t* buffer,
-                       uint32_t size,
-                       bool rawpdu_on_no_match) {
-    switch (flag) {
-        case DLT_EN10MB:
-            return new EthernetII(buffer, size);
-
-        #ifdef TINS_HAVE_DOT11
-        case DLT_IEEE802_11_RADIO:
-            return new RadioTap(buffer, size);
-        case DLT_IEEE802_11:
-            return Dot11::from_bytes(buffer, size);
-        #else // TINS_HAVE_DOT11
-        case DLT_IEEE802_11_RADIO:
-        case DLT_IEEE802_11:
-            throw protocol_disabled();
-        #endif // TINS_HAVE_DOT11
-
-        case DLT_NULL:
-            return new Loopback(buffer, size);
-        case DLT_LINUX_SLL:
-            return new SLL(buffer, size);
-        case DLT_PPI:
-            return new PPI(buffer, size);
-        default:
-            return rawpdu_on_no_match ? new RawPDU(buffer, size) : 0;
-    };
-}
-#endif // TINS_HAVE_PCAP
-
-Tins::PDU* pdu_from_flag(PDU::PDUType type, const uint8_t* buffer, uint32_t size) {
-    switch(type) {
-        case Tins::PDU::ETHERNET_II:
-            return new Tins::EthernetII(buffer, size);
-        case Tins::PDU::IP:
-            return new Tins::IP(buffer, size);
-        case Tins::PDU::IPv6:
-            return new Tins::IPv6(buffer, size);
-        case Tins::PDU::ARP:
-            return new Tins::ARP(buffer, size);
-        case Tins::PDU::IEEE802_3:
-            return new Tins::IEEE802_3(buffer, size);
-        case Tins::PDU::PPPOE:
-            return new Tins::PPPoE(buffer, size);
-        #ifdef TINS_HAVE_DOT11
-            case Tins::PDU::RADIOTAP:
-                return new Tins::RadioTap(buffer, size);
-            case Tins::PDU::DOT11:
-            case Tins::PDU::DOT11_ACK:
-            case Tins::PDU::DOT11_ASSOC_REQ:
-            case Tins::PDU::DOT11_ASSOC_RESP:
-            case Tins::PDU::DOT11_AUTH:
-            case Tins::PDU::DOT11_BEACON:
-            case Tins::PDU::DOT11_BLOCK_ACK:
-            case Tins::PDU::DOT11_BLOCK_ACK_REQ:
-            case Tins::PDU::DOT11_CF_END:
-            case Tins::PDU::DOT11_DATA:
-            case Tins::PDU::DOT11_CONTROL:
-            case Tins::PDU::DOT11_DEAUTH:
-            case Tins::PDU::DOT11_DIASSOC:
-            case Tins::PDU::DOT11_END_CF_ACK:
-            case Tins::PDU::DOT11_MANAGEMENT:
-            case Tins::PDU::DOT11_PROBE_REQ:
-            case Tins::PDU::DOT11_PROBE_RESP:
-            case Tins::PDU::DOT11_PS_POLL:
-            case Tins::PDU::DOT11_REASSOC_REQ:
-            case Tins::PDU::DOT11_REASSOC_RESP:
-            case Tins::PDU::DOT11_RTS:
-            case Tins::PDU::DOT11_QOS_DATA:
-                return Tins::Dot11::from_bytes(buffer, size);
-        #endif // TINS_HAVE_DOT11
-        default:
-            return 0;
-    };
-}
-
-Constants::Ethernet::e pdu_flag_to_ether_type(PDU::PDUType flag) {
-    switch (flag) {
-        case PDU::IP:
-            return Constants::Ethernet::IP;
-        case PDU::IPv6:
-            return Constants::Ethernet::IPV6;
-        case PDU::ARP:
-            return Constants::Ethernet::ARP;
-        case PDU::DOT1Q:
-            return Constants::Ethernet::VLAN;
-        case PDU::PPPOE:
-            return Constants::Ethernet::PPPOED;
-        case PDU::MPLS:
-            return Constants::Ethernet::MPLS;
-        case PDU::RSNEAPOL:
-        case PDU::RC4EAPOL:
-            return Constants::Ethernet::EAPOL;
-        default:
-            if (Internals::pdu_type_registered<EthernetII>(flag)) {
-                return static_cast<Constants::Ethernet::e>(
-                    Internals::pdu_type_to_id<EthernetII>(flag)
-                );
-            }
-            return Constants::Ethernet::UNKNOWN;
-    }
-}
-
-PDU::PDUType ether_type_to_pdu_flag(Constants::Ethernet::e flag) {
-    switch (flag) {
-        case Constants::Ethernet::IP:
-            return PDU::IP;
-        case Constants::Ethernet::IPV6:
-            return PDU::IPv6;
-        case Constants::Ethernet::ARP:
-            return PDU::ARP;
-        case Constants::Ethernet::VLAN:
-            return PDU::DOT1Q;
-        case Constants::Ethernet::PPPOED:
-            return PDU::PPPOE;
-        //case PDU::RSNEAPOL
-        //case PDU::RC4EAPOL:
-        //    return Constants::Ethernet::EAPOL;
-        default:
-            return PDU::UNKNOWN;
-    }
-}
-
-Constants::IP::e pdu_flag_to_ip_type(PDU::PDUType flag) {
-    switch(flag) {
-        case PDU::IP:
-            return Constants::IP::PROTO_IPIP;
-        case PDU::IPv6:
-            return Constants::IP::PROTO_IPV6;
-        case PDU::TCP:
-            return Constants::IP::PROTO_TCP;
-        case PDU::UDP:
-            return Constants::IP::PROTO_UDP;
-        case PDU::ICMP:
-            return Constants::IP::PROTO_ICMP;
-        case PDU::ICMPv6:
-            return Constants::IP::PROTO_ICMPV6;
-        case PDU::IPSEC_AH:
-            return Constants::IP::PROTO_AH;
-        case PDU::IPSEC_ESP:
-            return Constants::IP::PROTO_ESP;
-        default:
-            return static_cast<Constants::IP::e>(0xff);
-    };
-}
-
-PDU::PDUType ip_type_to_pdu_flag(Constants::IP::e flag) {
-    switch(flag) {
-        case Constants::IP::PROTO_IPIP:
-            return PDU::IP;
-        case Constants::IP::PROTO_IPV6:
-            return PDU::IPv6;
-        case Constants::IP::PROTO_TCP:
-            return PDU::TCP;
-        case Constants::IP::PROTO_UDP:
-            return PDU::UDP;
-        case Constants::IP::PROTO_ICMP:
-            return PDU::ICMP;
-        case Constants::IP::PROTO_ICMPV6:
-            return PDU::ICMPv6;
-        case Constants::IP::PROTO_AH:
-            return PDU::IPSEC_AH;
-        case Constants::IP::PROTO_ESP:
-            return PDU::IPSEC_ESP;
-        default:
-            return PDU::UNKNOWN;
-    };
-}
-
 int seq_compare(uint32_t seq1, uint32_t seq2) {
     // As defined by RFC 1982 - 2 ^ (SERIAL_BITS - 1)
     static const uint32_t seq_number_diff = 2147483648U;
diff --git a/src/ip.cpp b/src/ip.cpp
index 6eb0c7a..cd892fd 100644
--- a/src/ip.cpp
+++ b/src/ip.cpp
@@ -45,8 +45,9 @@
 #include "exceptions.h"
 #include "pdu_allocator.h"
 #include "memory_helpers.h"
-#include "internals.h"
 #include "utils/checksum_utils.h"
+#include "detail/pdu_helpers.h"
+#include "pdu_allocator.h"
 
 using std::list;
 using std::min;
diff --git a/src/ip_reassembler.cpp b/src/ip_reassembler.cpp
index 61c9578..12b4aeb 100644
--- a/src/ip_reassembler.cpp
+++ b/src/ip_reassembler.cpp
@@ -30,8 +30,8 @@
 #include "ip.h"
 #include "rawpdu.h"
 #include "constants.h"
-#include "internals.h"
 #include "ip_reassembler.h"
+#include "detail/pdu_helpers.h"
 
 using std::make_pair;
 
diff --git a/src/ipsec.cpp b/src/ipsec.cpp
index 688053b..e925c2e 100644
--- a/src/ipsec.cpp
+++ b/src/ipsec.cpp
@@ -29,9 +29,9 @@
 
 #include <cstring>
 #include "ipsec.h"
-#include "internals.h"
 #include "rawpdu.h"
 #include "memory_helpers.h"
+#include "detail/pdu_helpers.h"
 
 using std::memcpy;
 using std::copy;
diff --git a/src/ipv6.cpp b/src/ipv6.cpp
index ba766a0..00e3f57 100644
--- a/src/ipv6.cpp
+++ b/src/ipv6.cpp
@@ -41,8 +41,9 @@
 #include "rawpdu.h"
 #include "exceptions.h"
 #include "pdu_allocator.h"
-#include "internals.h"
 #include "memory_helpers.h"
+#include "detail/pdu_helpers.h"
+#include "pdu_allocator.h"
 
 using std::copy;
 
diff --git a/src/pktap.cpp b/src/pktap.cpp
index 60df8a6..7bb6f24 100644
--- a/src/pktap.cpp
+++ b/src/pktap.cpp
@@ -31,9 +31,9 @@
 #include <cstring>
 #include "exceptions.h"
 #include "pktap.h"
-#include "internals.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
+#include "detail/pdu_helpers.h"
 
 using Tins::Memory::InputMemoryStream;
 
diff --git a/src/sll.cpp b/src/sll.cpp
index 289b6fd..c21d062 100644
--- a/src/sll.cpp
+++ b/src/sll.cpp
@@ -30,9 +30,9 @@
 #include <stdexcept>
 #include <cstring>
 #include "sll.h"
-#include "internals.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
+#include "detail/pdu_helpers.h"
 
 using Tins::Memory::InputMemoryStream;
 using Tins::Memory::OutputMemoryStream;
diff --git a/src/snap.cpp b/src/snap.cpp
index 33010f1..f27545d 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -38,9 +38,9 @@
 #include "arp.h"
 #include "ip.h"
 #include "eapol.h"
-#include "internals.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
+#include "detail/pdu_helpers.h"
 
 using Tins::Memory::InputMemoryStream;
 using Tins::Memory::OutputMemoryStream;
diff --git a/src/tcp.cpp b/src/tcp.cpp
index fec72fa..37a0572 100644
--- a/src/tcp.cpp
+++ b/src/tcp.cpp
@@ -35,7 +35,6 @@
 #include "constants.h"
 #include "rawpdu.h"
 #include "exceptions.h"
-#include "internals.h"
 #include "memory_helpers.h"
 #include "utils/checksum_utils.h"
 

From be48947ead73f97fbe4de3478deafe7b0ca991a4 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 16:46:28 -0700
Subject: [PATCH 29/73] Move is_dot3 into details/pdu_helpers.h

---
 include/tins/detail/pdu_helpers.h | 4 ++++
 include/tins/internals.h          | 4 ----
 src/ethernetII.cpp                | 1 -
 src/packet_sender.cpp             | 2 +-
 src/ppi.cpp                       | 2 +-
 src/sniffer.cpp                   | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/include/tins/detail/pdu_helpers.h b/include/tins/detail/pdu_helpers.h
index 77cc767..83d9b67 100644
--- a/include/tins/detail/pdu_helpers.h
+++ b/include/tins/detail/pdu_helpers.h
@@ -56,6 +56,10 @@ PDU::PDUType ether_type_to_pdu_flag(Constants::Ethernet::e flag);
 Constants::IP::e pdu_flag_to_ip_type(PDU::PDUType flag);
 PDU::PDUType ip_type_to_pdu_flag(Constants::IP::e flag);
 
+inline bool is_dot3(const uint8_t* ptr, size_t sz) {
+    return (sz >= 13 && ptr[12] < 8);
+}
+
 } // Internals
 } // Tins
 
diff --git a/include/tins/internals.h b/include/tins/internals.h
index d6697af..9de7866 100644
--- a/include/tins/internals.h
+++ b/include/tins/internals.h
@@ -46,10 +46,6 @@ namespace Internals {
 // Compares sequence numbers as defined by RFC 1982.
 int seq_compare(uint32_t seq1, uint32_t seq2);
 
-inline bool is_dot3(const uint8_t* ptr, size_t sz) {
-    return (sz >= 13 && ptr[12] < 8);
-}
-
 } // namespace Internals
 } // namespace Tins
 /**
diff --git a/src/ethernetII.cpp b/src/ethernetII.cpp
index 8dcdbaa..c0704c4 100644
--- a/src/ethernetII.cpp
+++ b/src/ethernetII.cpp
@@ -48,7 +48,6 @@
 #include "ipv6.h"
 #include "arp.h"
 #include "constants.h"
-#include "internals.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
 #include "detail/pdu_helpers.h"
diff --git a/src/packet_sender.cpp b/src/packet_sender.cpp
index e95bdd2..b9a57f8 100644
--- a/src/packet_sender.cpp
+++ b/src/packet_sender.cpp
@@ -64,8 +64,8 @@
 #include "dot11/dot11_base.h"
 #include "radiotap.h"
 #include "ieee802_3.h"
-#include "internals.h"
 #include "cxxstd.h"
+#include "detail/pdu_helpers.h"
 #if TINS_IS_CXX11
     #include <chrono>
 #endif // TINS_IS_CXX11
diff --git a/src/ppi.cpp b/src/ppi.cpp
index 51bd00f..effc049 100644
--- a/src/ppi.cpp
+++ b/src/ppi.cpp
@@ -37,9 +37,9 @@
 #include "loopback.h"
 #include "sll.h"
 #include "ppi.h"
-#include "internals.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
+#include "detail/pdu_helpers.h"
 
 using Tins::Memory::InputMemoryStream;
 
diff --git a/src/sniffer.cpp b/src/sniffer.cpp
index 2b95872..c2b3c71 100644
--- a/src/sniffer.cpp
+++ b/src/sniffer.cpp
@@ -45,7 +45,7 @@
 #include "pktap.h"
 #include "sll.h"
 #include "ppi.h"
-#include "internals.h"
+#include "detail/pdu_helpers.h"
 
 using std::string;
 using std::runtime_error;

From 815889bd22c76affc331920cf70a1fc3d5e52e99 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 16:52:59 -0700
Subject: [PATCH 30/73] Move seq_compare into its own header file

---
 include/tins/detail/sequence_number_helpers.h | 49 +++++++++++++++++++
 include/tins/internals.h                      | 17 +------
 src/CMakeLists.txt                            |  2 +-
 .../sequence_number_helpers.cpp}              |  6 +--
 src/tcp_ip/ack_tracker.cpp                    |  2 +-
 src/tcp_ip/data_tracker.cpp                   |  2 +-
 src/tcp_ip/flow.cpp                           |  2 +-
 7 files changed, 57 insertions(+), 23 deletions(-)
 create mode 100644 include/tins/detail/sequence_number_helpers.h
 rename src/{internals.cpp => detail/sequence_number_helpers.cpp} (96%)

diff --git a/include/tins/detail/sequence_number_helpers.h b/include/tins/detail/sequence_number_helpers.h
new file mode 100644
index 0000000..04af18d
--- /dev/null
+++ b/include/tins/detail/sequence_number_helpers.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef TINS_SEQUENCE_NUMBER_HELPERS_H
+#define TINS_SEQUENCE_NUMBER_HELPERS_H
+
+#include <stdint.h>
+/**
+ * \cond
+ */
+namespace Tins {
+namespace Internals {
+
+// Compares sequence numbers as defined by RFC 1982.
+int seq_compare(uint32_t seq1, uint32_t seq2);
+
+} // namespace Internals
+} // namespace Tins
+/**
+ * \endcond
+ */
+
+#endif // TINS_SEQUENCE_NUMBER_HELPERS_H
diff --git a/include/tins/internals.h b/include/tins/internals.h
index 9de7866..e44d30c 100644
--- a/include/tins/internals.h
+++ b/include/tins/internals.h
@@ -30,26 +30,11 @@
 #ifndef TINS_INTERNALS_H
 #define TINS_INTERNALS_H
 
-#include <stdint.h>
 #include "detail/type_traits.h"
 #include "detail/address_helpers.h"
 #include "detail/icmp_extension_helpers.h"
 #include "detail/smart_ptr.h"
 #include "detail/pdu_helpers.h"
-
-/**
- * \cond
- */
-namespace Tins {
-namespace Internals {
-
-// Compares sequence numbers as defined by RFC 1982.
-int seq_compare(uint32_t seq1, uint32_t seq2);
-
-} // namespace Internals
-} // namespace Tins
-/**
- * \endcond
- */
+#include "detail/sequence_number_helpers.h"
 
 #endif
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 58e4920..9fff026 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,6 +24,7 @@ set(SOURCES
     detail/address_helpers.cpp
     detail/icmp_extension_helpers.cpp
     detail/pdu_helpers.cpp
+    detail/sequence_number_helpers.cpp
     dhcp.cpp
     dhcpv6.cpp
     dns.cpp
@@ -35,7 +36,6 @@ set(SOURCES
     icmp_extension.cpp
     icmp.cpp
     icmpv6.cpp
-    internals.cpp
     ip_reassembler.cpp
     ip.cpp
     ip_address.cpp
diff --git a/src/internals.cpp b/src/detail/sequence_number_helpers.cpp
similarity index 96%
rename from src/internals.cpp
rename to src/detail/sequence_number_helpers.cpp
index 78c63fb..7c8acec 100644
--- a/src/internals.cpp
+++ b/src/detail/sequence_number_helpers.cpp
@@ -27,7 +27,7 @@
  *
  */
 
-#include "internals.h"
+#include "detail/sequence_number_helpers.h"
 
 namespace Tins {
 namespace Internals {
@@ -46,5 +46,5 @@ int seq_compare(uint32_t seq1, uint32_t seq2) {
     }
 }
 
-} // namespace Internals
-} // namespace Tins
+} // Internals
+} // Tins
diff --git a/src/tcp_ip/ack_tracker.cpp b/src/tcp_ip/ack_tracker.cpp
index 101a28e..a4129d2 100644
--- a/src/tcp_ip/ack_tracker.cpp
+++ b/src/tcp_ip/ack_tracker.cpp
@@ -33,7 +33,7 @@
 
 #include <limits>
 #include "tcp.h"
-#include "internals.h"
+#include "detail/sequence_number_helpers.h"
 
 using std::vector;
 using std::numeric_limits;
diff --git a/src/tcp_ip/data_tracker.cpp b/src/tcp_ip/data_tracker.cpp
index 9256de2..0987513 100644
--- a/src/tcp_ip/data_tracker.cpp
+++ b/src/tcp_ip/data_tracker.cpp
@@ -31,7 +31,7 @@
 
 #ifdef TINS_HAVE_TCPIP
 
-#include "internals.h"
+#include "detail/sequence_number_helpers.h"
 
 using std::move;
 
diff --git a/src/tcp_ip/flow.cpp b/src/tcp_ip/flow.cpp
index 0742d56..64e09db 100644
--- a/src/tcp_ip/flow.cpp
+++ b/src/tcp_ip/flow.cpp
@@ -40,7 +40,7 @@
 #include "ip.h"
 #include "ipv6.h"
 #include "rawpdu.h"
-#include "internals.h"
+#include "detail/sequence_number_helpers.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
 

From 86da3818ffa8c6830e69613c5b0c0ab53f14f49c Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 17:34:02 -0700
Subject: [PATCH 31/73] Remove useless includes

---
 include/tins/packet.h            |  5 +++--
 include/tins/tcp_ip/flow.h       |  3 ---
 include/tins/tcp_stream.h        |  1 -
 src/arp.cpp                      |  4 +---
 src/dhcp.cpp                     |  5 ++---
 src/dns.cpp                      |  1 -
 src/dot11/dot11_base.cpp         |  9 +++------
 src/eapol.cpp                    |  1 -
 src/ethernetII.cpp               |  4 ----
 src/hw_address.cpp               | 29 +++++++++++++++++++++++++++++
 src/ip_reassembler.cpp           |  1 -
 src/ipv6.cpp                     |  1 -
 src/packet_sender.cpp            |  1 -
 src/pdu.cpp                      |  1 -
 src/snap.cpp                     |  3 ---
 src/sniffer.cpp                  |  2 --
 src/stp.cpp                      |  5 +----
 src/tcp_ip/flow.cpp              |  4 ----
 src/tcp_ip/stream.cpp            |  6 ------
 src/tcp_ip/stream_follower.cpp   |  7 -------
 src/tcp_ip/stream_identifier.cpp |  8 ++++----
 21 files changed, 43 insertions(+), 58 deletions(-)

diff --git a/include/tins/packet.h b/include/tins/packet.h
index b96a2f1..01fc862 100644
--- a/include/tins/packet.h
+++ b/include/tins/packet.h
@@ -30,7 +30,6 @@
 #ifndef TINS_PACKET_H
 #define TINS_PACKET_H
 
-#include <algorithm>
 #include "cxxstd.h"
 #include "pdu.h"
 #include "timestamp.h"
@@ -234,7 +233,9 @@ public:
      */
     Packet& operator=(Packet &&rhs) TINS_NOEXCEPT { 
         if (this != &rhs) {
-            std::swap(pdu_, rhs.pdu_);
+            PDU* tmp = std::move(pdu_);
+            pdu_ = std::move(rhs.pdu_);
+            rhs.pdu_ = std::move(tmp);
             ts_ = rhs.timestamp();
         }
         return* this;
diff --git a/include/tins/tcp_ip/flow.h b/include/tins/tcp_ip/flow.h
index d157e13..9d250c3 100644
--- a/include/tins/tcp_ip/flow.h
+++ b/include/tins/tcp_ip/flow.h
@@ -34,12 +34,9 @@
 
 #ifdef TINS_HAVE_TCPIP
 
-#include <vector>
 #include <array>
-#include <map>
 #include <functional>
 #include <stdint.h>
-#include "../hw_address.h"
 #include "../macros.h"
 #include "ack_tracker.h"
 #include "data_tracker.h"
diff --git a/include/tins/tcp_stream.h b/include/tins/tcp_stream.h
index eb0a838..eff9fcc 100644
--- a/include/tins/tcp_stream.h
+++ b/include/tins/tcp_stream.h
@@ -32,7 +32,6 @@
 
 #include <map>
 #include <utility>
-#include <iterator>
 #include <vector>
 #include <algorithm>
 #include <stdint.h>
diff --git a/src/arp.cpp b/src/arp.cpp
index 80d11d8..f415d47 100644
--- a/src/arp.cpp
+++ b/src/arp.cpp
@@ -30,11 +30,9 @@
 #include <cstring>
 #include <algorithm>
 #include "arp.h"
-#include "ip.h"
 #include "ethernetII.h"
 #include "rawpdu.h"
 #include "constants.h"
-#include "network_interface.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
 
@@ -58,7 +56,7 @@ ARP::ARP(ipaddress_type target_ip,
     hw_addr_format((uint16_t)Constants::ARP::ETHER);
     prot_addr_format((uint16_t)Constants::Ethernet::IP);
     hw_addr_length(Tins::EthernetII::address_type::address_size);
-    prot_addr_length(Tins::IP::address_type::address_size);
+    prot_addr_length(4 /* IP address size */);
     sender_ip_addr(sender_ip);
     target_ip_addr(target_ip);
     sender_hw_addr(sender_hw);
diff --git a/src/dhcp.cpp b/src/dhcp.cpp
index 051e303..0ab03ef 100644
--- a/src/dhcp.cpp
+++ b/src/dhcp.cpp
@@ -32,7 +32,6 @@
 #include <algorithm>
 #include "endianness.h"
 #include "dhcp.h"
-#include "ethernetII.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
 
@@ -58,8 +57,8 @@ PDU::metadata DHCP::extract_metadata(const uint8_t* /*buffer*/, uint32_t total_s
 DHCP::DHCP() 
 : size_(sizeof(uint32_t)) {
     opcode(BOOTREQUEST);
-    htype(1); //ethernet
-    hlen(EthernetII::address_type::address_size);
+    htype(1); // ethernet
+    hlen(6); // MAC address length
 }
 
 DHCP::DHCP(const uint8_t* buffer, uint32_t total_sz) 
diff --git a/src/dns.cpp b/src/dns.cpp
index 1ccea4c..2ddc72c 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -36,7 +36,6 @@
 #include "ip_address.h"
 #include "ipv6_address.h"
 #include "exceptions.h"
-#include "rawpdu.h"
 #include "endianness.h"
 #include "memory_helpers.h"
 
diff --git a/src/dot11/dot11_base.cpp b/src/dot11/dot11_base.cpp
index 0417064..af359de 100644
--- a/src/dot11/dot11_base.cpp
+++ b/src/dot11/dot11_base.cpp
@@ -32,9 +32,7 @@
 #ifdef TINS_HAVE_DOT11
 
 #include <cstring>
-#include <stdexcept>
 #include <algorithm>
-#include <utility>
 #include "macros.h"
 #include "exceptions.h"
 
@@ -49,12 +47,11 @@
     #include <netinet/in.h>
 #endif
 #include "dot11.h"
-#include "rawpdu.h"
-#include "rsn_information.h"
 #include "packet_sender.h"
-#include "snap.h"
 #include "memory_helpers.h"
 
+using std::list;
+
 using Tins::Memory::InputMemoryStream;
 using Tins::Memory::OutputMemoryStream;
 
@@ -218,7 +215,7 @@ void Dot11::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     stream.write(header_);
     write_ext_header(stream);
     write_fixed_parameters(stream);
-    for (std::list<option>::const_iterator it = options_.begin(); it != options_.end(); ++it) {
+    for (list<option>::const_iterator it = options_.begin(); it != options_.end(); ++it) {
         stream.write<uint8_t>(it->option());
         stream.write<uint8_t>(it->length_field());
         stream.write(it->data_ptr(), it->data_size());
diff --git a/src/eapol.cpp b/src/eapol.cpp
index 1cb74e6..1a1c149 100644
--- a/src/eapol.cpp
+++ b/src/eapol.cpp
@@ -31,7 +31,6 @@
 #include <stdexcept>
 #include <algorithm>
 #include "eapol.h"
-#include "rsn_information.h"
 #include "exceptions.h"
 #include "rawpdu.h"
 #include "memory_helpers.h"
diff --git a/src/ethernetII.cpp b/src/ethernetII.cpp
index c0704c4..b44ce54 100644
--- a/src/ethernetII.cpp
+++ b/src/ethernetII.cpp
@@ -42,11 +42,7 @@
 #include "ethernetII.h"
 #include "config.h"
 #include "packet_sender.h"
-#include "rawpdu.h"
 #include "pppoe.h"
-#include "ip.h"
-#include "ipv6.h"
-#include "arp.h"
 #include "constants.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
diff --git a/src/hw_address.cpp b/src/hw_address.cpp
index 93780c8..397a394 100644
--- a/src/hw_address.cpp
+++ b/src/hw_address.cpp
@@ -1,3 +1,32 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
 #include <sstream>
 #include <iomanip>
 #include <stdexcept>
diff --git a/src/ip_reassembler.cpp b/src/ip_reassembler.cpp
index 12b4aeb..577389f 100644
--- a/src/ip_reassembler.cpp
+++ b/src/ip_reassembler.cpp
@@ -28,7 +28,6 @@
  */
 
 #include "ip.h"
-#include "rawpdu.h"
 #include "constants.h"
 #include "ip_reassembler.h"
 #include "detail/pdu_helpers.h"
diff --git a/src/ipv6.cpp b/src/ipv6.cpp
index 00e3f57..c6dfe2d 100644
--- a/src/ipv6.cpp
+++ b/src/ipv6.cpp
@@ -43,7 +43,6 @@
 #include "pdu_allocator.h"
 #include "memory_helpers.h"
 #include "detail/pdu_helpers.h"
-#include "pdu_allocator.h"
 
 using std::copy;
 
diff --git a/src/packet_sender.cpp b/src/packet_sender.cpp
index b9a57f8..de4eb11 100644
--- a/src/packet_sender.cpp
+++ b/src/packet_sender.cpp
@@ -57,7 +57,6 @@
 #include <algorithm>
 #include "pdu.h"
 #include "macros.h"
-#include "network_interface.h"
 // PDUs required by PacketSender::send(PDU&, NetworkInterface)
 #include "ethernetII.h"
 #include "radiotap.h"
diff --git a/src/pdu.cpp b/src/pdu.cpp
index 203b070..5884b64 100644
--- a/src/pdu.cpp
+++ b/src/pdu.cpp
@@ -28,7 +28,6 @@
  */
  
 #include "pdu.h"
-#include "rawpdu.h"
 #include "packet_sender.h"
 
 using std::swap;
diff --git a/src/snap.cpp b/src/snap.cpp
index f27545d..ebb5c4d 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -35,9 +35,6 @@
 #endif
 #include "snap.h"
 #include "constants.h"
-#include "arp.h"
-#include "ip.h"
-#include "eapol.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
 #include "detail/pdu_helpers.h"
diff --git a/src/sniffer.cpp b/src/sniffer.cpp
index c2b3c71..3d385e8 100644
--- a/src/sniffer.cpp
+++ b/src/sniffer.cpp
@@ -33,8 +33,6 @@
     #define TINS_PREFIX_INTERFACE(x) (x)
 #endif // _WIN32
 
-#include <algorithm>
-#include <sstream>
 #include "sniffer.h"
 #include "dot11/dot11_base.h"
 #include "ethernetII.h"
diff --git a/src/stp.cpp b/src/stp.cpp
index 4592cec..3956368 100644
--- a/src/stp.cpp
+++ b/src/stp.cpp
@@ -28,13 +28,10 @@
  */
 
 #include <cstring>
-#include <algorithm>
 #include "stp.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
 
-using std::copy;
-
 using Tins::Memory::InputMemoryStream;
 using Tins::Memory::OutputMemoryStream;
 
@@ -128,7 +125,7 @@ STP::bpdu_id_type STP::convert(const pvt_bpdu_id& id) {
 STP::pvt_bpdu_id STP::convert(const bpdu_id_type& id) {
     pvt_bpdu_id result;
     result.priority = id.priority;
-    copy(id.id.begin(), id.id.end(), result.id);
+    id.id.copy(result.id);
     #if TINS_IS_LITTLE_ENDIAN
     result.ext_id = (id.ext_id >> 8) & 0xf;
     result.ext_idL = id.ext_id & 0xff;
diff --git a/src/tcp_ip/flow.cpp b/src/tcp_ip/flow.cpp
index 64e09db..e6d96b8 100644
--- a/src/tcp_ip/flow.cpp
+++ b/src/tcp_ip/flow.cpp
@@ -32,8 +32,6 @@
 #ifdef TINS_HAVE_TCPIP
 
 #include <limits>
-#include <algorithm>
-#include "memory.h"
 #include "ip_address.h"
 #include "ipv6_address.h"
 #include "tcp.h"
@@ -49,8 +47,6 @@ using std::bind;
 using std::pair;
 using std::runtime_error;
 using std::numeric_limits;
-using std::max;
-using std::swap;
 
 using Tins::Memory::OutputMemoryStream;
 using Tins::Memory::InputMemoryStream;
diff --git a/src/tcp_ip/stream.cpp b/src/tcp_ip/stream.cpp
index 90561cd..7bb4bbd 100644
--- a/src/tcp_ip/stream.cpp
+++ b/src/tcp_ip/stream.cpp
@@ -32,7 +32,6 @@
 #ifdef TINS_HAVE_TCPIP
 
 #include <limits>
-#include <algorithm>
 #include "memory.h"
 #include "ip_address.h"
 #include "ipv6_address.h"
@@ -42,18 +41,13 @@
 #include "ethernetII.h"
 #include "rawpdu.h"
 #include "exceptions.h"
-#include "memory_helpers.h"
 
 using std::make_pair;
 using std::bind;
 using std::pair;
 using std::runtime_error;
 using std::numeric_limits;
-using std::max;
-using std::swap;
 
-using Tins::Memory::OutputMemoryStream;
-using Tins::Memory::InputMemoryStream;
 
 namespace Tins {
 namespace TCPIP {
diff --git a/src/tcp_ip/stream_follower.cpp b/src/tcp_ip/stream_follower.cpp
index c471f32..d0c3528 100644
--- a/src/tcp_ip/stream_follower.cpp
+++ b/src/tcp_ip/stream_follower.cpp
@@ -32,7 +32,6 @@
 #ifdef TINS_HAVE_TCPIP
 
 #include <limits>
-#include <algorithm>
 #include "memory.h"
 #include "ip_address.h"
 #include "ipv6_address.h"
@@ -42,22 +41,16 @@
 #include "rawpdu.h"
 #include "packet.h"
 #include "exceptions.h"
-#include "memory_helpers.h"
 
 using std::make_pair;
 using std::bind;
 using std::pair;
 using std::runtime_error;
 using std::numeric_limits;
-using std::max;
-using std::swap;
 using std::chrono::system_clock;
 using std::chrono::minutes;
 using std::chrono::duration_cast;
 
-using Tins::Memory::OutputMemoryStream;
-using Tins::Memory::InputMemoryStream;
-
 namespace Tins {
 namespace TCPIP {
 
diff --git a/src/tcp_ip/stream_identifier.cpp b/src/tcp_ip/stream_identifier.cpp
index 1ddf80c..baeba6d 100644
--- a/src/tcp_ip/stream_identifier.cpp
+++ b/src/tcp_ip/stream_identifier.cpp
@@ -112,11 +112,11 @@ StreamIdentifier StreamIdentifier::make_identifier(const PDU& packet) {
 
 StreamIdentifier StreamIdentifier::make_identifier(const Stream& stream) {
     if (stream.is_v6()) {
-      return StreamIdentifier(serialize(stream.client_addr_v6()), stream.client_port(),
-                              serialize(stream.server_addr_v6()), stream.server_port());
+        return StreamIdentifier(serialize(stream.client_addr_v6()), stream.client_port(),
+                                serialize(stream.server_addr_v6()), stream.server_port());
     } else {
-      return StreamIdentifier(serialize(stream.client_addr_v4()), stream.client_port(),
-                              serialize(stream.server_addr_v4()), stream.server_port());
+        return StreamIdentifier(serialize(stream.client_addr_v4()), stream.client_port(),
+                                serialize(stream.server_addr_v4()), stream.server_port());
     }
 }
 

From 58a4d336b9bc0e5498c35037e2884e1850026115 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 18:15:50 -0700
Subject: [PATCH 32/73] Move memory helpers implementation into a source file

---
 include/tins/memory_helpers.h | 149 ++++++------------------------
 src/CMakeLists.txt            |   1 +
 src/memory_helpers.cpp        | 165 ++++++++++++++++++++++++++++++++++
 3 files changed, 194 insertions(+), 121 deletions(-)
 create mode 100644 src/memory_helpers.cpp

diff --git a/include/tins/memory_helpers.h b/include/tins/memory_helpers.h
index 5828365..81c8bc3 100644
--- a/include/tins/memory_helpers.h
+++ b/include/tins/memory_helpers.h
@@ -34,13 +34,15 @@
 #include <cstring>
 #include <vector>
 #include "exceptions.h"
-#include "ip_address.h"
-#include "ipv6_address.h"
-#include "hw_address.h"
 #include "endianness.h"
 
 namespace Tins {
 
+class IPv4Address;
+class IPv6Address;
+template <size_t n>
+class HWAddress;
+
 /** 
  * \cond
  */
@@ -66,25 +68,8 @@ void write_value(uint8_t* buffer, const T& value) {
 
 class InputMemoryStream {
 public:
-    InputMemoryStream(const uint8_t* buffer, size_t total_sz)
-    : buffer_(buffer), size_(total_sz) {
-    }
-
-    InputMemoryStream(const std::vector<uint8_t>& data)
-    : buffer_(&data[0]), size_(data.size()) {
-    }
-
-    void skip(size_t size) {
-        if (TINS_UNLIKELY(size > size_)) {
-            throw malformed_packet();
-        }
-        buffer_ += size;
-        size_ -= size;
-    }
-
-    bool can_read(size_t byte_count) const {
-        return TINS_LIKELY(size_ >= byte_count);
-    }
+    InputMemoryStream(const uint8_t* buffer, size_t total_sz);
+    InputMemoryStream(const std::vector<uint8_t>& data);
  
     template <typename T>
     T read() {
@@ -112,58 +97,17 @@ public:
         skip(sizeof(value));
     }
 
-    void read(std::vector<uint8_t>& value, size_t count) {
-        if (!can_read(count)) {
-            throw malformed_packet();
-        }
-        value.assign(pointer(), pointer() + count);
-        skip(count);
-    }
-
-    void read(IPv4Address& address) {
-        address = IPv4Address(read<uint32_t>());
-    }
-
-    void read(IPv6Address& address) {
-        if (!can_read(IPv6Address::address_size)) {
-            throw malformed_packet();
-        }
-        address = pointer();
-        skip(IPv6Address::address_size);
-    }
-
-    template <size_t n>
-    void read(HWAddress<n>& address) {
-        if (!can_read(HWAddress<n>::address_size)) {
-            throw malformed_packet();
-        }
-        address = pointer();
-        skip(HWAddress<n>::address_size);
-    }
-
-    void read(void* output_buffer, size_t output_buffer_size) {
-        if (!can_read(output_buffer_size)) {
-            throw malformed_packet();
-        }
-        read_data(buffer_, (uint8_t*)output_buffer, output_buffer_size);
-        skip(output_buffer_size);
-    }
-
-    const uint8_t* pointer() const {
-        return buffer_;
-    }
-
-    size_t size() const {
-        return size_;
-    }
-
-    void size(size_t new_size) {
-        size_ = new_size;
-    }
-
-    operator bool() const {
-        return size_ > 0;
-    }
+    void skip(size_t size);
+    bool can_read(size_t byte_count) const;
+    void read(std::vector<uint8_t>& value, size_t count);
+    void read(HWAddress<6>& address);
+    void read(IPv4Address& address);
+    void read(IPv6Address& address);
+    void read(void* output_buffer, size_t output_buffer_size);
+    const uint8_t* pointer() const;
+    size_t size() const;
+    void size(size_t new_size);
+    operator bool() const;
 private:
     const uint8_t* buffer_;
     size_t size_;
@@ -171,21 +115,8 @@ private:
 
 class OutputMemoryStream {
 public:
-    OutputMemoryStream(uint8_t* buffer, size_t total_sz)
-    : buffer_(buffer), size_(total_sz) {
-    }
-
-    OutputMemoryStream(std::vector<uint8_t>& buffer)
-    : buffer_(&buffer[0]), size_(buffer.size()) {
-    }
-
-    void skip(size_t size) {
-        if (TINS_UNLIKELY(size > size_)) {
-            throw malformed_packet();
-        }
-        buffer_ += size;
-        size_ -= size;
-    }
+    OutputMemoryStream(uint8_t* buffer, size_t total_sz);
+    OutputMemoryStream(std::vector<uint8_t>& buffer);
 
     template <typename T>
     void write(const T& value) {
@@ -216,38 +147,14 @@ public:
         skip(length);
     }
 
-    void write(const uint8_t* ptr, size_t length) {
-        write(ptr, ptr + length);
-    }
-
-    void write(const IPv4Address& address) {
-        write(static_cast<uint32_t>(address));
-    }
-
-    void write(const IPv6Address& address) {
-        write(address.begin(), address.end());
-    }
-
-    template <size_t n>
-    void write(const HWAddress<n>& address) {
-        write(address.begin(), address.end());
-    }
-
-    void fill(size_t size, uint8_t value) {
-        if (TINS_UNLIKELY(size_ < size)) {
-            throw serialization_error();
-        }
-        std::memset(buffer_, value, size);
-        skip(size);
-    }
-
-    uint8_t* pointer() {
-        return buffer_;
-    }
-
-    size_t size() const {
-        return size_;
-    }
+    void skip(size_t size);
+    void write(const uint8_t* ptr, size_t length);
+    void write(const HWAddress<6>& address);
+    void write(const IPv4Address& address);
+    void write(const IPv6Address& address);
+    void fill(size_t size, uint8_t value);
+    uint8_t* pointer();
+    size_t size() const;
 private:
     uint8_t* buffer_;
     size_t size_;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9fff026..3302606 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -45,6 +45,7 @@ set(SOURCES
     llc.cpp
     loopback.cpp
     mpls.cpp
+    memory_helpers.cpp
     network_interface.cpp
     packet_sender.cpp
     pdu.cpp
diff --git a/src/memory_helpers.cpp b/src/memory_helpers.cpp
new file mode 100644
index 0000000..9d6d242
--- /dev/null
+++ b/src/memory_helpers.cpp
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "memory_helpers.h"
+#include "ip_address.h"
+#include "ipv6_address.h"
+#include "hw_address.h"
+
+using std::vector;
+
+namespace Tins {
+namespace Memory {
+
+// InputMemoryStream
+
+InputMemoryStream::InputMemoryStream(const uint8_t* buffer, size_t total_sz)
+: buffer_(buffer), size_(total_sz) {
+}
+
+InputMemoryStream::InputMemoryStream(const vector<uint8_t>& data)
+: buffer_(&data[0]), size_(data.size()) {
+}
+
+void InputMemoryStream::skip(size_t size) {
+    if (TINS_UNLIKELY(size > size_)) {
+        throw malformed_packet();
+    }
+    buffer_ += size;
+    size_ -= size;
+}
+
+bool InputMemoryStream::can_read(size_t byte_count) const {
+    return TINS_LIKELY(size_ >= byte_count);
+}
+
+void InputMemoryStream::read(vector<uint8_t>& value, size_t count) {
+    if (!can_read(count)) {
+        throw malformed_packet();
+    }
+    value.assign(pointer(), pointer() + count);
+    skip(count);
+}
+
+void InputMemoryStream::read(HWAddress<6>& address) {
+    if (!can_read(address.size())) {
+        throw malformed_packet();
+    }
+    address = pointer();
+    skip(address.size());
+}
+
+void InputMemoryStream::read(IPv4Address& address) {
+    address = IPv4Address(read<uint32_t>());
+}
+
+void InputMemoryStream::read(IPv6Address& address) {
+    if (!can_read(IPv6Address::address_size)) {
+        throw malformed_packet();
+    }
+    address = pointer();
+    skip(IPv6Address::address_size);
+}
+
+void InputMemoryStream::read(void* output_buffer, size_t output_buffer_size) {
+    if (!can_read(output_buffer_size)) {
+        throw malformed_packet();
+    }
+    read_data(buffer_, (uint8_t*)output_buffer, output_buffer_size);
+    skip(output_buffer_size);
+}
+
+const uint8_t* InputMemoryStream::pointer() const {
+    return buffer_;
+}
+
+size_t InputMemoryStream::size() const {
+    return size_;
+}
+
+void InputMemoryStream::size(size_t new_size) {
+    size_ = new_size;
+}
+
+InputMemoryStream::operator bool() const {
+    return size_ > 0;
+}
+
+// OutputMemoryStream
+
+OutputMemoryStream::OutputMemoryStream(uint8_t* buffer, size_t total_sz)
+: buffer_(buffer), size_(total_sz) {
+}
+
+OutputMemoryStream::OutputMemoryStream(vector<uint8_t>& buffer)
+: buffer_(&buffer[0]), size_(buffer.size()) {
+}
+
+void OutputMemoryStream::skip(size_t size) {
+    if (TINS_UNLIKELY(size > size_)) {
+        throw malformed_packet();
+    }
+    buffer_ += size;
+    size_ -= size;
+}
+
+void OutputMemoryStream::write(const uint8_t* ptr, size_t length) {
+    write(ptr, ptr + length);
+}
+
+void OutputMemoryStream::write(const HWAddress<6>& address) {
+    write(address.begin(), address.end());
+}
+
+void OutputMemoryStream::write(const IPv4Address& address) {
+    write(static_cast<uint32_t>(address));
+}
+
+void OutputMemoryStream::write(const IPv6Address& address) {
+    write(address.begin(), address.end());
+}
+
+void OutputMemoryStream::fill(size_t size, uint8_t value) {
+    if (TINS_UNLIKELY(size_ < size)) {
+        throw serialization_error();
+    }
+    std::memset(buffer_, value, size);
+    skip(size);
+}
+
+uint8_t* OutputMemoryStream::pointer() {
+    return buffer_;
+}
+
+size_t OutputMemoryStream::size() const {
+    return size_;
+}
+
+} // Memory
+} // Tins

From a07b3e8a3a658492be9768de5f40c3be8c4121cc Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 18:51:55 -0700
Subject: [PATCH 33/73] Remove inclusion of algorithm almost everywhere

---
 include/tins/ip.h           | 10 +++++-----
 include/tins/pdu_option.h   | 40 +++++++++++++++++++++++++------------
 src/arp.cpp                 |  1 -
 src/dhcp.cpp                |  8 ++------
 src/dhcpv6.cpp              |  9 ++-------
 src/dot11/dot11_base.cpp    |  7 ++-----
 src/dot11/dot11_control.cpp |  3 +--
 src/dot3.cpp                | 12 +++++------
 src/eapol.cpp               | 24 ++++++++++------------
 src/ethernetII.cpp          |  8 ++------
 src/icmp_extension.cpp      |  1 -
 src/icmpv6.cpp              | 15 +++++++-------
 src/ip.cpp                  | 30 +++++++++++++---------------
 src/ipv6.cpp                |  3 +--
 src/ipv6_address.cpp        |  8 ++++----
 src/packet_sender.cpp       |  4 +---
 src/ppi.cpp                 |  1 -
 src/rawpdu.cpp              |  1 -
 src/tcp.cpp                 | 12 ++++-------
 19 files changed, 87 insertions(+), 110 deletions(-)

diff --git a/include/tins/ip.h b/include/tins/ip.h
index c2c0682..420f974 100644
--- a/include/tins/ip.h
+++ b/include/tins/ip.h
@@ -410,7 +410,7 @@ public:
      * \return The stored options.
      */
     const options_type& options() const {
-        return ip_options_;
+        return options_;
     }
 
     /* Setters */
@@ -525,7 +525,7 @@ public:
          */
         void add_option(option &&opt) {
             internal_add_option(opt);
-            ip_options_.push_back(std::move(opt));
+            options_.push_back(std::move(opt));
         }
 
         /**
@@ -538,8 +538,8 @@ public:
          */
         template<typename... Args>
         void add_option(Args&&... args) {
-            ip_options_.emplace_back(std::forward<Args>(args)...);
-            internal_add_option(ip_options_.back());
+            options_.emplace_back(std::forward<Args>(args)...);
+            internal_add_option(options_.back());
         }
     #endif
 
@@ -770,7 +770,7 @@ private:
 
     ip_header header_;
     uint16_t options_size_, padded_options_size_;
-    options_type ip_options_;
+    options_type options_;
 };
 
 } // Tins
diff --git a/include/tins/pdu_option.h b/include/tins/pdu_option.h
index efb45a6..6e950c9 100644
--- a/include/tins/pdu_option.h
+++ b/include/tins/pdu_option.h
@@ -537,22 +537,36 @@ private:
 };
 
 namespace Internals {
-    /*
-     * \cond
-     */
-    template <typename Option>
-    struct option_type_equality_comparator {
-        option_type_equality_comparator(typename Option::option_type type) : type(type) { }
+/*
+ * \cond
+ */
 
-        bool operator()(const Option& opt) const {
-            return opt.option() == type;
+template <typename Option, typename Container>
+typename Container::iterator find_option(Container& cont, typename Option::option_type type) {
+    typename Container::iterator iter;
+    for (iter = cont.begin(); iter != cont.end(); ++iter) {
+        if (iter->option() == type) {
+            break;
         }
+    }
+    return iter;
+}
 
-        typename Option::option_type type; 
-    };
-    /*
-     * \endcond
-     */
+template <typename Option, typename Container>
+typename Container::const_iterator find_option_const(const Container& cont,
+                                                     typename Option::option_type type) {
+    typename Container::const_iterator iter;
+    for (iter = cont.begin(); iter != cont.end(); ++iter) {
+        if (iter->option() == type) {
+            break;
+        }
+    }
+    return iter;
+}
+
+/*
+ * \endcond
+ */
 } // Internals
 
 } // namespace Tins
diff --git a/src/arp.cpp b/src/arp.cpp
index f415d47..06eb32d 100644
--- a/src/arp.cpp
+++ b/src/arp.cpp
@@ -28,7 +28,6 @@
  */
 
 #include <cstring>
-#include <algorithm>
 #include "arp.h"
 #include "ethernetII.h"
 #include "rawpdu.h"
diff --git a/src/dhcp.cpp b/src/dhcp.cpp
index 0ab03ef..2a86289 100644
--- a/src/dhcp.cpp
+++ b/src/dhcp.cpp
@@ -29,7 +29,6 @@
 
 #include <stdexcept>
 #include <cstring>
-#include <algorithm>
 #include "endianness.h"
 #include "dhcp.h"
 #include "exceptions.h"
@@ -39,7 +38,6 @@ using std::string;
 using std::vector;
 using std::list;
 using std::runtime_error;
-using std::find_if;
 
 using Tins::Memory::InputMemoryStream;
 using Tins::Memory::OutputMemoryStream;
@@ -113,13 +111,11 @@ const DHCP::option* DHCP::search_option(OptionTypes opt) const {
 }
 
 DHCP::options_type::const_iterator DHCP::search_option_iterator(OptionTypes opt) const {
-    Internals::option_type_equality_comparator<option> comparator(opt);
-    return find_if(options_.begin(), options_.end(), comparator);
+    return Internals::find_option_const<option>(options_, opt);
 }
 
 DHCP::options_type::iterator DHCP::search_option_iterator(OptionTypes opt) {
-    Internals::option_type_equality_comparator<option> comparator(opt);
-    return find_if(options_.begin(), options_.end(), comparator);
+    return Internals::find_option<option>(options_, opt);
 }
 
 void DHCP::type(Flags type) {
diff --git a/src/dhcpv6.cpp b/src/dhcpv6.cpp
index 1904bcb..a4271c7 100644
--- a/src/dhcpv6.cpp
+++ b/src/dhcpv6.cpp
@@ -28,13 +28,10 @@
  */
 
 #include <vector>
-#include <algorithm>
 #include "dhcpv6.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
 
-using std::find_if;
-using std::copy;
 using std::vector;
 using std::runtime_error;
 using std::memcpy;
@@ -105,13 +102,11 @@ const DHCPv6::option* DHCPv6::search_option(OptionTypes type) const {
 }
 
 DHCPv6::options_type::const_iterator DHCPv6::search_option_iterator(OptionTypes type) const {
-    Internals::option_type_equality_comparator<option> comparator(type);
-    return find_if(options_.begin(), options_.end(), comparator);
+    return Internals::find_option_const<option>(options_, type);
 }
 
 DHCPv6::options_type::iterator DHCPv6::search_option_iterator(OptionTypes type) {
-    Internals::option_type_equality_comparator<option> comparator(type);
-    return find_if(options_.begin(), options_.end(), comparator);
+    return Internals::find_option<option>(options_, type);
 }
 
 void DHCPv6::write_option(const option& opt, OutputMemoryStream& stream) const {
diff --git a/src/dot11/dot11_base.cpp b/src/dot11/dot11_base.cpp
index af359de..b884bc6 100644
--- a/src/dot11/dot11_base.cpp
+++ b/src/dot11/dot11_base.cpp
@@ -32,7 +32,6 @@
 #ifdef TINS_HAVE_DOT11
 
 #include <cstring>
-#include <algorithm>
 #include "macros.h"
 #include "exceptions.h"
 
@@ -126,13 +125,11 @@ const Dot11::option* Dot11::search_option(OptionTypes type) const {
 }
 
 Dot11::options_type::const_iterator Dot11::search_option_iterator(OptionTypes type) const {
-    Internals::option_type_equality_comparator<option> comparator(static_cast<uint8_t>(type));
-    return find_if(options_.begin(), options_.end(), comparator);
+    return Internals::find_option_const<option>(options_, type);
 }
 
 Dot11::options_type::iterator Dot11::search_option_iterator(OptionTypes type) {
-    Internals::option_type_equality_comparator<option> comparator(static_cast<uint8_t>(type));
-    return find_if(options_.begin(), options_.end(), comparator);
+    return Internals::find_option<option>(options_, type);
 }
 
 void Dot11::protocol(small_uint<2> new_proto) {
diff --git a/src/dot11/dot11_control.cpp b/src/dot11/dot11_control.cpp
index dc4ba95..0625520 100644
--- a/src/dot11/dot11_control.cpp
+++ b/src/dot11/dot11_control.cpp
@@ -30,7 +30,6 @@
 #include "dot11/dot11_control.h"
 #ifdef TINS_HAVE_DOT11
 
-#include <algorithm>
 #include "memory_helpers.h"
 
 using std::copy;
@@ -234,7 +233,7 @@ void Dot11BlockAck::fragment_number(small_uint<4> frag) {
 }
 
 void Dot11BlockAck::bitmap(const uint8_t* bit) {
-    copy(bit, bit + bitmap_size, bitmap_);
+    memcpy(bitmap_, bit, bitmap_size);
 }
 
 void Dot11BlockAck::write_ext_header(OutputMemoryStream& stream) {
diff --git a/src/dot3.cpp b/src/dot3.cpp
index d4241a0..5a8311e 100644
--- a/src/dot3.cpp
+++ b/src/dot3.cpp
@@ -29,7 +29,6 @@
 
 #include <cstring>
 #include <stdexcept>
-#include <algorithm>
 #include "macros.h"
 #ifndef _WIN32
     #if defined(BSD) || defined(__FreeBSD_kernel__)
@@ -78,11 +77,11 @@ Dot3::Dot3(const uint8_t* buffer, uint32_t total_sz) {
 }
 
 void Dot3::dst_addr(const address_type& address) {
-    copy(address.begin(), address.end(), header_.dst_mac);
+    address.copy(header_.dst_mac);
 }
 
 void Dot3::src_addr(const address_type& address) {
-    copy(address.begin(), address.end(), header_.src_mac);
+    address.copy(header_.src_mac);
 }
 
 void Dot3::length(uint16_t value) {
@@ -121,11 +120,10 @@ bool Dot3::matches_response(const uint8_t* ptr, uint32_t total_sz) const {
     if (total_sz < sizeof(header_)) {
         return false;
     }
-    const size_t addr_sz = address_type::address_size;
     const dot3_header* eth_ptr = (const dot3_header*)ptr;
-    if (equal(header_.src_mac, header_.src_mac + addr_sz, eth_ptr->dst_mac)) {
-        if (equal(header_.src_mac, header_.src_mac + addr_sz, eth_ptr->dst_mac) || 
-           dst_addr() == BROADCAST) {
+    if (address_type(header_.src_mac) == address_type(eth_ptr->dst_mac)) {
+        if (address_type(header_.src_mac) == address_type(eth_ptr->dst_mac) || 
+            dst_addr() == BROADCAST) {
             ptr += sizeof(dot3_header);
             total_sz -= sizeof(dot3_header);
             return inner_pdu() ? inner_pdu()->matches_response(ptr, total_sz) : true;
diff --git a/src/eapol.cpp b/src/eapol.cpp
index 1a1c149..4751db2 100644
--- a/src/eapol.cpp
+++ b/src/eapol.cpp
@@ -29,14 +29,11 @@
 
 #include <cstring>
 #include <stdexcept>
-#include <algorithm>
 #include "eapol.h"
 #include "exceptions.h"
 #include "rawpdu.h"
 #include "memory_helpers.h"
 
-using std::copy;
-using std::min;
 using std::memset;
 using std::memcpy;
 
@@ -51,7 +48,8 @@ PDU::metadata EAPOL::extract_metadata(const uint8_t *buffer, uint32_t total_sz)
     }
     const eapol_header* header = (const eapol_header*)buffer;
     uint32_t advertised_size = Endian::be_to_host<uint16_t>(header->length) + 4;
-    return metadata(min(total_sz, advertised_size), pdu_flag, PDU::UNKNOWN);
+    const uint32_t actual_size = (total_sz < advertised_size) ? total_sz : advertised_size;
+    return metadata(actual_size, pdu_flag, PDU::UNKNOWN);
 }
 
 EAPOL::EAPOL(uint8_t packet_type, EAPOLTYPE type) 
@@ -73,10 +71,8 @@ EAPOL* EAPOL::from_bytes(const uint8_t* buffer, uint32_t total_sz) {
     const eapol_header* ptr = (const eapol_header*)buffer;
     uint32_t data_len = Endian::be_to_host<uint16_t>(ptr->length);
     // at least 4 for fields always present
-    total_sz = min(
-        total_sz, 
-        data_len + 4
-    );
+    data_len += 4;
+    total_sz = (total_sz < data_len) ? total_sz : data_len;
     switch(ptr->type) {
         case RC4:
             return new Tins::RC4EAPOL(buffer, total_sz);
@@ -142,7 +138,7 @@ void RC4EAPOL::replay_counter(uint64_t value) {
 }
 
 void RC4EAPOL::key_iv(const uint8_t* ptr) {
-    copy(ptr, ptr + sizeof(header_.key_iv), header_.key_iv);
+    memcpy(header_.key_iv, ptr, sizeof(header_.key_iv));
 }
 
 void RC4EAPOL::key_flag(small_uint<1> flag) {
@@ -195,15 +191,15 @@ RSNEAPOL::RSNEAPOL(const uint8_t* buffer, uint32_t total_sz)
 }
 
 void RSNEAPOL::nonce(const uint8_t* ptr) {
-    copy(ptr, ptr + nonce_size, header_.nonce);
+    memcpy(header_.nonce, ptr, nonce_size);
 }
 
 void RSNEAPOL::rsc(const uint8_t* ptr) {
-    copy(ptr, ptr + rsc_size, header_.rsc);
+    memcpy(header_.rsc, ptr, rsc_size);
 }
 
 void RSNEAPOL::id(const uint8_t* ptr) {
-    copy(ptr, ptr + id_size, header_.id);
+    memcpy(header_.id, ptr, id_size);
 }
 
 void RSNEAPOL::replay_counter(uint64_t new_replay_counter) {
@@ -211,7 +207,7 @@ void RSNEAPOL::replay_counter(uint64_t new_replay_counter) {
 }
 
 void RSNEAPOL::mic(const uint8_t* ptr) {
-    copy(ptr, ptr + mic_size, header_.mic);
+    memcpy(header_.mic, ptr, mic_size);
 }
 
 void RSNEAPOL::wpa_length(uint16_t length) {
@@ -219,7 +215,7 @@ void RSNEAPOL::wpa_length(uint16_t length) {
 }
 
 void RSNEAPOL::key_iv(const uint8_t* ptr) {
-    copy(ptr, ptr + sizeof(header_.key_iv), header_.key_iv);
+    memcpy(header_.key_iv, ptr, sizeof(header_.key_iv));
 }
 
 void RSNEAPOL::key_length(uint16_t length) {
diff --git a/src/ethernetII.cpp b/src/ethernetII.cpp
index b44ce54..f053f25 100644
--- a/src/ethernetII.cpp
+++ b/src/ethernetII.cpp
@@ -28,7 +28,6 @@
  */
 
 #include <cstring>
-#include <algorithm>
 #include "macros.h"
 #ifndef _WIN32
     #if defined(BSD) || defined(__FreeBSD_kernel__)
@@ -48,8 +47,6 @@
 #include "memory_helpers.h"
 #include "detail/pdu_helpers.h"
 
-using std::equal;
-
 using Tins::Memory::InputMemoryStream;
 using Tins::Memory::OutputMemoryStream;
 
@@ -144,10 +141,9 @@ bool EthernetII::matches_response(const uint8_t* ptr, uint32_t total_sz) const {
     if (total_sz < sizeof(header_)) {
         return false;
     }
-    const size_t addr_sz = address_type::address_size;
     const ethernet_header* eth_ptr = (const ethernet_header*)ptr;
-    if (equal(header_.src_mac, header_.src_mac + addr_sz, eth_ptr->dst_mac)) {
-        if (equal(header_.src_mac, header_.src_mac + addr_sz, eth_ptr->dst_mac) || 
+    if (address_type(header_.src_mac) == address_type(eth_ptr->dst_mac)) {
+        if (address_type(header_.src_mac) == address_type(eth_ptr->dst_mac) || 
            !dst_addr().is_unicast()) {
             return inner_pdu() ? 
                    inner_pdu()->matches_response(ptr + sizeof(header_), total_sz - sizeof(header_)) : 
diff --git a/src/icmp_extension.cpp b/src/icmp_extension.cpp
index 13eeabb..4169088 100644
--- a/src/icmp_extension.cpp
+++ b/src/icmp_extension.cpp
@@ -27,7 +27,6 @@
  *
  */
 
-#include <algorithm>
 #include <cstring>
 #include "icmp_extension.h"
 #include "exceptions.h"
diff --git a/src/icmpv6.cpp b/src/icmpv6.cpp
index 457ca46..c9aff12 100644
--- a/src/icmpv6.cpp
+++ b/src/icmpv6.cpp
@@ -28,7 +28,6 @@
  */
  
 #include <cstring>
-#include <algorithm>
 #include "icmpv6.h"
 #include "ipv6.h"
 #include "rawpdu.h"
@@ -41,7 +40,6 @@
 using std::memset;
 using std::vector;
 using std::string;
-using std::max;
 
 using Tins::Memory::InputMemoryStream;
 using Tins::Memory::OutputMemoryStream;
@@ -258,7 +256,8 @@ uint32_t ICMPv6::trailer_size() const {
             // If the next pdu size is lower than 128 bytes, then padding = 128 - pdu size
             // If the next pdu size is greater than 128 bytes, 
             // then padding = pdu size padded to next 32 bit boundary - pdu size
-            const uint32_t upper_bound = max(get_adjusted_inner_pdu_size(), 128U);
+            const uint32_t upper_bound = (get_adjusted_inner_pdu_size() > 128U) ?
+                                          get_adjusted_inner_pdu_size() : 128U;
             output += upper_bound - inner_pdu()->size();
         }
     }
@@ -291,7 +290,9 @@ void ICMPv6::write_serialization(uint8_t* buffer, uint32_t total_sz) {
         uint32_t length_value = get_adjusted_inner_pdu_size();
         // If the next pdu size is greater than 128, we are forced to set the length field
         if (length() != 0 || length_value > 128) {
-            length_value = length_value ? max(length_value, 128U) : 0;
+            if (length_value > 0) {
+                length_value = (length_value > 128U) ? length_value : 128U;
+            }
             // This field uses 64 bit words as the unit
             header_.rfc4884.length = length_value / sizeof(uint64_t);
         }
@@ -437,13 +438,11 @@ const ICMPv6::option* ICMPv6::search_option(OptionTypes type) const {
 }
 
 ICMPv6::options_type::const_iterator ICMPv6::search_option_iterator(OptionTypes type) const {
-    Internals::option_type_equality_comparator<option> comparator(type);
-    return find_if(options_.begin(), options_.end(), comparator);
+    return Internals::find_option_const<option>(options_, type);
 }
 
 ICMPv6::options_type::iterator ICMPv6::search_option_iterator(OptionTypes type) {
-    Internals::option_type_equality_comparator<option> comparator(type);
-    return find_if(options_.begin(), options_.end(), comparator);
+    return Internals::find_option<option>(options_, type);
 }
 
 // ********************************************************************
diff --git a/src/ip.cpp b/src/ip.cpp
index cd892fd..e5c17cb 100644
--- a/src/ip.cpp
+++ b/src/ip.cpp
@@ -29,7 +29,6 @@
 
 #include <stdexcept>
 #include <cstring>
-#include <algorithm>
 #ifndef _WIN32
     #include <netdb.h>
     #include <sys/socket.h>
@@ -50,7 +49,6 @@
 #include "pdu_allocator.h"
 
 using std::list;
-using std::min;
 using std::memcmp;
 using std::vector;
 
@@ -104,13 +102,13 @@ IP::IP(const uint8_t* buffer, uint32_t total_sz)
                 if (stream.pointer() + data_size > options_end) {
                     throw malformed_packet();
                 }
-                ip_options_.push_back(
+                options_.push_back(
                     option(opt_type, stream.pointer(), stream.pointer() + data_size)
                 );
                 stream.skip(data_size);
             }
             else {
-                ip_options_.push_back(option(opt_type));
+                options_.push_back(option(opt_type));
             }
             options_size_ += option_size;
         }
@@ -123,7 +121,7 @@ IP::IP(const uint8_t* buffer, uint32_t total_sz)
             break;
         }
         else {
-            ip_options_.push_back(option(opt_type));
+            options_.push_back(option(opt_type));
             options_size_++;
         }
     }
@@ -133,7 +131,8 @@ IP::IP(const uint8_t* buffer, uint32_t total_sz)
         // since this is the case when using TCP segmentation offload
         if (tot_len() != 0) {
             const uint32_t advertised_length = (uint32_t)tot_len() - head_len() * sizeof(uint32_t);
-            total_sz = min(static_cast<uint32_t>(stream.size()), advertised_length);
+            const uint32_t stream_size = static_cast<uint32_t>(stream.size());
+            total_sz = (stream_size < advertised_length) ? stream_size : advertised_length;
         }
         else {
             total_sz = stream.size();
@@ -325,7 +324,7 @@ uint16_t IP::stream_identifier() const {
 
 void IP::add_option(const option& opt) {
     internal_add_option(opt);
-    ip_options_.push_back(opt);
+    options_.push_back(opt);
 }
 
 void IP::update_padded_options_size() {
@@ -340,28 +339,26 @@ void IP::internal_add_option(const option& opt) {
 
 bool IP::remove_option(option_identifier id) {
     options_type::iterator iter = search_option_iterator(id);
-    if (iter == ip_options_.end()) {
+    if (iter == options_.end()) {
         return false;
     }
     options_size_ -= static_cast<uint16_t>(1 + iter->data_size());
-    ip_options_.erase(iter);
+    options_.erase(iter);
     update_padded_options_size();
     return true;
 }
 
 const IP::option* IP::search_option(option_identifier id) const {
     options_type::const_iterator iter = search_option_iterator(id);
-    return (iter != ip_options_.end()) ? &*iter : 0;
+    return (iter != options_.end()) ? &*iter : 0;
 }
 
 IP::options_type::const_iterator IP::search_option_iterator(option_identifier id) const {
-    Internals::option_type_equality_comparator<option> comparator(id);
-    return find_if(ip_options_.begin(), ip_options_.end(), comparator);
+    return Internals::find_option_const<option>(options_, id);
 }
 
 IP::options_type::iterator IP::search_option_iterator(option_identifier id) {
-    Internals::option_type_equality_comparator<option> comparator(id);
-    return find_if(ip_options_.begin(), ip_options_.end(), comparator);
+    return Internals::find_option<option>(options_, id);
 }
 
 void IP::write_option(const option& opt, OutputMemoryStream& stream) {
@@ -461,7 +458,7 @@ void IP::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     // Restore the fragment offset field in case we flipped it
     header_.frag_off = original_frag_off;
 
-    for (options_type::const_iterator it = ip_options_.begin(); it != ip_options_.end(); ++it) {
+    for (options_type::const_iterator it = options_.begin(); it != options_.end(); ++it) {
         write_option(*it, stream);
     }
     // Add option padding
@@ -499,7 +496,8 @@ bool IP::matches_response(const uint8_t* ptr, uint32_t total_sz) const {
     if ((header_.saddr == ip_ptr->daddr && 
         (header_.daddr == ip_ptr->saddr || dst_addr().is_broadcast())) ||
         (dst_addr().is_broadcast() && header_.saddr == 0)) {
-        uint32_t sz = min<uint32_t>(header_size(), total_sz);
+
+        uint32_t sz = (header_size() < total_sz) ? header_size() : total_sz;
         return inner_pdu() ? inner_pdu()->matches_response(ptr + sz, total_sz - sz) : true;
     }
     return false;
diff --git a/src/ipv6.cpp b/src/ipv6.cpp
index c6dfe2d..07170bf 100644
--- a/src/ipv6.cpp
+++ b/src/ipv6.cpp
@@ -34,7 +34,6 @@
 #else
     #include <ws2tcpip.h>
 #endif
-#include <algorithm> 
 #include "ipv6.h"
 #include "constants.h"
 #include "packet_sender.h"
@@ -272,7 +271,7 @@ void IPv6::send(PacketSender& sender, const NetworkInterface &) {
     PacketSender::SocketType type = PacketSender::IPV6_SOCKET;
     link_addr.sin6_family = AF_INET6;
     link_addr.sin6_port = 0;
-    copy(header_.dst_addr, header_.dst_addr + address_type::address_size, (uint8_t*)&link_addr.sin6_addr);
+    memcpy((uint8_t*)&link_addr.sin6_addr, header_.dst_addr, address_type::address_size);
     if (inner_pdu() && inner_pdu()->pdu_type() == PDU::ICMP) {
         type = PacketSender::ICMP_SOCKET;
     }
diff --git a/src/ipv6_address.cpp b/src/ipv6_address.cpp
index 3d32128..dfb7291 100644
--- a/src/ipv6_address.cpp
+++ b/src/ipv6_address.cpp
@@ -37,7 +37,6 @@
     #include <ws2tcpip.h>
     #include <mstcpip.h>
 #endif
-#include <algorithm>
 #include <limits>
 #include <sstream>
 #include <iostream>
@@ -45,7 +44,8 @@
 #include "address_range.h"
 #include "exceptions.h"
 
-using std::fill;
+using std::memset;
+using std::memcpy;
 using std::string;
 using std::ostream;
 
@@ -67,7 +67,7 @@ IPv6Address IPv6Address::from_prefix_length(uint32_t prefix_length) {
 }
 
 IPv6Address::IPv6Address() {
-    fill(address_, address_ + address_size, 0);
+    memset(address_, 0, address_size);
 }
 
 IPv6Address::IPv6Address(const char* addr) {
@@ -75,7 +75,7 @@ IPv6Address::IPv6Address(const char* addr) {
 }
 
 IPv6Address::IPv6Address(const_iterator ptr) {
-    std::copy(ptr, ptr + address_size, address_);
+    memcpy(address_, ptr, address_size);
 }
 
 IPv6Address::IPv6Address(const std::string& addr) {
diff --git a/src/packet_sender.cpp b/src/packet_sender.cpp
index de4eb11..4083815 100644
--- a/src/packet_sender.cpp
+++ b/src/packet_sender.cpp
@@ -54,7 +54,6 @@
 #endif
 #include <cstring>
 #include <ctime>
-#include <algorithm>
 #include "pdu.h"
 #include "macros.h"
 // PDUs required by PacketSender::send(PDU&, NetworkInterface)
@@ -71,7 +70,6 @@
 
 using std::string;
 using std::ostringstream;
-using std::max;
 using std::make_pair;
 using std::vector;
 using std::runtime_error;
@@ -457,7 +455,7 @@ PDU* PacketSender::recv_match_loop(const vector<int>& sockets,
         int max_fd = 0;
         for (vector<int>::const_iterator it = sockets.begin(); it != sockets.end(); ++it) {
             FD_SET(*it, &readfds);
-            max_fd = max(max_fd, *it);
+            max_fd = (max_fd > *it) ? max_fd : *it;
         }
         if ((read = select(max_fd + 1, &readfds, 0, 0, &timeout)) == -1) {
             return 0;
diff --git a/src/ppi.cpp b/src/ppi.cpp
index effc049..047cf60 100644
--- a/src/ppi.cpp
+++ b/src/ppi.cpp
@@ -27,7 +27,6 @@
  *
  */
 
-#include <algorithm>
 #include <cstring>
 #include <pcap.h>
 #include "dot11/dot11_base.h"
diff --git a/src/rawpdu.cpp b/src/rawpdu.cpp
index 1559c01..2c4d516 100644
--- a/src/rawpdu.cpp
+++ b/src/rawpdu.cpp
@@ -27,7 +27,6 @@
  *
  */
 
-#include <algorithm>
 #include "rawpdu.h"
 #include "memory_helpers.h"
 
diff --git a/src/tcp.cpp b/src/tcp.cpp
index 37a0572..bbafe4c 100644
--- a/src/tcp.cpp
+++ b/src/tcp.cpp
@@ -28,7 +28,6 @@
  */
 
 #include <cstring>
-#include <algorithm>
 #include "tcp.h"
 #include "ip.h"
 #include "ipv6.h"
@@ -38,8 +37,6 @@
 #include "memory_helpers.h"
 #include "utils/checksum_utils.h"
 
-using std::find_if;
-using std::min;
 using std::vector;
 using std::pair;
 
@@ -345,13 +342,11 @@ const TCP::option* TCP::search_option(OptionTypes type) const {
 }
 
 TCP::options_type::const_iterator TCP::search_option_iterator(OptionTypes type) const {
-    Internals::option_type_equality_comparator<option> comparator(type);
-    return find_if(options_.begin(), options_.end(), comparator);
+    return Internals::find_option_const<option>(options_, type);
 }
 
 TCP::options_type::iterator TCP::search_option_iterator(OptionTypes type) {
-    Internals::option_type_equality_comparator<option> comparator(type);
-    return find_if(options_.begin(), options_.end(), comparator);
+    return Internals::find_option<option>(options_, type);
 }
 
 /* options */
@@ -408,7 +403,8 @@ bool TCP::matches_response(const uint8_t* ptr, uint32_t total_sz) const {
     }
     const tcp_header* tcp_ptr = (const tcp_header*)ptr;
     if (tcp_ptr->sport == header_.dport && tcp_ptr->dport == header_.sport) {
-        uint32_t sz = min<uint32_t>(total_sz, tcp_ptr->doff * sizeof(uint32_t));
+        const uint32_t data_offset = tcp_ptr->doff * sizeof(uint32_t);
+        uint32_t sz = (total_sz < data_offset) ? total_sz : data_offset;
         return inner_pdu() ? inner_pdu()->matches_response(ptr + sz, total_sz - sz) : true;
     }
     else

From 9677c060368a5855514ffdc8f8a025bcd7fdf1e6 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 19:55:23 -0700
Subject: [PATCH 34/73] Fix build issues due to std::hash missing

---
 include/tins/hw_address.h   |  4 ++++
 include/tins/ip_address.h   |  4 +---
 include/tins/ipv6_address.h |  4 +---
 src/ip_address.cpp          | 10 ++++++++++
 src/ipv6_address.cpp        |  9 +++++++++
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/include/tins/hw_address.h b/include/tins/hw_address.h
index 853822a..c0a24f7 100644
--- a/include/tins/hw_address.h
+++ b/include/tins/hw_address.h
@@ -35,6 +35,10 @@
 #include <string>
 #include <cstring>
 #include "cxxstd.h"
+#if TINS_IS_CXX11
+    // std::hash
+    #include <memory>
+#endif // TINS_IS_CXX11
 
 namespace Tins {
 namespace Internals {
diff --git a/include/tins/ip_address.h b/include/tins/ip_address.h
index bfbcb6c..6e5f9c5 100644
--- a/include/tins/ip_address.h
+++ b/include/tins/ip_address.h
@@ -205,9 +205,7 @@ namespace std {
 
 template<>
 struct hash<Tins::IPv4Address> {
-    size_t operator()(const Tins::IPv4Address& addr) const {
-        return std::hash<uint32_t>()(addr);
-    }
+    size_t operator()(const Tins::IPv4Address& addr) const;
 };
 
 } // std
diff --git a/include/tins/ipv6_address.h b/include/tins/ipv6_address.h
index fcec9b3..6013635 100644
--- a/include/tins/ipv6_address.h
+++ b/include/tins/ipv6_address.h
@@ -223,9 +223,7 @@ namespace std {
 
 template<>
 struct hash<Tins::IPv6Address> {
-    size_t operator()(const Tins::IPv6Address& addr) const {
-        return std::hash<std::string>()(addr.to_string());
-    }
+    size_t operator()(const Tins::IPv6Address& addr) const;
 };
 
 } // std
diff --git a/src/ip_address.cpp b/src/ip_address.cpp
index 740ab4c..fa35b2c 100644
--- a/src/ip_address.cpp
+++ b/src/ip_address.cpp
@@ -33,6 +33,10 @@
     #include <sys/socket.h>
     #include <arpa/inet.h>
 #endif // _WIN32
+#if TINS_IS_CXX11
+    // std::hash
+    #include <memory>
+#endif // TINS_IS_CXX11
 #include <stdexcept>
 #include <sstream>
 #include <iostream>
@@ -41,6 +45,7 @@
 #include "address_range.h"
 #include "exceptions.h"
 
+
 using std::string;
 using std::ostringstream;
 using std::ostream;
@@ -150,3 +155,8 @@ IPv4Address IPv4Address::operator&(const IPv4Address& mask) const {
 }
 
 } // Tins
+
+// Hash
+size_t std::hash<Tins::IPv4Address>::operator()(const Tins::IPv4Address& addr) const {
+    return std::hash<uint32_t>()(addr);
+}
diff --git a/src/ipv6_address.cpp b/src/ipv6_address.cpp
index dfb7291..31a2474 100644
--- a/src/ipv6_address.cpp
+++ b/src/ipv6_address.cpp
@@ -37,6 +37,10 @@
     #include <ws2tcpip.h>
     #include <mstcpip.h>
 #endif
+#if TINS_IS_CXX11
+    // std::hash
+    #include <memory>
+#endif // TINS_IS_CXX11
 #include <limits>
 #include <sstream>
 #include <iostream>
@@ -148,3 +152,8 @@ IPv6Address operator&(const IPv6Address& lhs, const IPv6Address& rhs) {
 }
 
 } // Tins
+
+// Hash
+size_t std::hash<Tins::IPv6Address>::operator()(const Tins::IPv6Address& addr) const {
+    return std::hash<string>()(addr.to_string());
+}

From d9f92c46c42d91131646ddda49202079676316cc Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 20:01:30 -0700
Subject: [PATCH 35/73] Fix missing include for sstream on packet_sender.cpp

---
 src/packet_sender.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/packet_sender.cpp b/src/packet_sender.cpp
index 4083815..58fafd1 100644
--- a/src/packet_sender.cpp
+++ b/src/packet_sender.cpp
@@ -54,6 +54,7 @@
 #endif
 #include <cstring>
 #include <ctime>
+#include <sstream>
 #include "pdu.h"
 #include "macros.h"
 // PDUs required by PacketSender::send(PDU&, NetworkInterface)
@@ -368,6 +369,8 @@ void PacketSender::send_l2(PDU& pdu,
         int sock = get_ether_socket(iface);
         if (!buffer.empty()) {
             #if defined(BSD) || defined(__FreeBSD_kernel__)
+            Internals::unused(len_addr);
+            Internals::unused(link_addr);
             if (::write(sock, &buffer[0], buffer.size()) == -1) {
             #else
             if (::sendto(sock, &buffer[0], buffer.size(), 0, link_addr, len_addr) == -1) {

From 1ec6006f336c3ec97e6e749b6c7b06e1186fd3c8 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 30 Apr 2017 20:09:47 -0700
Subject: [PATCH 36/73] Add missing stdexcept include in routing_utils.cpp

---
 include/tins/pdu_iterator.h | 4 ++--
 src/pdu_iterator.cpp        | 2 +-
 src/utils/routing_utils.cpp | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/tins/pdu_iterator.h b/include/tins/pdu_iterator.h
index abc5685..c91bab2 100644
--- a/include/tins/pdu_iterator.h
+++ b/include/tins/pdu_iterator.h
@@ -162,12 +162,12 @@ public:
     /**
      * Dereference and get the stored PDU
      */
-    value_type operator*();
+    PDU& operator*();
 
     /**
      * Dereference and get the stored PDU
      */
-    const value_type operator*() const;
+    const PDU& operator*() const;
 private:
     pointer pdu_;
 };
diff --git a/src/pdu_iterator.cpp b/src/pdu_iterator.cpp
index 12c154d..357c6ff 100644
--- a/src/pdu_iterator.cpp
+++ b/src/pdu_iterator.cpp
@@ -51,7 +51,7 @@ PDUIterator::value_type PDUIterator::operator*() {
     return *pdu_;
 }
 
-const PDUIterator::value_type PDUIterator::operator*() const {
+const PDU& PDUIterator::operator*() const {
     return *pdu_;
 }
 
diff --git a/src/utils/routing_utils.cpp b/src/utils/routing_utils.cpp
index c2d3229..cf9cb32 100644
--- a/src/utils/routing_utils.cpp
+++ b/src/utils/routing_utils.cpp
@@ -55,6 +55,7 @@
 #endif
 #include <set>
 #include <fstream>
+#include <stdexcept>
 #include "network_interface.h"
 
 using std::vector;
@@ -62,6 +63,7 @@ using std::string;
 using std::set;
 using std::ifstream;
 using std::istream;
+using std::runtime_error;
 
 namespace Tins {
 namespace Utils {

From de2f29b797d96597eb7052cfdbedd730b63ae732 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 7 May 2017 13:33:52 -0700
Subject: [PATCH 37/73] Fix build issue on appveyor

---
 cmake/appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/appveyor.yml b/cmake/appveyor.yml
index c63dd7f..f3cecb6 100644
--- a/cmake/appveyor.yml
+++ b/cmake/appveyor.yml
@@ -9,7 +9,7 @@ environment:
   matrix:
     - compiler: vs2013
     - compiler: vs2015
-  BOOST_ROOT: C:\Libraries\boost
+  BOOST_ROOT: C:/Libraries/boost
 clone_depth: 1
 install:
 - git clone https://github.com/mfontanini/winpcap-installer.git

From 6896cc63469718f6f71c836384143c2d884b3ead Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Mon, 8 May 2017 21:51:27 -0700
Subject: [PATCH 38/73] Fix more build issues on appveyor

---
 src/ethernetII.cpp          | 2 +-
 src/icmp.cpp                | 9 +++++----
 src/ip_address.cpp          | 2 ++
 src/ipv6_address.cpp        | 2 ++
 src/utils/routing_utils.cpp | 3 ++-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/ethernetII.cpp b/src/ethernetII.cpp
index f053f25..0c1021c 100644
--- a/src/ethernetII.cpp
+++ b/src/ethernetII.cpp
@@ -106,7 +106,7 @@ uint32_t EthernetII::trailer_size() const {
     int32_t padding = 60 - sizeof(header_); // EthernetII min size is 60, padding is sometimes needed
     if (inner_pdu()) {
         padding -= inner_pdu()->size();
-        padding = std::max(0, padding);
+        padding = padding > 0 ? padding : 0;
     }
     return padding;
 }
diff --git a/src/icmp.cpp b/src/icmp.cpp
index 5b14f0c..6496c60 100644
--- a/src/icmp.cpp
+++ b/src/icmp.cpp
@@ -40,7 +40,6 @@
 #include "utils/checksum_utils.h"
 
 using std::memset;
-using std::max;
 
 using Tins::Memory::InputMemoryStream;
 using Tins::Memory::OutputMemoryStream;
@@ -148,7 +147,8 @@ uint32_t ICMP::trailer_size() const {
             // If the next pdu size is lower than 128 bytes, then padding = 128 - pdu size
             // If the next pdu size is greater than 128 bytes, 
             // then padding = pdu size padded to next 32 bit boundary - pdu size
-            const uint32_t upper_bound = max(get_adjusted_inner_pdu_size(), 128U);
+            const uint32_t adjusted_size = get_adjusted_inner_pdu_size();
+            const uint32_t upper_bound = adjusted_size > 128U ? adjusted_size : 128U;
             output += upper_bound - inner_pdu()->size();
         }
     }
@@ -228,8 +228,9 @@ void ICMP::write_serialization(uint8_t* buffer, uint32_t total_sz) {
             if (length_value) {
                 // If we have extensions, we'll have at least 128 bytes.
                 // Otherwise, just use the length 
-                length_value = has_extensions() ? max(length_value, 128U) 
-                                                : length_value;
+                if (has_extensions()) {
+                    length_value = length_value > 128U ? length_value : 128U;
+                }
             }
             else {
                 length_value = 0;
diff --git a/src/ip_address.cpp b/src/ip_address.cpp
index fa35b2c..e2e892a 100644
--- a/src/ip_address.cpp
+++ b/src/ip_address.cpp
@@ -156,7 +156,9 @@ IPv4Address IPv4Address::operator&(const IPv4Address& mask) const {
 
 } // Tins
 
+#ifdef TINS_IS_CXX11
 // Hash
 size_t std::hash<Tins::IPv4Address>::operator()(const Tins::IPv4Address& addr) const {
     return std::hash<uint32_t>()(addr);
 }
+#endif // TINS_IS_CXX11
diff --git a/src/ipv6_address.cpp b/src/ipv6_address.cpp
index 31a2474..9a3ab79 100644
--- a/src/ipv6_address.cpp
+++ b/src/ipv6_address.cpp
@@ -153,7 +153,9 @@ IPv6Address operator&(const IPv6Address& lhs, const IPv6Address& rhs) {
 
 } // Tins
 
+#ifdef TINS_IS_CXX11
 // Hash
 size_t std::hash<Tins::IPv6Address>::operator()(const Tins::IPv6Address& addr) const {
     return std::hash<string>()(addr.to_string());
 }
+#endif // TINS_IS_CXX11
diff --git a/src/utils/routing_utils.cpp b/src/utils/routing_utils.cpp
index cf9cb32..57980ac 100644
--- a/src/utils/routing_utils.cpp
+++ b/src/utils/routing_utils.cpp
@@ -57,6 +57,7 @@
 #include <fstream>
 #include <stdexcept>
 #include "network_interface.h"
+#include "exceptions.h"
 
 using std::vector;
 using std::string;
@@ -319,7 +320,7 @@ vector<Route6Entry> route6_entries() {
                 entry.metric = row->Metric;
                 output.push_back(entry);
             }
-            catch (invalid_interface&) {
+            catch (const invalid_interface&) {
                 
             }
         }

From 7eb067338f998e3e61cd3e8181f02c634d6ca282 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Mon, 8 May 2017 22:14:39 -0700
Subject: [PATCH 39/73] Try to make VC happy with std::hash definition

---
 src/ip_address.cpp   | 7 +++++--
 src/ipv6_address.cpp | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/ip_address.cpp b/src/ip_address.cpp
index e2e892a..1d55c45 100644
--- a/src/ip_address.cpp
+++ b/src/ip_address.cpp
@@ -157,8 +157,11 @@ IPv4Address IPv4Address::operator&(const IPv4Address& mask) const {
 } // Tins
 
 #ifdef TINS_IS_CXX11
-// Hash
-size_t std::hash<Tins::IPv4Address>::operator()(const Tins::IPv4Address& addr) const {
+namespace std {
+
+size_t hash<Tins::IPv4Address>::operator()(const Tins::IPv4Address& addr) const {
     return std::hash<uint32_t>()(addr);
 }
+
+} // std
 #endif // TINS_IS_CXX11
diff --git a/src/ipv6_address.cpp b/src/ipv6_address.cpp
index 9a3ab79..6523cc5 100644
--- a/src/ipv6_address.cpp
+++ b/src/ipv6_address.cpp
@@ -154,8 +154,11 @@ IPv6Address operator&(const IPv6Address& lhs, const IPv6Address& rhs) {
 } // Tins
 
 #ifdef TINS_IS_CXX11
-// Hash
-size_t std::hash<Tins::IPv6Address>::operator()(const Tins::IPv6Address& addr) const {
+namespace std {
+
+size_t hash<Tins::IPv6Address>::operator()(const Tins::IPv6Address& addr) const {
     return std::hash<string>()(addr.to_string());
 }
+
+} // std
 #endif // TINS_IS_CXX11

From 887bccf0af1bcdc5fc7fefacb69ad7699e346794 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Mon, 8 May 2017 22:22:48 -0700
Subject: [PATCH 40/73] Fix undefined std::min use in PPPoE

---
 src/pppoe.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pppoe.cpp b/src/pppoe.cpp
index e936906..36eccd0 100644
--- a/src/pppoe.cpp
+++ b/src/pppoe.cpp
@@ -53,7 +53,9 @@ PPPoE::PPPoE(const uint8_t* buffer, uint32_t total_sz)
 : tags_size_() {
     InputMemoryStream stream(buffer, total_sz);
     stream.read(header_); 
-    stream.size(std::min(stream.size(), (size_t)payload_length()));
+    const uint32_t read_size = stream.size() < payload_length() ? stream.size()
+                                                                : payload_length();
+    stream.size(read_size);
     // If this is a session data packet
     if (code() == 0) {
         if (stream) {

From 5d68211af24debdcd308cdfe49700daaba687e8c Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Mon, 8 May 2017 22:23:45 -0700
Subject: [PATCH 41/73] Include iterator in network_interface

---
 src/network_interface.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/network_interface.cpp b/src/network_interface.cpp
index cd191be..5f511d0 100644
--- a/src/network_interface.cpp
+++ b/src/network_interface.cpp
@@ -30,6 +30,7 @@
 #include <stdexcept>
 #include <vector>
 #include <cstring>
+#include <iterator>
 #include "macros.h"
 #ifndef _WIN32
     #include <netinet/in.h>

From afb6ad488ce83da1e97ba5a4ae1634f26f4679fc Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Tue, 9 May 2017 08:09:41 -0700
Subject: [PATCH 42/73] Use TINS_IS_CXX11 macro properly

---
 src/ip_address.cpp   | 2 +-
 src/ipv6_address.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ip_address.cpp b/src/ip_address.cpp
index 1d55c45..015311a 100644
--- a/src/ip_address.cpp
+++ b/src/ip_address.cpp
@@ -156,7 +156,7 @@ IPv4Address IPv4Address::operator&(const IPv4Address& mask) const {
 
 } // Tins
 
-#ifdef TINS_IS_CXX11
+#if TINS_IS_CXX11
 namespace std {
 
 size_t hash<Tins::IPv4Address>::operator()(const Tins::IPv4Address& addr) const {
diff --git a/src/ipv6_address.cpp b/src/ipv6_address.cpp
index 6523cc5..d9e5e3f 100644
--- a/src/ipv6_address.cpp
+++ b/src/ipv6_address.cpp
@@ -153,7 +153,7 @@ IPv6Address operator&(const IPv6Address& lhs, const IPv6Address& rhs) {
 
 } // Tins
 
-#ifdef TINS_IS_CXX11
+#if TINS_IS_CXX11
 namespace std {
 
 size_t hash<Tins::IPv6Address>::operator()(const Tins::IPv6Address& addr) const {

From f1e726f5038174a07844418a2a18704acb855e01 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Wed, 10 May 2017 18:44:55 -0700
Subject: [PATCH 43/73] Don't dereference iterator in memory helpers if size ==
 0

---
 include/tins/memory_helpers.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/tins/memory_helpers.h b/include/tins/memory_helpers.h
index 81c8bc3..ec63eac 100644
--- a/include/tins/memory_helpers.h
+++ b/include/tins/memory_helpers.h
@@ -143,6 +143,10 @@ public:
         if (TINS_UNLIKELY(size_ < length)) {
             throw serialization_error();
         }
+        // VC doesn't like dereferencing empty vector's iterators so check this here
+        if (TINS_UNLIKELY(length == 0)) {
+            return;
+        }
         std::memcpy(buffer_, &*start, length);
         skip(length);
     }

From b47dc3f77c12b7bcaf2e42159c04dd56ebb0a682 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Wed, 10 May 2017 19:13:45 -0700
Subject: [PATCH 44/73] Only call memcpy in PDUOption if size > 0

---
 include/tins/pdu_option.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/tins/pdu_option.h b/include/tins/pdu_option.h
index 6e950c9..0f435c1 100644
--- a/include/tins/pdu_option.h
+++ b/include/tins/pdu_option.h
@@ -515,7 +515,9 @@ private:
         }
         real_size_ = static_cast<uint16_t>(total_size);
         if (real_size_ <= small_buffer_size) {
-            std::memcpy(payload_.small_buffer, &*start, total_size);
+            if (total_size > 0) {
+                std::memcpy(payload_.small_buffer, &*start, total_size);
+            }
         }
         else {
             payload_.big_buffer_ptr = new data_type[real_size_];

From 3c2f40ec02a5dc72a492a1e4257134967a424226 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sat, 13 May 2017 10:22:24 -0700
Subject: [PATCH 45/73] Split pdu_option.h into a source file as well

---
 include/tins/detail/type_traits.h |   5 +
 include/tins/pdu_option.h         | 347 ++++++++++--------------------
 src/CMakeLists.txt                |   1 +
 src/pdu_option.cpp                | 276 ++++++++++++++++++++++++
 src/rsn_information.cpp           |   1 +
 5 files changed, 394 insertions(+), 236 deletions(-)
 create mode 100644 src/pdu_option.cpp

diff --git a/include/tins/detail/type_traits.h b/include/tins/detail/type_traits.h
index 99fbc4b..6c2c21a 100644
--- a/include/tins/detail/type_traits.h
+++ b/include/tins/detail/type_traits.h
@@ -53,6 +53,11 @@ struct enable_if<false, T> {
 
 };
 
+template <typename T>
+struct type_to_type {
+    typedef T type;
+};
+
 template<typename T>
 struct is_unsigned_integral {
     static const bool value = false;
diff --git a/include/tins/pdu_option.h b/include/tins/pdu_option.h
index 0f435c1..c614828 100644
--- a/include/tins/pdu_option.h
+++ b/include/tins/pdu_option.h
@@ -31,18 +31,19 @@
 #define TINS_PDU_OPTION_H
 
 #include <vector>
-#include <iterator>
-#include <cstring>
 #include <string>
+#include <cstring>
 #include <stdint.h>
 #include "exceptions.h"
-#include "endianness.h"
-#include "ip_address.h"
-#include "ipv6_address.h"
-#include "hw_address.h"
 #include "detail/type_traits.h"
 
 namespace Tins {
+
+class IPv4Address;
+class IPv6Address;
+template <size_t n>
+class HWAddress;
+
 /**
  * \cond
  */
@@ -50,251 +51,125 @@ template <typename OptionType, typename PDUType>
 class PDUOption;
 
 namespace Internals {
-    template <typename T, typename X, typename PDUType>
-    T convert_to_integral(const PDUOption<X, PDUType> & opt) {
-        if (opt.data_size() != sizeof(T)) {
-            throw malformed_option();
-        }
-        T data = *(T*)opt.data_ptr();
-        if (PDUType::endianness == PDUType::BE) {
-            data = Endian::be_to_host(data);
-        }
-        else {
-            data = Endian::le_to_host(data);
-        }
-        return data;
-    }
+    namespace Converters {
+        uint8_t convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian,
+                        type_to_type<uint8_t>);
+        uint16_t convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian,
+                         type_to_type<uint16_t>);
+        uint32_t convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian,
+                         type_to_type<uint32_t>);
+        uint64_t convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian,
+                         type_to_type<uint64_t>);
+        HWAddress<6> convert(const uint8_t* ptr, uint32_t data_size,
+                             PDU::endian_type endian, type_to_type<HWAddress<6> >);
+        IPv4Address convert(const uint8_t* ptr, uint32_t data_size,
+                            PDU::endian_type endian, type_to_type<IPv4Address>);
+        IPv6Address convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian,
+                            type_to_type<IPv6Address>);
+        std::string convert(const uint8_t* ptr, uint32_t data_size,
+                            PDU::endian_type endian, type_to_type<std::string>);
+        std::vector<float> convert(const uint8_t* ptr, uint32_t data_size,
+                                   PDU::endian_type endian, type_to_type<std::vector<float> >);
+        std::vector<uint8_t> convert(const uint8_t* ptr, uint32_t data_size,
+                                     PDU::endian_type endian, type_to_type<std::vector<uint8_t> >);
+        std::vector<uint16_t> convert(const uint8_t* ptr, uint32_t data_size,
+                                      PDU::endian_type endian,
+                                      type_to_type<std::vector<uint16_t> >);
+        std::vector<uint32_t> convert(const uint8_t* ptr, uint32_t data_size,
+                                      PDU::endian_type endian,
+                                      type_to_type<std::vector<uint32_t> >);
+        std::vector<IPv4Address> convert(const uint8_t* ptr, uint32_t data_size,
+                                         PDU::endian_type endian,
+                                         type_to_type<std::vector<IPv4Address> >);
+        std::vector<IPv6Address> convert(const uint8_t* ptr, uint32_t data_size,
+                                         PDU::endian_type endian,
+                                         type_to_type<std::vector<IPv6Address> >);
+        std::vector<std::pair<uint8_t, uint8_t> > convert(const uint8_t* ptr, uint32_t data_size,
+                                                          PDU::endian_type endian,
+                                        type_to_type<std::vector<std::pair<uint8_t, uint8_t> > >);
+        std::pair<uint8_t, uint8_t> convert(const uint8_t* ptr, uint32_t data_size,
+                                            PDU::endian_type endian,
+                                            type_to_type<std::pair<uint8_t, uint8_t> >);
+        std::pair<uint16_t, uint32_t> convert(const uint8_t* ptr, uint32_t data_size,
+                                              PDU::endian_type endian,
+                                              type_to_type<std::pair<uint16_t, uint32_t> >);
+        std::pair<uint32_t, uint32_t> convert(const uint8_t* ptr, uint32_t data_size,
+                                              PDU::endian_type endian,
+                                              type_to_type<std::pair<uint32_t, uint32_t> >);
+    } // Converters
     
-    template <typename T, typename = void>
     struct converter {
-        template <typename X, typename PDUType>
-        static T convert(const PDUOption<X, PDUType>& opt) {
+        template <typename T, typename X, typename PDUType>
+        static T do_convert(const PDUOption<X, PDUType>& opt, type_to_type<T>) {
             return T::from_option(opt);
         }
-    };
-    
-    template <>
-    struct converter<uint8_t> {
-        template <typename X, typename PDUType>
-        static uint8_t convert(const PDUOption<X, PDUType>& opt) {
-            if (opt.data_size() != 1) {
-                throw malformed_option();
-            }
-            return* opt.data_ptr();
-        }
-    };
-    
-    template<>
-    struct converter<uint16_t> {
-        template<typename X, typename PDUType>
-        static uint16_t convert(const PDUOption<X, PDUType>& opt) {
-            return convert_to_integral<uint16_t>(opt);
-        }
-    };
-    
-    template<>
-    struct converter<uint32_t> {
-        template<typename X, typename PDUType>
-        static uint32_t convert(const PDUOption<X, PDUType>& opt) {
-            return convert_to_integral<uint32_t>(opt);
-        }
-    };
-    
-    template<>
-    struct converter<uint64_t> {
-        template<typename X, typename PDUType>
-        static uint64_t convert(const PDUOption<X, PDUType>& opt) {
-            return convert_to_integral<uint64_t>(opt);
-        }
-    };
 
-    template<size_t n>
-    struct converter<HWAddress<n> > {
-        template<typename X, typename PDUType>
-        static HWAddress<n> convert(const PDUOption<X, PDUType>& opt) {
-            if (opt.data_size() != n) {
-                throw malformed_option();
-            }
-            return HWAddress<n>(opt.data_ptr());
+        template <typename U, typename X, typename PDUType>
+        static U do_convert(const PDUOption<X, PDUType>& opt, type_to_type<uint8_t> type) {
+            return Converters::convert(opt.data_ptr(), opt.data_size(),
+                                       PDUType::endianness, type);
         }
-    };
 
-    template<>
-    struct converter<IPv4Address> {
-        template<typename X, typename PDUType>
-        static IPv4Address convert(const PDUOption<X, PDUType>& opt) {
-            if (opt.data_size() != sizeof(uint32_t)) {
-                throw malformed_option();
-            }
-            const uint32_t* ptr = (const uint32_t*)opt.data_ptr();
-            if (PDUType::endianness == PDUType::BE) {
-                return IPv4Address(*ptr);
-            }
-            else {
-                return IPv4Address(Endian::change_endian(*ptr));
-            }
+        template <typename U, typename X, typename PDUType>
+        static U do_convert(const PDUOption<X, PDUType>& opt, type_to_type<uint16_t> type) {
+            return Converters::convert(opt.data_ptr(), opt.data_size(),
+                                       PDUType::endianness, type);
         }
-    };
 
-    template<>
-    struct converter<IPv6Address> {
-        template<typename X, typename PDUType>
-        static IPv6Address convert(const PDUOption<X, PDUType>& opt) {
-            if (opt.data_size() != IPv6Address::address_size) {
-                throw malformed_option();
-            }
-            return IPv6Address(opt.data_ptr());
+        template <typename U, typename X, typename PDUType>
+        static U do_convert(const PDUOption<X, PDUType>& opt, type_to_type<uint32_t> type) {
+            return Converters::convert(opt.data_ptr(), opt.data_size(),
+                                       PDUType::endianness, type);
         }
-    };
-    
-    template<>
-    struct converter<std::string> {
-        template<typename X, typename PDUType>
-        static std::string convert(const PDUOption<X, PDUType>& opt) {
-            return std::string(
-                opt.data_ptr(),
-                opt.data_ptr() + opt.data_size()
-            );
+
+        template <typename U, typename X, typename PDUType>
+        static U do_convert(const PDUOption<X, PDUType>& opt, type_to_type<uint64_t> type) {
+            return Converters::convert(opt.data_ptr(), opt.data_size(),
+                                       PDUType::endianness, type);
         }
-    };
-    
-    template<>
-    struct converter<std::vector<float> > {
-        template<typename X, typename PDUType>
-        static std::vector<float> convert(const PDUOption<X, PDUType>& opt) {
-            std::vector<float> output;
-            const uint8_t* ptr = opt.data_ptr(), *end = ptr + opt.data_size();
-            while (ptr != end) {
-                output.push_back(float(*(ptr++) & 0x7f) / 2);
-            }
-            return output;
+
+        template <typename U, typename X, typename PDUType>
+        static U do_convert(const PDUOption<X, PDUType>& opt, type_to_type<HWAddress<6> > type) {
+            return Converters::convert(opt.data_ptr(), opt.data_size(),
+                                       PDUType::endianness, type);
         }
-    };
-    
-    template<typename T>
-    struct converter<std::vector<T>, typename enable_if<is_unsigned_integral<T>::value>::type> {
-        template<typename X, typename PDUType>
-        static std::vector<T> convert(const PDUOption<X, PDUType>& opt) {
-            if (opt.data_size() % sizeof(T) != 0) {
-                throw malformed_option();
-            }
-            const T* ptr = (const T*)opt.data_ptr();
-            const T* end = (const T*)(opt.data_ptr() + opt.data_size());
-            
-            std::vector<T> output(std::distance(ptr, end));
-            typename std::vector<T>::iterator it = output.begin();
-            while (ptr < end) {
-                if (PDUType::endianness == PDUType::BE) {
-                    *it++ = Endian::be_to_host(*ptr++);
-                }
-                else {
-                    *it++ = Endian::le_to_host(*ptr++);
-                }
-            }
-            return output;
+
+        template <typename U, typename X, typename PDUType>
+        static U do_convert(const PDUOption<X, PDUType>& opt, type_to_type<IPv4Address> type) {
+            return Converters::convert(opt.data_ptr(), opt.data_size(),
+                                       PDUType::endianness, type);
         }
-    };
-    
-    template<typename T, typename U>
-    struct converter<
-            std::vector<std::pair<T, U> >, 
-            typename enable_if<
-                is_unsigned_integral<T>::value && is_unsigned_integral<U>::value
-            >::type
-    > {
-        template<typename X, typename PDUType>
-        static std::vector<std::pair<T, U> > convert(const PDUOption<X, PDUType>& opt) {
-            if (opt.data_size() % (sizeof(T) + sizeof(U)) != 0) {
-                throw malformed_option();
-            }
-            const uint8_t* ptr = opt.data_ptr(), *end = ptr + opt.data_size();
-            
-            std::vector<std::pair<T, U> > output;
-            while (ptr < end) {
-                std::pair<T, U> data;
-                data.first = *(const T*)ptr;
-                ptr += sizeof(T);
-                data.second = *(const U*)ptr;
-                ptr += sizeof(U);
-                if (PDUType::endianness == PDUType::BE) {
-                    data.first = Endian::be_to_host(data.first);
-                    data.second = Endian::be_to_host(data.second);
-                }
-                else {
-                    data.first = Endian::le_to_host(data.first);
-                    data.second = Endian::le_to_host(data.second);
-                }
-                output.push_back(data);
-            }
-            return output;
+
+        template <typename U, typename X, typename PDUType>
+        static U do_convert(const PDUOption<X, PDUType>& opt, type_to_type<IPv6Address> type) {
+            return Converters::convert(opt.data_ptr(), opt.data_size(),
+                                       PDUType::endianness, type);
         }
-    };
-    
-    template<>
-    struct converter<std::vector<IPv4Address> > {
-        template<typename X, typename PDUType>
-        static std::vector<IPv4Address> convert(const PDUOption<X, PDUType>& opt) {
-            if (opt.data_size() % 4 != 0) {
-                throw malformed_option();
-            }
-            const uint32_t* ptr = (const uint32_t*)opt.data_ptr();
-            const uint32_t* end = (const uint32_t*)(opt.data_ptr() + opt.data_size());
-            
-            std::vector<IPv4Address> output(std::distance(ptr, end));
-            std::vector<IPv4Address>::iterator it = output.begin();
-            while (ptr < end) {
-                if (PDUType::endianness == PDUType::BE) {
-                    *it++ = IPv4Address(*ptr++);
-                }
-                else {
-                    *it++ = IPv4Address(Endian::change_endian(*ptr++));
-                }
-            }
-            return output;
+
+        template <typename U, typename X, typename PDUType>
+        static U do_convert(const PDUOption<X, PDUType>& opt,
+                            type_to_type<std::string> type) {
+            return Converters::convert(opt.data_ptr(), opt.data_size(),
+                                       PDUType::endianness, type);
         }
-    };
-    
-    template<>
-    struct converter<std::vector<IPv6Address> > {
-        template<typename X, typename PDUType>
-        static std::vector<IPv6Address> convert(const PDUOption<X, PDUType>& opt) {
-            if (opt.data_size() % IPv6Address::address_size != 0) {
-                throw malformed_option();
-            }
-            const uint8_t* ptr = opt.data_ptr(), *end = opt.data_ptr() + opt.data_size();
-            std::vector<IPv6Address> output;
-            while (ptr < end) {
-                output.push_back(IPv6Address(ptr));
-                ptr += IPv6Address::address_size;
-            }
-            return output;
+
+        template <typename U, typename X, typename PDUType, typename Z>
+        static U do_convert(const PDUOption<X, PDUType>& opt,
+                            type_to_type<std::vector<Z> > type) {
+            return Converters::convert(opt.data_ptr(), opt.data_size(),
+                                       PDUType::endianness, type);
         }
-    };
-    
-    template<typename T, typename U>
-    struct converter<
-            std::pair<T, U>, 
-            typename enable_if<
-                is_unsigned_integral<T>::value && is_unsigned_integral<U>::value
-            >::type
-    > {
-        template<typename X, typename PDUType>
-        static std::pair<T, U> convert(const PDUOption<X, PDUType>& opt) {
-            if (opt.data_size() != sizeof(T) + sizeof(U)) {
-                throw malformed_option();
-            }
-            std::pair<T, U> output;
-            std::memcpy(&output.first, opt.data_ptr(), sizeof(T));
-            std::memcpy(&output.second, opt.data_ptr() + sizeof(T), sizeof(U));
-            if (PDUType::endianness == PDUType::BE) {
-                output.first = Endian::be_to_host(output.first);
-                output.second = Endian::be_to_host(output.second);
-            }
-            else {
-                output.first = Endian::le_to_host(output.first);
-                output.second = Endian::le_to_host(output.second);
-            }
-            return output;
+
+        template <typename U, typename X, typename PDUType, typename Z, typename W>
+        static U do_convert(const PDUOption<X, PDUType>& opt,
+                            type_to_type<std::pair<Z, W> > type) {
+            return Converters::convert(opt.data_ptr(), opt.data_size(),
+                                       PDUType::endianness, type);
+        }
+
+        template <typename T, typename X, typename PDUType>
+        static T convert(const PDUOption<X, PDUType>& opt) {
+            return do_convert<T>(opt, type_to_type<T>());
         }
     };
 }
@@ -504,7 +379,7 @@ public:
      */
     template<typename T>
     T to() const {
-        return Internals::converter<T>::convert(*this);
+        return Internals::converter::convert<T>(*this);
     }
 private:
     template<typename ForwardIterator>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3302606..d2dbcb4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -52,6 +52,7 @@ set(SOURCES
     radiotap.cpp
     address_range.cpp
     pdu_iterator.cpp
+    pdu_option.cpp
     rawpdu.cpp
     rsn_information.cpp
     sll.cpp
diff --git a/src/pdu_option.cpp b/src/pdu_option.cpp
new file mode 100644
index 0000000..90b2450
--- /dev/null
+++ b/src/pdu_option.cpp
@@ -0,0 +1,276 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <algorithm>
+#include "pdu.h"
+#include "ip_address.h"
+#include "ipv6_address.h"
+#include "hw_address.h"
+#include "endianness.h"
+#include "pdu_option.h"
+
+using std::vector;
+using std::pair;
+using std::string;
+using std::memcpy;
+using std::distance;
+
+namespace Tins {
+namespace Internals {
+namespace Converters {
+
+template <typename T>
+T convert_to_integral(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian) {
+    if (data_size != sizeof(T)) {
+        throw malformed_option();
+    }
+    T data = *(T*)ptr;
+    if (endian == PDU::BE) {
+        data = Endian::be_to_host(data);
+    }
+    else {
+        data = Endian::le_to_host(data);
+    }
+    return data;
+}
+
+template<typename T>
+vector<T> convert_vector(const uint8_t* u8_ptr, uint32_t data_size, PDU::endian_type endian) {
+    if (data_size % sizeof(T) != 0) {
+        throw malformed_option();
+    }
+    const T* ptr = (const T*)u8_ptr;
+    const T* end = (const T*)(ptr + data_size / sizeof(T));
+
+    vector<T> output(distance(ptr, end));
+    typename vector<T>::iterator it = output.begin();
+    while (ptr < end) {
+        if (endian == PDU::BE) {
+            *it++ = Endian::be_to_host(*ptr++);
+        }
+        else {
+            *it++ = Endian::le_to_host(*ptr++);
+        }
+    }
+    return output;
+}
+
+template<typename T, typename U,
+         typename = typename enable_if<is_unsigned_integral<T>::value &&
+                                       is_unsigned_integral<U>::value>::type>
+vector<std::pair<T, U> > convert_vector(const uint8_t* ptr, uint32_t data_size,
+                                        PDU::endian_type endian) {
+    if (data_size % (sizeof(T) + sizeof(U)) != 0) {
+        throw malformed_option();
+    }
+    const uint8_t* end = ptr + data_size;
+
+    std::vector<std::pair<T, U> > output;
+    while (ptr < end) {
+        pair<T, U> data;
+        data.first = *(const T*)ptr;
+        ptr += sizeof(T);
+        data.second = *(const U*)ptr;
+        ptr += sizeof(U);
+        if (endian == PDU::BE) {
+            data.first = Endian::be_to_host(data.first);
+            data.second = Endian::be_to_host(data.second);
+        }
+        else {
+            data.first = Endian::le_to_host(data.first);
+            data.second = Endian::le_to_host(data.second);
+        }
+        output.push_back(data);
+    }
+    return output;
+}
+
+template<typename T, typename U,
+         typename = typename enable_if<is_unsigned_integral<T>::value &&
+                                       is_unsigned_integral<U>::value>::type>
+std::pair<T, U> convert_pair(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian) {
+    if (data_size != sizeof(T) + sizeof(U)) {
+        throw malformed_option();
+    }
+    pair<T, U> output;
+    memcpy(&output.first, ptr, sizeof(T));
+    memcpy(&output.second, ptr + sizeof(T), sizeof(U));
+    if (endian == PDU::BE) {
+        output.first = Endian::be_to_host(output.first);
+        output.second = Endian::be_to_host(output.second);
+    }
+    else {
+        output.first = Endian::le_to_host(output.first);
+        output.second = Endian::le_to_host(output.second);
+    }
+    return output;
+}
+
+uint8_t convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type, type_to_type<uint8_t>) {
+    if (data_size != 1) {
+        throw malformed_option();
+    }
+    return *ptr;
+}
+
+uint16_t convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian,
+                 type_to_type<uint16_t>) {
+    return convert_to_integral<uint16_t>(ptr, data_size, endian);
+
+}
+
+uint32_t convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian,
+                 type_to_type<uint32_t>) {
+    return convert_to_integral<uint32_t>(ptr, data_size, endian);
+}
+
+uint64_t convert(const uint8_t* ptr, uint32_t data_size,
+                                      PDU::endian_type endian, type_to_type<uint64_t>) {
+    return convert_to_integral<uint64_t>(ptr, data_size, endian);
+}
+
+HWAddress<6> convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type,
+                     type_to_type<HWAddress<6> >) {
+    if (data_size != 6) {
+        throw malformed_option();
+    }
+    return HWAddress<6>(ptr);
+}
+
+IPv4Address convert(const uint8_t* u8_ptr, uint32_t data_size, PDU::endian_type endian,
+                    type_to_type<IPv4Address>) {
+    if (data_size != sizeof(uint32_t)) {
+        throw malformed_option();
+    }
+    const uint32_t* ptr = (const uint32_t*)u8_ptr;
+    if (endian == PDU::BE) {
+        return IPv4Address(*ptr);
+    }
+    else {
+        return IPv4Address(Endian::change_endian(*ptr));
+    }
+}
+
+IPv6Address convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type,
+                    type_to_type<IPv6Address>) {
+    if (data_size != IPv6Address::address_size) {
+        throw malformed_option();
+    }
+    return IPv6Address(ptr);
+}
+
+string convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type,
+               type_to_type<string>) {
+    return string(ptr, ptr + data_size);
+}
+
+vector<float> convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type,
+                      type_to_type<vector<float> >) {
+    vector<float> output;
+    const uint8_t* end = ptr + data_size;
+    while (ptr != end) {
+        output.push_back(float(*(ptr++) & 0x7f) / 2);
+    }
+    return output;
+}
+
+vector<uint8_t> convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian,
+                        type_to_type<vector<uint8_t> >) {
+    return convert_vector<uint8_t>(ptr, data_size, endian);
+}
+
+vector<uint16_t> convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian,
+                         type_to_type<vector<uint16_t> >) {
+    return convert_vector<uint16_t>(ptr, data_size, endian);
+}
+
+vector<uint32_t> convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian,
+                         type_to_type<vector<uint32_t> >) {
+    return convert_vector<uint32_t>(ptr, data_size, endian);
+}
+
+vector<IPv4Address> convert(const uint8_t* u8_ptr, uint32_t data_size, PDU::endian_type endian,
+                            type_to_type<vector<IPv4Address> >) {
+    if (data_size % 4 != 0) {
+        throw malformed_option();
+    }
+    const uint32_t* ptr = (const uint32_t*)u8_ptr;
+    const uint32_t* end = (const uint32_t*)(ptr + data_size / sizeof(uint32_t));
+
+    vector<IPv4Address> output(distance(ptr, end));
+    vector<IPv4Address>::iterator it = output.begin();
+    while (ptr < end) {
+        if (endian == PDU::BE) {
+            *it++ = IPv4Address(*ptr++);
+        }
+        else {
+            *it++ = IPv4Address(Endian::change_endian(*ptr++));
+        }
+    }
+    return output;
+}
+
+vector<IPv6Address> convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type,
+                            type_to_type<vector<IPv6Address> >) {
+    if (data_size % IPv6Address::address_size != 0) {
+        throw malformed_option();
+    }
+    const uint8_t* end = ptr + data_size;
+    vector<IPv6Address> output;
+    while (ptr < end) {
+        output.push_back(IPv6Address(ptr));
+        ptr += IPv6Address::address_size;
+    }
+    return output;
+}
+
+vector<pair<uint8_t, uint8_t>> convert(const uint8_t* ptr, uint32_t data_size,
+                                       PDU::endian_type endian,
+                                       type_to_type<vector<pair<uint8_t, uint8_t> > >) {
+    return convert_vector<uint8_t, uint8_t>(ptr, data_size, endian);
+}
+
+pair<uint8_t, uint8_t> convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian,
+                               type_to_type<pair<uint8_t, uint8_t> >) {
+    return convert_pair<uint8_t, uint8_t>(ptr, data_size, endian);
+}
+
+pair<uint16_t, uint32_t> convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian,
+                                 type_to_type<pair<uint16_t, uint32_t> >) {
+    return convert_pair<uint16_t, uint32_t>(ptr, data_size, endian);
+}
+
+pair<uint32_t, uint32_t> convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian,
+                                 type_to_type<pair<uint32_t, uint32_t> >) {
+    return convert_pair<uint32_t, uint32_t>(ptr, data_size, endian);
+}
+
+} // Converters
+} // Internals
+} // Tins
diff --git a/src/rsn_information.cpp b/src/rsn_information.cpp
index 55c67ba..9ab4408 100644
--- a/src/rsn_information.cpp
+++ b/src/rsn_information.cpp
@@ -33,6 +33,7 @@
 #include <cstring>
 #include <stdexcept>
 #include "exceptions.h"
+#include "pdu.h"
 #include "pdu_option.h"
 #include "memory_helpers.h"
 #include "dot11/dot11_base.h"

From 1a83801722181534c70bba08356caedaaacbf5b1 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sat, 13 May 2017 10:43:29 -0700
Subject: [PATCH 46/73] Remove useless includes

---
 include/tins/dhcpv6.h         | 48 +---------------------------------
 include/tins/snap.h           |  1 -
 src/bootp.cpp                 |  1 -
 src/dhcp.cpp                  |  1 -
 src/dhcpv6.cpp                | 49 +++++++++++++++++++++++++++++++++++
 src/dns.cpp                   |  6 +----
 src/dot1q.cpp                 |  1 -
 src/dot3.cpp                  |  1 -
 src/eapol.cpp                 |  1 -
 src/hw_address.cpp            |  2 +-
 src/icmp.cpp                  |  1 -
 src/ip.cpp                    |  1 -
 src/ip_address.cpp            |  1 -
 src/llc.cpp                   |  1 -
 src/loopback.cpp              |  1 -
 src/offline_packet_filter.cpp |  1 -
 src/packet_writer.cpp         |  1 -
 src/pktap.cpp                 |  1 -
 src/radiotap.cpp              |  1 -
 src/rsn_information.cpp       |  1 -
 src/sll.cpp                   |  1 -
 src/snap.cpp                  |  1 -
 src/udp.cpp                   |  1 -
 src/utils/resolve_utils.cpp   |  2 +-
 src/utils/routing_utils.cpp   |  1 -
 25 files changed, 53 insertions(+), 74 deletions(-)

diff --git a/include/tins/dhcpv6.h b/include/tins/dhcpv6.h
index 9af14a6..af010ac 100644
--- a/include/tins/dhcpv6.h
+++ b/include/tins/dhcpv6.h
@@ -917,54 +917,8 @@ private:
     uint32_t options_size_;
     ipaddress_type link_addr_, peer_addr_;
     options_type options_;
-};   
+};
 
-namespace Internals {
-
-template<typename InputIterator>
-void class_option_data2option(InputIterator start,
-                              InputIterator end, 
-                              std::vector<uint8_t>& buffer,
-                              size_t start_index = 0) {
-    size_t index = start_index;
-    uint16_t uint16_t_buffer;
-    while (start != end) {
-        buffer.resize(buffer.size() + sizeof(uint16_t) + start->size());
-        uint16_t_buffer = Endian::host_to_be(static_cast<uint16_t>(start->size()));
-        std::memcpy(&buffer[index], &uint16_t_buffer, sizeof(uint16_t));
-        index += sizeof(uint16_t);
-        std::copy(start->begin(), start->end(), buffer.begin() + index);
-        index += start->size();
-        
-        start++;
-    }
-}
-
-template<typename OutputType>
-OutputType option2class_option_data(const uint8_t* ptr, uint32_t total_sz) {
-    typedef typename OutputType::value_type value_type;
-    OutputType output;
-    size_t index = 0;
-    while (index + 2 < total_sz) {
-        uint16_t size;
-        std::memcpy(&size, ptr + index, sizeof(uint16_t));
-        size = Endian::be_to_host(size);
-        index += sizeof(uint16_t);
-        if (index + size > total_sz) {
-            throw option_not_found();
-        }
-        output.push_back(
-            value_type(ptr + index, ptr + index + size)
-        );
-        index += size;
-    }
-    if (index != total_sz) {
-        throw malformed_option();
-    }
-    return output;
-}
-
-} // Internals 
 } // Tins
 
 #endif // TINS_DHCPV6_H
diff --git a/include/tins/snap.h b/include/tins/snap.h
index 3035254..41efafa 100644
--- a/include/tins/snap.h
+++ b/include/tins/snap.h
@@ -30,7 +30,6 @@
 #ifndef TINS_SNAP_H
 #define TINS_SNAP_H
 
-
 #include <stdint.h>
 #include "pdu.h"
 #include "macros.h"
diff --git a/src/bootp.cpp b/src/bootp.cpp
index 8ba8e57..2543bf2 100644
--- a/src/bootp.cpp
+++ b/src/bootp.cpp
@@ -27,7 +27,6 @@
  *
  */
 
-#include <stdexcept>
 #include <cstring>
 #include "bootp.h"
 #include "exceptions.h"
diff --git a/src/dhcp.cpp b/src/dhcp.cpp
index 2a86289..142f4a7 100644
--- a/src/dhcp.cpp
+++ b/src/dhcp.cpp
@@ -27,7 +27,6 @@
  *
  */
 
-#include <stdexcept>
 #include <cstring>
 #include "endianness.h"
 #include "dhcp.h"
diff --git a/src/dhcpv6.cpp b/src/dhcpv6.cpp
index a4271c7..6d6285e 100644
--- a/src/dhcpv6.cpp
+++ b/src/dhcpv6.cpp
@@ -42,6 +42,55 @@ using Tins::Memory::OutputMemoryStream;
 
 namespace Tins {
 
+namespace Internals {
+
+template<typename InputIterator>
+void class_option_data2option(InputIterator start,
+                              InputIterator end, 
+                              vector<uint8_t>& buffer,
+                              size_t start_index = 0) {
+    size_t index = start_index;
+    uint16_t uint16_t_buffer;
+    while (start != end) {
+        buffer.resize(buffer.size() + sizeof(uint16_t) + start->size());
+        uint16_t_buffer = Endian::host_to_be(static_cast<uint16_t>(start->size()));
+        memcpy(&buffer[index], &uint16_t_buffer, sizeof(uint16_t));
+        index += sizeof(uint16_t);
+        if (!start->empty()) {
+            memcpy(&*buffer.begin() + index, &*start->begin(), start->size());
+        }
+        index += start->size();
+        
+        start++;
+    }
+}
+
+template<typename OutputType>
+OutputType option2class_option_data(const uint8_t* ptr, uint32_t total_sz) {
+    typedef typename OutputType::value_type value_type;
+    OutputType output;
+    size_t index = 0;
+    while (index + 2 < total_sz) {
+        uint16_t size;
+        memcpy(&size, ptr + index, sizeof(uint16_t));
+        size = Endian::be_to_host(size);
+        index += sizeof(uint16_t);
+        if (index + size > total_sz) {
+            throw option_not_found();
+        }
+        output.push_back(
+            value_type(ptr + index, ptr + index + size)
+        );
+        index += size;
+    }
+    if (index != total_sz) {
+        throw malformed_option();
+    }
+    return output;
+}
+
+} // Internals 
+
 PDU::metadata DHCPv6::extract_metadata(const uint8_t* /*buffer*/, uint32_t total_sz) {
     if (TINS_UNLIKELY(total_sz < 2)) {
         throw malformed_packet();
diff --git a/src/dns.cpp b/src/dns.cpp
index 2ddc72c..f700ef2 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -28,9 +28,6 @@
  */
 
 #include <utility>
-#include <stdexcept>
-#include <sstream>
-#include <memory>
 #include <cstdio>
 #include "dns.h"
 #include "ip_address.h"
@@ -40,7 +37,6 @@
 #include "memory_helpers.h"
 
 using std::string;
-using std::copy;
 using std::memcpy;
 using std::list;
 using std::make_pair;
@@ -372,7 +368,7 @@ uint32_t DNS::compose_name(const uint8_t* ptr, char* out_ptr) const {
             if (current_out_ptr != out_ptr) {
                 *current_out_ptr++ = '.';
             }
-            copy(ptr, ptr + size, current_out_ptr);
+            memcpy(current_out_ptr, ptr, size);
             current_out_ptr += size;
             ptr += size;
         }
diff --git a/src/dot1q.cpp b/src/dot1q.cpp
index f3f5fed..fde47a0 100644
--- a/src/dot1q.cpp
+++ b/src/dot1q.cpp
@@ -27,7 +27,6 @@
  *
  */
 
-#include <stdexcept>
 #include <cstring>
 #include "dot1q.h"
 #include "exceptions.h"
diff --git a/src/dot3.cpp b/src/dot3.cpp
index 5a8311e..686893f 100644
--- a/src/dot3.cpp
+++ b/src/dot3.cpp
@@ -28,7 +28,6 @@
  */
 
 #include <cstring>
-#include <stdexcept>
 #include "macros.h"
 #ifndef _WIN32
     #if defined(BSD) || defined(__FreeBSD_kernel__)
diff --git a/src/eapol.cpp b/src/eapol.cpp
index 4751db2..af6d0e6 100644
--- a/src/eapol.cpp
+++ b/src/eapol.cpp
@@ -28,7 +28,6 @@
  */
 
 #include <cstring>
-#include <stdexcept>
 #include "eapol.h"
 #include "exceptions.h"
 #include "rawpdu.h"
diff --git a/src/hw_address.cpp b/src/hw_address.cpp
index 397a394..08bb42d 100644
--- a/src/hw_address.cpp
+++ b/src/hw_address.cpp
@@ -29,9 +29,9 @@
 
 #include <sstream>
 #include <iomanip>
-#include <stdexcept>
 #include <algorithm>
 #include "hw_address.h"
+#include "exceptions.h"
 
 using std::string;
 using std::ostream;
diff --git a/src/icmp.cpp b/src/icmp.cpp
index 6496c60..11c9878 100644
--- a/src/icmp.cpp
+++ b/src/icmp.cpp
@@ -27,7 +27,6 @@
  *
  */
 
-#include <stdexcept>
 #include <cstring>
 #ifndef _WIN32
     #include <netinet/in.h>
diff --git a/src/ip.cpp b/src/ip.cpp
index e5c17cb..b970eb5 100644
--- a/src/ip.cpp
+++ b/src/ip.cpp
@@ -27,7 +27,6 @@
  *
  */
 
-#include <stdexcept>
 #include <cstring>
 #ifndef _WIN32
     #include <netdb.h>
diff --git a/src/ip_address.cpp b/src/ip_address.cpp
index 015311a..d6d1c95 100644
--- a/src/ip_address.cpp
+++ b/src/ip_address.cpp
@@ -37,7 +37,6 @@
     // std::hash
     #include <memory>
 #endif // TINS_IS_CXX11
-#include <stdexcept>
 #include <sstream>
 #include <iostream>
 #include "ip_address.h"
diff --git a/src/llc.cpp b/src/llc.cpp
index 371aa01..2391053 100644
--- a/src/llc.cpp
+++ b/src/llc.cpp
@@ -27,7 +27,6 @@
  *
  */
 
-#include <stdexcept>
 #include <cstring>
 #include "llc.h"
 #include "stp.h"
diff --git a/src/loopback.cpp b/src/loopback.cpp
index 20899cf..9246505 100644
--- a/src/loopback.cpp
+++ b/src/loopback.cpp
@@ -37,7 +37,6 @@
 #else
     #include <ws2tcpip.h>
 #endif
-#include <stdexcept>
 #include <cstring>
 #include "loopback.h"
 #include "packet_sender.h"
diff --git a/src/offline_packet_filter.cpp b/src/offline_packet_filter.cpp
index 74710b0..7cd39b2 100644
--- a/src/offline_packet_filter.cpp
+++ b/src/offline_packet_filter.cpp
@@ -27,7 +27,6 @@
  *
  */
 
-#include <stdexcept>
 #include <string.h>
 #include "offline_packet_filter.h"
 #include "pdu.h"
diff --git a/src/packet_writer.cpp b/src/packet_writer.cpp
index 5e74b9e..b33d9b1 100644
--- a/src/packet_writer.cpp
+++ b/src/packet_writer.cpp
@@ -30,7 +30,6 @@
 #ifndef _WIN32
     #include <sys/time.h>
 #endif
-#include <stdexcept>
 #include <string.h>
 #include "packet_writer.h"
 #include "packet.h"
diff --git a/src/pktap.cpp b/src/pktap.cpp
index 7bb6f24..c58b8a5 100644
--- a/src/pktap.cpp
+++ b/src/pktap.cpp
@@ -27,7 +27,6 @@
  *
  */
 
-#include <stdexcept>
 #include <cstring>
 #include "exceptions.h"
 #include "pktap.h"
diff --git a/src/radiotap.cpp b/src/radiotap.cpp
index d6a7a04..8902c0f 100644
--- a/src/radiotap.cpp
+++ b/src/radiotap.cpp
@@ -32,7 +32,6 @@
 #ifdef TINS_HAVE_DOT11
 
 #include <cstring>
-#include <stdexcept>
 #include "macros.h"
 #ifndef _WIN32
     #if defined(BSD) || defined(__FreeBSD_kernel__)
diff --git a/src/rsn_information.cpp b/src/rsn_information.cpp
index 9ab4408..f88d9cb 100644
--- a/src/rsn_information.cpp
+++ b/src/rsn_information.cpp
@@ -31,7 +31,6 @@
 #ifdef TINS_HAVE_DOT11
 
 #include <cstring>
-#include <stdexcept>
 #include "exceptions.h"
 #include "pdu.h"
 #include "pdu_option.h"
diff --git a/src/sll.cpp b/src/sll.cpp
index c21d062..ec7f6a8 100644
--- a/src/sll.cpp
+++ b/src/sll.cpp
@@ -27,7 +27,6 @@
  *
  */
 
-#include <stdexcept>
 #include <cstring>
 #include "sll.h"
 #include "exceptions.h"
diff --git a/src/snap.cpp b/src/snap.cpp
index ebb5c4d..644ea6f 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -28,7 +28,6 @@
  */
 
 #include <cstring>
-#include <stdexcept>
 #ifndef _WIN32
     #include <sys/types.h>
     #include <net/ethernet.h>
diff --git a/src/udp.cpp b/src/udp.cpp
index fbec788..ed0ffb4 100644
--- a/src/udp.cpp
+++ b/src/udp.cpp
@@ -27,7 +27,6 @@
  *
  */
 
-#include <stdexcept>
 #include <cstring>
 #include "udp.h"
 #include "constants.h"
diff --git a/src/utils/resolve_utils.cpp b/src/utils/resolve_utils.cpp
index 05c6747..5039c0c 100644
--- a/src/utils/resolve_utils.cpp
+++ b/src/utils/resolve_utils.cpp
@@ -48,7 +48,7 @@
     #include <iphlpapi.h>
     #undef interface
 #endif
-#include <stdexcept>
+#include "exceptions.h"
 #include "ip_address.h"
 #include "ipv6_address.h"
 #include "hw_address.h"
diff --git a/src/utils/routing_utils.cpp b/src/utils/routing_utils.cpp
index 57980ac..f16b9bd 100644
--- a/src/utils/routing_utils.cpp
+++ b/src/utils/routing_utils.cpp
@@ -55,7 +55,6 @@
 #endif
 #include <set>
 #include <fstream>
-#include <stdexcept>
 #include "network_interface.h"
 #include "exceptions.h"
 

From 1ef5be352a0fe2d4a76853aa0cdc0cb5ac612d96 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sat, 13 May 2017 10:59:15 -0700
Subject: [PATCH 47/73] Use custom exceptions everywhere

---
 include/tins/address_range.h   |  4 ++--
 include/tins/exceptions.h      | 12 ++++++++++++
 src/dhcpv6.cpp                 |  7 +++----
 src/dot11/dot11_mgmt.cpp       |  5 ++---
 src/ethernetII.cpp             |  2 +-
 src/hw_address.cpp             |  4 ++--
 src/icmp_extension.cpp         |  2 --
 src/packet_sender.cpp          | 11 +++++------
 src/sniffer.cpp                | 13 ++++++-------
 src/tcp_ip/flow.cpp            |  1 -
 src/tcp_ip/stream.cpp          |  2 --
 src/tcp_ip/stream_follower.cpp |  1 -
 src/utils/resolve_utils.cpp    |  5 ++---
 src/utils/routing_utils.cpp    |  5 ++---
 14 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/include/tins/address_range.h b/include/tins/address_range.h
index 89a753a..2093637 100644
--- a/include/tins/address_range.h
+++ b/include/tins/address_range.h
@@ -30,9 +30,9 @@
 #ifndef TINS_ADDRESS_RANGE
 #define TINS_ADDRESS_RANGE
 
-#include <stdexcept>
 #include <iterator>
 #include "endianness.h"
+#include "exceptions.h"
 #include "detail/address_helpers.h"
 
 namespace Tins {
@@ -198,7 +198,7 @@ public:
     AddressRange(const address_type& first, const address_type& last, bool only_hosts = false)
     : first_(first), last_(last), only_hosts_(only_hosts){
         if (last_ < first_) {
-            throw std::runtime_error("Invalid address range");
+            throw exception_base("Invalid address range");
         }
     }
 
diff --git a/include/tins/exceptions.h b/include/tins/exceptions.h
index 0b6405a..cd841ca 100644
--- a/include/tins/exceptions.h
+++ b/include/tins/exceptions.h
@@ -100,6 +100,14 @@ public:
     invalid_address() : exception_base("Invalid address") { }
 };
 
+/**
+ * \brief Exception thrown when a PDU option is set using an incorrect value
+ */
+class invalid_option_value : public exception_base {
+public:
+    invalid_option_value() : exception_base("Invalid option value") { }
+};
+
 /**
  * \brief Exception thrown when a field is not present in frame.
  */
@@ -204,6 +212,10 @@ public:
     pcap_error(const char* message) : exception_base(message) {
 
     }
+
+    pcap_error(const std::string& message) : exception_base(message) {
+
+    }
 };
 
 /**
diff --git a/src/dhcpv6.cpp b/src/dhcpv6.cpp
index 6d6285e..4107920 100644
--- a/src/dhcpv6.cpp
+++ b/src/dhcpv6.cpp
@@ -33,7 +33,6 @@
 #include "memory_helpers.h"
 
 using std::vector;
-using std::runtime_error;
 using std::memcpy;
 using std::equal;
 
@@ -448,7 +447,7 @@ void DHCPv6::server_id(const duid_type& value) {
 DHCPv6::duid_llt DHCPv6::duid_llt::from_bytes(const uint8_t* buffer, uint32_t total_sz) {
     // at least one byte for lladdress
     if (total_sz < sizeof(uint16_t) + sizeof(uint32_t) + 1) {
-        throw runtime_error("Not enough size for a DUID_LLT identifier");
+        throw malformed_option();
     }
     InputMemoryStream stream(buffer, total_sz);
     duid_llt output;
@@ -470,7 +469,7 @@ PDU::serialization_type DHCPv6::duid_llt::serialize() const {
 DHCPv6::duid_en DHCPv6::duid_en::from_bytes(const uint8_t* buffer, uint32_t total_sz) {
     // at least one byte for identifier
     if (total_sz < sizeof(uint32_t) + 1) {
-        throw runtime_error("Not enough size for a DUID_en identifier");
+        throw malformed_option();
     }
     InputMemoryStream stream(buffer, total_sz);
     duid_en output;
@@ -490,7 +489,7 @@ PDU::serialization_type DHCPv6::duid_en::serialize() const {
 DHCPv6::duid_ll DHCPv6::duid_ll::from_bytes(const uint8_t* buffer, uint32_t total_sz) {
     // at least one byte for lladdress
     if (total_sz < sizeof(uint16_t) + 1) { 
-        throw runtime_error("Not enough size for a DUID_en identifier");
+        throw malformed_option();
     }
     InputMemoryStream stream(buffer, total_sz);
     duid_ll output;
diff --git a/src/dot11/dot11_mgmt.cpp b/src/dot11/dot11_mgmt.cpp
index 9c42ff9..aa9acb1 100644
--- a/src/dot11/dot11_mgmt.cpp
+++ b/src/dot11/dot11_mgmt.cpp
@@ -38,7 +38,6 @@ using std::string;
 using std::copy;
 using std::vector;
 using std::back_inserter;
-using std::runtime_error;
 using std::pair;
 using std::make_pair;
 
@@ -239,10 +238,10 @@ void Dot11ManagementFrame::ibss_dfs(const ibss_dfs_params& params) {
 void Dot11ManagementFrame::country(const country_params& params) {
     if ((params.first_channel.size() != params.number_channels.size()) ||
         (params.number_channels.size() != params.max_transmit_power.size())) {
-        throw runtime_error("The length of the lists are distinct");
+        throw invalid_option_value();
     }
     if (params.country.size() != 3) {
-        throw runtime_error("Invalid country identifier length");
+        throw invalid_option_value();
     }
     size_t sz = sizeof(uint8_t) * 3 * params.first_channel.size() + params.country.size();
     // Use 1 byte padding at the end if the length is odd.
diff --git a/src/ethernetII.cpp b/src/ethernetII.cpp
index 0c1021c..e09a36a 100644
--- a/src/ethernetII.cpp
+++ b/src/ethernetII.cpp
@@ -120,7 +120,7 @@ void EthernetII::send(PacketSender& sender, const NetworkInterface& iface) {
         sender.send_l2(*this, 0, 0, iface);
     #elif defined(_WIN32)
         // On Windows we can only send l2 PDUs using pcap_sendpacket
-        throw std::runtime_error("LIBTINS_USE_PCAP_SENDPACKET is not enabled");
+        throw feature_disabled();
     #else
         // Default GNU/Linux behaviour
         struct sockaddr_ll addr;
diff --git a/src/hw_address.cpp b/src/hw_address.cpp
index 08bb42d..e373b4f 100644
--- a/src/hw_address.cpp
+++ b/src/hw_address.cpp
@@ -83,7 +83,7 @@ void string_to_hw_address(const string& hw_addr, uint8_t* output, size_t output_
                 break;
             }
             else {
-                throw std::runtime_error("Invalid byte found");
+                throw invalid_address();
             }
             i++;
         }
@@ -94,7 +94,7 @@ void string_to_hw_address(const string& hw_addr, uint8_t* output, size_t output_
                 i++;
             }
             else {
-                throw std::runtime_error("Invalid separator");
+                throw invalid_address();
             }
         }
     }
diff --git a/src/icmp_extension.cpp b/src/icmp_extension.cpp
index 4169088..dfa9620 100644
--- a/src/icmp_extension.cpp
+++ b/src/icmp_extension.cpp
@@ -34,8 +34,6 @@
 #include "mpls.h"
 #include "utils/checksum_utils.h"
 
-using std::runtime_error;
-
 using Tins::Memory::InputMemoryStream;
 using Tins::Memory::OutputMemoryStream;
 
diff --git a/src/packet_sender.cpp b/src/packet_sender.cpp
index 58fafd1..2a9e320 100644
--- a/src/packet_sender.cpp
+++ b/src/packet_sender.cpp
@@ -185,13 +185,13 @@ pcap_t* PacketSender::make_pcap_handle(const NetworkInterface& iface) const {
     char error[PCAP_ERRBUF_SIZE];
     pcap_t* handle = pcap_create(TINS_PREFIX_INTERFACE(iface.name()).c_str(), error);
     if (!handle) {
-        throw runtime_error("Error opening pcap handle: " + string(error));
+        throw pcap_error("Error opening pcap handle: " + string(error));
     }
     if (pcap_set_promisc(handle, 1) < 0) {
-        throw runtime_error("Failed to set pcap handle promisc mode: " + string(pcap_geterr(handle)));
+        throw pcap_error("Failed to set pcap handle promisc mode: " + string(pcap_geterr(handle)));
     }
     if (pcap_activate(handle) < 0) {
-        throw runtime_error("Failed to activate pcap handle: " + string(pcap_geterr(handle)));
+        throw pcap_error("Failed to activate pcap handle: " + string(pcap_geterr(handle)));
     }
     return handle;
 }
@@ -362,8 +362,7 @@ void PacketSender::send_l2(PDU& pdu,
         pcap_t* handle = pcap_handles_[iface];
         const int buf_size = static_cast<int>(buffer.size());
         if (pcap_sendpacket(handle, (u_char*)&buffer[0], buf_size) != 0) {
-            throw runtime_error("Failed to send packet: " + 
-                                string(pcap_geterr(handle)));
+            throw pcap_error("Failed to send packet: " + string(pcap_geterr(handle)));
         }
     #else // TINS_HAVE_PACKET_SENDER_PCAP_SENDPACKET
         int sock = get_ether_socket(iface);
@@ -402,7 +401,7 @@ PDU* PacketSender::recv_l3(PDU& pdu,
     vector<int> sockets(1, sockets_[type]);
     if (type == IP_TCP_SOCKET || type == IP_UDP_SOCKET) {
         #ifdef BSD
-            throw runtime_error("Receiving L3 packets not supported on this platform");
+            throw feature_disabled();
         #endif
         open_l3_socket(ICMP_SOCKET);
         sockets.push_back(sockets_[ICMP_SOCKET]);
diff --git a/src/sniffer.cpp b/src/sniffer.cpp
index 3d385e8..e393a1d 100644
--- a/src/sniffer.cpp
+++ b/src/sniffer.cpp
@@ -46,7 +46,6 @@
 #include "detail/pdu_helpers.h"
 
 using std::string;
-using std::runtime_error;
 
 namespace Tins {
 
@@ -237,7 +236,7 @@ Sniffer::Sniffer(const string& device, const SnifferConfiguration& configuration
     char error[PCAP_ERRBUF_SIZE];
     pcap_t* phandle = pcap_create(TINS_PREFIX_INTERFACE(device).c_str(), error);
     if (!phandle) {
-        throw runtime_error(error);
+        throw pcap_error(error);
     }
     set_pcap_handle(phandle);
 
@@ -250,7 +249,7 @@ Sniffer::Sniffer(const string& device, const SnifferConfiguration& configuration
     // Configure the sniffer's attributes prior to activation.
     configuration.configure_sniffer_pre_activation(*this);
 
-    // Finally, activate the pcap. In case of error throw runtime_error
+    // Finally, activate the pcap. In case of error, throw
     if (pcap_activate(get_pcap_handle()) < 0) {
         throw pcap_error(pcap_geterr(get_pcap_handle()));
     }
@@ -273,7 +272,7 @@ Sniffer::Sniffer(const string& device,
     char error[PCAP_ERRBUF_SIZE];
     pcap_t* phandle = pcap_create(TINS_PREFIX_INTERFACE(device).c_str(), error);
     if (!phandle) {
-        throw runtime_error(error);
+        throw pcap_error(error);
     }
     set_pcap_handle(phandle);
 
@@ -286,7 +285,7 @@ Sniffer::Sniffer(const string& device,
     // Configure the sniffer's attributes prior to activation.
     configuration.configure_sniffer_pre_activation(*this);
 
-    // Finally, activate the pcap. In case of error throw runtime_error
+    // Finally, activate the pcap. In case of error, throw
     if (pcap_activate(get_pcap_handle()) < 0) {
         throw pcap_error(pcap_geterr(get_pcap_handle()));
     }
@@ -307,7 +306,7 @@ Sniffer::Sniffer(const string& device,
     char error[PCAP_ERRBUF_SIZE];
     pcap_t* phandle = pcap_create(TINS_PREFIX_INTERFACE(device).c_str(), error);
     if (!phandle) {
-        throw runtime_error(error);
+        throw pcap_error(error);
     }
     set_pcap_handle(phandle);
 
@@ -320,7 +319,7 @@ Sniffer::Sniffer(const string& device,
     // Configure the sniffer's attributes prior to activation.
     configuration.configure_sniffer_pre_activation(*this);
 
-    // Finally, activate the pcap. In case of error throw runtime_error
+    // Finally, activate the pcap. In case of error, throw
     if (pcap_activate(get_pcap_handle()) < 0) {
         throw pcap_error(pcap_geterr(get_pcap_handle()));
     }
diff --git a/src/tcp_ip/flow.cpp b/src/tcp_ip/flow.cpp
index e6d96b8..7a6a888 100644
--- a/src/tcp_ip/flow.cpp
+++ b/src/tcp_ip/flow.cpp
@@ -45,7 +45,6 @@
 using std::make_pair;
 using std::bind;
 using std::pair;
-using std::runtime_error;
 using std::numeric_limits;
 
 using Tins::Memory::OutputMemoryStream;
diff --git a/src/tcp_ip/stream.cpp b/src/tcp_ip/stream.cpp
index 7bb4bbd..2fb2ff0 100644
--- a/src/tcp_ip/stream.cpp
+++ b/src/tcp_ip/stream.cpp
@@ -45,10 +45,8 @@
 using std::make_pair;
 using std::bind;
 using std::pair;
-using std::runtime_error;
 using std::numeric_limits;
 
-
 namespace Tins {
 namespace TCPIP {
 
diff --git a/src/tcp_ip/stream_follower.cpp b/src/tcp_ip/stream_follower.cpp
index d0c3528..d0250ac 100644
--- a/src/tcp_ip/stream_follower.cpp
+++ b/src/tcp_ip/stream_follower.cpp
@@ -45,7 +45,6 @@
 using std::make_pair;
 using std::bind;
 using std::pair;
-using std::runtime_error;
 using std::numeric_limits;
 using std::chrono::system_clock;
 using std::chrono::minutes;
diff --git a/src/utils/resolve_utils.cpp b/src/utils/resolve_utils.cpp
index 5039c0c..b620c12 100644
--- a/src/utils/resolve_utils.cpp
+++ b/src/utils/resolve_utils.cpp
@@ -59,7 +59,6 @@
 #include "detail/smart_ptr.h"
 
 using std::string;
-using std::runtime_error;
 
 /** \cond */
 
@@ -72,7 +71,7 @@ addrinfo* resolve_domain(const string& to_resolve, int family) {
         return result;
     }
     else {
-        throw runtime_error("Could not resolve address");
+        throw Tins::exception_base("Could not resolve address");
     }
 }
 
@@ -121,7 +120,7 @@ HWAddress<6> resolve_hwaddr(const NetworkInterface& iface,
             }
         }
     #endif 
-    throw runtime_error("Could not resolve hardware address");
+    throw exception_base("Could not resolve hardware address");
 }
 
 HWAddress<6> resolve_hwaddr(IPv4Address ip, PacketSender& sender) {
diff --git a/src/utils/routing_utils.cpp b/src/utils/routing_utils.cpp
index f16b9bd..35860ae 100644
--- a/src/utils/routing_utils.cpp
+++ b/src/utils/routing_utils.cpp
@@ -63,7 +63,6 @@ using std::string;
 using std::set;
 using std::ifstream;
 using std::istream;
-using std::runtime_error;
 
 namespace Tins {
 namespace Utils {
@@ -147,12 +146,12 @@ vector<char> query_route_table(int family) {
     mib[4] = NET_RT_DUMP;
     mib[5] = 0; 
     if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0) {
-        throw runtime_error("sysctl failed");
+        throw exception_base("sysctl failed");
     }
 
     buf.resize(len);
     if (sysctl(mib, 6, &buf[0], &len, NULL, 0) < 0) {
-        throw runtime_error("sysctl failed");
+        throw exception_base("sysctl failed");
     }
 
     return buf;

From 80f424b6b30b180e055805a0fece4e44e43bfdf9 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sat, 13 May 2017 11:04:05 -0700
Subject: [PATCH 48/73] Use TINS_DEPRECATED on old Sniffer constructors

---
 include/tins/sniffer.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/tins/sniffer.h b/include/tins/sniffer.h
index d0c8f11..cd0383b 100644
--- a/include/tins/sniffer.h
+++ b/include/tins/sniffer.h
@@ -328,8 +328,8 @@ public:
      * \param filter A capture filter to be used on the sniffing session.(optional);
      * \param rfmon Indicates if the interface should be put in monitor mode.(optional);
      */
-    Sniffer(const std::string& device, unsigned max_packet_size,
-      bool promisc = false, const std::string& filter = "", bool rfmon = false);
+    TINS_DEPRECATED(Sniffer(const std::string& device, unsigned max_packet_size,
+                    bool promisc = false, const std::string& filter = "", bool rfmon = false));
 
     /**
      * \brief Constructs an instance of Sniffer.
@@ -344,8 +344,8 @@ public:
      * \param filter A capture filter to be used on the sniffing session.(optional);
      * \param rfmon Indicates if the interface should be put in monitor mode.(optional);
      */
-    Sniffer(const std::string& device, promisc_type promisc = NON_PROMISC,
-      const std::string& filter = "", bool rfmon = false);
+    TINS_DEPRECATED(Sniffer(const std::string& device, promisc_type promisc = NON_PROMISC,
+                    const std::string& filter = "", bool rfmon = false));
 
 private:
     friend class SnifferConfiguration;

From 8021112fea8aefcf36b810fec0e0ac3698d31ec5 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sat, 13 May 2017 11:14:11 -0700
Subject: [PATCH 49/73] Use vector instead of lists everywhere

---
 include/tins/dhcp.h             | 6 ++----
 include/tins/dhcpv6.h           | 3 +--
 include/tins/dns.h              | 5 ++---
 include/tins/dot11/dot11_base.h | 3 +--
 include/tins/icmp_extension.h   | 3 +--
 include/tins/icmpv6.h           | 7 +++----
 include/tins/ip.h               | 3 +--
 include/tins/ipv6.h             | 3 +--
 include/tins/llc.h              | 3 +--
 include/tins/pppoe.h            | 3 +--
 include/tins/tcp.h              | 4 +---
 src/dhcp.cpp                    | 1 -
 src/dns.cpp                     | 1 -
 src/dot11/dot11_base.cpp        | 4 ++--
 src/ip.cpp                      | 1 -
 tests/src/dns_test.cpp          | 4 ++--
 16 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/include/tins/dhcp.h b/include/tins/dhcp.h
index 7fe33d1..d0dc07d 100644
--- a/include/tins/dhcp.h
+++ b/include/tins/dhcp.h
@@ -30,7 +30,6 @@
 #ifndef TINS_DHCP_H
 #define TINS_DHCP_H
 
-#include <list>
 #include <vector>
 #include <string>
 #include "bootp.h"
@@ -170,7 +169,7 @@ public:
     /**
      * The type used to store the DHCP options.
      */
-    typedef std::list<option> options_type;
+    typedef std::vector<option> options_type;
     
     /**
      * \brief Extracts metadata for this protocol based on the buffer provided
@@ -436,8 +435,7 @@ public:
      * If the option is not found, an option_not_found exception
      * is thrown.
      * 
-     * \return std::list<ipaddress_type> Contanining the DNS servers
-     * provided.
+     * \return The list of DNS servers provided.
      */
     std::vector<ipaddress_type> domain_name_servers() const; 
     
diff --git a/include/tins/dhcpv6.h b/include/tins/dhcpv6.h
index af010ac..8433fc4 100644
--- a/include/tins/dhcpv6.h
+++ b/include/tins/dhcpv6.h
@@ -31,7 +31,6 @@
 #define TINS_DHCPV6_H
 
 #include <cstring>
-#include <list>
 #include "pdu.h"
 #include "macros.h"
 #include "endianness.h"
@@ -163,7 +162,7 @@ public:
     /**
      * The type used to store the DHCPv6 options.
      */
-    typedef std::list<option> options_type;
+    typedef std::vector<option> options_type;
 
     /**
      * The type used to store IP addresses.
diff --git a/include/tins/dns.h b/include/tins/dns.h
index 0ce1314..fa12cd4 100644
--- a/include/tins/dns.h
+++ b/include/tins/dns.h
@@ -31,7 +31,6 @@
 #define TINS_DNS_H
 
 #include <stdint.h>
-#include <list>
 #include <vector>
 #include <cstring>
 #include <string>
@@ -602,8 +601,8 @@ public:
     TINS_DEPRECATED(typedef query Query);
     TINS_DEPRECATED(typedef resource Resource);
     
-    typedef std::list<query> queries_type;
-    typedef std::list<resource> resources_type;
+    typedef std::vector<query> queries_type;
+    typedef std::vector<resource> resources_type;
     typedef IPv4Address address_type;
     typedef IPv6Address address_v6_type;
     
diff --git a/include/tins/dot11/dot11_base.h b/include/tins/dot11/dot11_base.h
index 3f0fba4..760d5e5 100644
--- a/include/tins/dot11/dot11_base.h
+++ b/include/tins/dot11/dot11_base.h
@@ -32,7 +32,6 @@
 #if !defined(TINS_DOT11_DOT11_H) && defined(TINS_HAVE_DOT11)
 #define TINS_DOT11_DOT11_H
 
-#include <list>
 #include "../pdu.h"
 #include "../pdu_option.h"
 #include "../small_uint.h"
@@ -67,7 +66,7 @@ public:
     /**
      * The type used to store tagged options.
      */
-    typedef std::list<option> options_type;
+    typedef std::vector<option> options_type;
 
     /**
      * \brief This PDU's flag.
diff --git a/include/tins/icmp_extension.h b/include/tins/icmp_extension.h
index 99ade0a..63327aa 100644
--- a/include/tins/icmp_extension.h
+++ b/include/tins/icmp_extension.h
@@ -31,7 +31,6 @@
 #define TINS_ICMP_EXTENSION_H
 
 #include <vector>
-#include <list>
 #include <stdint.h>
 #include "macros.h"
 #include "small_uint.h"
@@ -176,7 +175,7 @@ public:
     /**
      * The type used to store the list of ICMP extensions in this structure
      */
-    typedef std::list<ICMPExtension> extensions_type;
+    typedef std::vector<ICMPExtension> extensions_type;
 
     /**
      * \brief Default constructor
diff --git a/include/tins/icmpv6.h b/include/tins/icmpv6.h
index c1b58d1..040eeb7 100644
--- a/include/tins/icmpv6.h
+++ b/include/tins/icmpv6.h
@@ -30,7 +30,6 @@
 #ifndef TINS_ICMPV6_H
 #define TINS_ICMPV6_H
 
-#include <list>
 #include <vector>
 #include "macros.h"
 #include "pdu.h"
@@ -155,7 +154,7 @@ public:
     /**
      * The type used to store options.
      */
-    typedef std::list<option> options_type;
+    typedef std::vector<option> options_type;
     
     /**
      * \brief The type used to store the new home agent information 
@@ -548,13 +547,13 @@ public:
     /*
      * The type used to store all multicast address records in a packet
      */
-    typedef std::list<multicast_address_record> multicast_address_records_list;
+    typedef std::vector<multicast_address_record> multicast_address_records_list;
 
     /*
      * The type used to store all source address (from Multicast 
      * Listener Query messages) in a packet 
      */
-    typedef std::list<ipaddress_type> sources_list;
+    typedef std::vector<ipaddress_type> sources_list;
 
     /**
      * \brief Constructs an ICMPv6 object.
diff --git a/include/tins/ip.h b/include/tins/ip.h
index 420f974..236882c 100644
--- a/include/tins/ip.h
+++ b/include/tins/ip.h
@@ -30,7 +30,6 @@
 #ifndef TINS_IP_H
 #define TINS_IP_H
 
-#include <list>
 #include "pdu.h"
 #include "small_uint.h"
 #include "endianness.h"
@@ -244,7 +243,7 @@ public:
     /**
      * The type used to store IP options.
      */
-    typedef std::list<option> options_type;
+    typedef std::vector<option> options_type;
 
     /**
      * \brief Extracts metadata for this protocol based on the buffer provided
diff --git a/include/tins/ipv6.h b/include/tins/ipv6.h
index 95d3e30..013581d 100644
--- a/include/tins/ipv6.h
+++ b/include/tins/ipv6.h
@@ -30,7 +30,6 @@
 #ifndef TINS_IPV6_h
 #define TINS_IPV6_h
 
-#include <list>
 #include "macros.h"
 #include "pdu.h"
 #include "endianness.h"
@@ -71,7 +70,7 @@ public:
     /**
      * The type used to store the extension headers.
      */
-    typedef std::list<ext_header> headers_type;
+    typedef std::vector<ext_header> headers_type;
 
     /**
      * The values used to identify extension headers.
diff --git a/include/tins/llc.h b/include/tins/llc.h
index 4b2ae33..2f67c31 100644
--- a/include/tins/llc.h
+++ b/include/tins/llc.h
@@ -30,7 +30,6 @@
 #ifndef TINS_IEEE8022_H
 #define TINS_IEEE8022_H
 
-#include <list>
 #include <vector>
 #include <stdint.h>
 #include "macros.h"
@@ -399,7 +398,7 @@ private:
     #endif
     
     typedef std::vector<uint8_t> field_type;
-    typedef std::list<field_type> field_list;
+    typedef std::vector<field_type> field_list;
 
     void write_serialization(uint8_t* buffer, uint32_t total_sz);
 
diff --git a/include/tins/pppoe.h b/include/tins/pppoe.h
index 40b1b80..77abfd4 100644
--- a/include/tins/pppoe.h
+++ b/include/tins/pppoe.h
@@ -30,7 +30,6 @@
 #ifndef TINS_PPPoE_H
 #define TINS_PPPoE_H
 
-#include <list>
 #include <string>
 #include <vector>
 #include "pdu.h"
@@ -82,7 +81,7 @@ public:
     /**
      * The type used to store the options.
      */
-    typedef std::list<tag> tags_type;
+    typedef std::vector<tag> tags_type;
     
     /**
      * The type used to store the Vendor-Specific tag's value.
diff --git a/include/tins/tcp.h b/include/tins/tcp.h
index 4f762d6..8794ca7 100644
--- a/include/tins/tcp.h
+++ b/include/tins/tcp.h
@@ -30,8 +30,6 @@
 #ifndef TINS_TCP_H
 #define TINS_TCP_H
 
-
-#include <list>
 #include <vector>
 #include <stdint.h>
 #include <utility>
@@ -131,7 +129,7 @@ public:
     /**
      * The type used to store the options.
      */
-    typedef std::list<option> options_type;
+    typedef std::vector<option> options_type;
     
     /**
      * The type used to store the sack option.
diff --git a/src/dhcp.cpp b/src/dhcp.cpp
index 142f4a7..7d70436 100644
--- a/src/dhcp.cpp
+++ b/src/dhcp.cpp
@@ -35,7 +35,6 @@
 
 using std::string;
 using std::vector;
-using std::list;
 using std::runtime_error;
 
 using Tins::Memory::InputMemoryStream;
diff --git a/src/dns.cpp b/src/dns.cpp
index f700ef2..046fec1 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -38,7 +38,6 @@
 
 using std::string;
 using std::memcpy;
-using std::list;
 using std::make_pair;
 
 using Tins::Memory::InputMemoryStream;
diff --git a/src/dot11/dot11_base.cpp b/src/dot11/dot11_base.cpp
index b884bc6..5ab1a77 100644
--- a/src/dot11/dot11_base.cpp
+++ b/src/dot11/dot11_base.cpp
@@ -49,7 +49,7 @@
 #include "packet_sender.h"
 #include "memory_helpers.h"
 
-using std::list;
+using std::vector;
 
 using Tins::Memory::InputMemoryStream;
 using Tins::Memory::OutputMemoryStream;
@@ -212,7 +212,7 @@ void Dot11::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     stream.write(header_);
     write_ext_header(stream);
     write_fixed_parameters(stream);
-    for (list<option>::const_iterator it = options_.begin(); it != options_.end(); ++it) {
+    for (vector<option>::const_iterator it = options_.begin(); it != options_.end(); ++it) {
         stream.write<uint8_t>(it->option());
         stream.write<uint8_t>(it->length_field());
         stream.write(it->data_ptr(), it->data_size());
diff --git a/src/ip.cpp b/src/ip.cpp
index b970eb5..ec4bd94 100644
--- a/src/ip.cpp
+++ b/src/ip.cpp
@@ -47,7 +47,6 @@
 #include "detail/pdu_helpers.h"
 #include "pdu_allocator.h"
 
-using std::list;
 using std::memcmp;
 using std::vector;
 
diff --git a/tests/src/dns_test.cpp b/tests/src/dns_test.cpp
index 55641a4..c4d9dab 100644
--- a/tests/src/dns_test.cpp
+++ b/tests/src/dns_test.cpp
@@ -91,11 +91,11 @@ TEST_F(DNSTest, ConstructorFromBuffer) {
     EXPECT_EQ(dns.questions_count(), 1);
     EXPECT_EQ(dns.answers_count(), 1);
     
-    std::list<DNS::query> queries = dns.queries();
+    std::vector<DNS::query> queries = dns.queries();
     ASSERT_EQ(queries.size(), 1U);
     test_equals(queries.front(), DNS::query("www.example.com", DNS::A, DNS::INTERNET));
     
-    std::list<DNS::resource> answers = dns.answers();
+    std::vector<DNS::resource> answers = dns.answers();
     ASSERT_EQ(answers.size(), 1U);
     test_equals(answers.front(), DNS::resource("www.example.com", "192.168.0.1", DNS::A,
                                                DNS::INTERNET, 0x1234));

From fa85aa3f8b2162a6d9213369aa784653c84429ae Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sat, 13 May 2017 16:21:18 -0700
Subject: [PATCH 50/73] Performance improvements

* Remove option size memers on IP/TCP and instead calculate
these when they're needed
* Reorder members on IP/TCP so as to remove/decrease padding
* Move most memory helpers impl into header file so they
can be inlined
* Make PDUOption's move ctor/assignment operator noexcept
---
 include/tins/ip.h             |  9 ++--
 include/tins/memory_helpers.h | 93 +++++++++++++++++++++++++++++------
 include/tins/pdu_option.h     |  6 +--
 include/tins/tcp.h            |  9 ++--
 src/ip.cpp                    | 36 ++++++--------
 src/memory_helpers.cpp        | 80 ------------------------------
 src/tcp.cpp                   | 55 +++++++++++----------
 7 files changed, 131 insertions(+), 157 deletions(-)

diff --git a/include/tins/ip.h b/include/tins/ip.h
index 236882c..6da8390 100644
--- a/include/tins/ip.h
+++ b/include/tins/ip.h
@@ -523,7 +523,6 @@ public:
          * \param opt The option to be added.
          */
         void add_option(option &&opt) {
-            internal_add_option(opt);
             options_.push_back(std::move(opt));
         }
 
@@ -538,7 +537,6 @@ public:
         template<typename... Args>
         void add_option(Args&&... args) {
             options_.emplace_back(std::forward<Args>(args)...);
-            internal_add_option(options_.back());
         }
     #endif
 
@@ -756,7 +754,8 @@ private:
     void tot_len(uint16_t new_tot_len);
 
     void prepare_for_serialize();
-    void internal_add_option(const option& option);
+    uint32_t calculate_options_size() const;
+    uint32_t pad_options_size(uint32_t size) const;
     void init_ip_fields();
     void write_serialization(uint8_t* buffer, uint32_t total_sz);
     void write_option(const option& opt, Memory::OutputMemoryStream& stream);
@@ -765,11 +764,9 @@ private:
     void checksum(uint16_t new_check);
     options_type::const_iterator search_option_iterator(option_identifier id) const;
     options_type::iterator search_option_iterator(option_identifier id);
-    void update_padded_options_size();
 
-    ip_header header_;
-    uint16_t options_size_, padded_options_size_;
     options_type options_;
+    ip_header header_;
 };
 
 } // Tins
diff --git a/include/tins/memory_helpers.h b/include/tins/memory_helpers.h
index ec63eac..a07ad43 100644
--- a/include/tins/memory_helpers.h
+++ b/include/tins/memory_helpers.h
@@ -68,8 +68,12 @@ void write_value(uint8_t* buffer, const T& value) {
 
 class InputMemoryStream {
 public:
-    InputMemoryStream(const uint8_t* buffer, size_t total_sz);
-    InputMemoryStream(const std::vector<uint8_t>& data);
+    InputMemoryStream(const uint8_t* buffer, size_t total_sz)
+    : buffer_(buffer), size_(total_sz) {
+    }
+
+    InputMemoryStream(const std::vector<uint8_t>& data) : buffer_(&data[0]), size_(data.size()) {
+    }
  
     template <typename T>
     T read() {
@@ -97,17 +101,46 @@ public:
         skip(sizeof(value));
     }
 
-    void skip(size_t size);
-    bool can_read(size_t byte_count) const;
+    void skip(size_t size) {
+        if (TINS_UNLIKELY(size > size_)) {
+            throw malformed_packet();
+        }
+        buffer_ += size;
+        size_ -= size;
+    }
+
+    bool can_read(size_t byte_count) const {
+        return TINS_LIKELY(size_ >= byte_count);
+    }
+
+    void read(void* output_buffer, size_t output_buffer_size) {
+        if (!can_read(output_buffer_size)) {
+            throw malformed_packet();
+        }
+        read_data(buffer_, (uint8_t*)output_buffer, output_buffer_size);
+        skip(output_buffer_size);
+    }
+
+    const uint8_t* pointer() const {
+        return buffer_;
+    }
+
+    size_t size() const {
+        return size_;
+    }
+
+    void size(size_t new_size) {
+        size_ = new_size;
+    }
+
+    operator bool() const {
+        return size_ > 0;
+    }
+
     void read(std::vector<uint8_t>& value, size_t count);
     void read(HWAddress<6>& address);
     void read(IPv4Address& address);
     void read(IPv6Address& address);
-    void read(void* output_buffer, size_t output_buffer_size);
-    const uint8_t* pointer() const;
-    size_t size() const;
-    void size(size_t new_size);
-    operator bool() const;
 private:
     const uint8_t* buffer_;
     size_t size_;
@@ -115,8 +148,13 @@ private:
 
 class OutputMemoryStream {
 public:
-    OutputMemoryStream(uint8_t* buffer, size_t total_sz);
-    OutputMemoryStream(std::vector<uint8_t>& buffer);
+    OutputMemoryStream(uint8_t* buffer, size_t total_sz)
+    : buffer_(buffer), size_(total_sz) {
+    }
+
+    OutputMemoryStream(std::vector<uint8_t>& buffer)
+    : buffer_(&buffer[0]), size_(buffer.size()) {
+    }
 
     template <typename T>
     void write(const T& value) {
@@ -151,14 +189,37 @@ public:
         skip(length);
     }
 
-    void skip(size_t size);
-    void write(const uint8_t* ptr, size_t length);
+    void skip(size_t size) {
+        if (TINS_UNLIKELY(size > size_)) {
+            throw malformed_packet();
+        }
+        buffer_ += size;
+        size_ -= size;
+    }
+
+    void write(const uint8_t* ptr, size_t length) {
+        write(ptr, ptr + length);
+    }
+
+    void fill(size_t size, uint8_t value) {
+        if (TINS_UNLIKELY(size_ < size)) {
+            throw serialization_error();
+        }
+        std::memset(buffer_, value, size);
+        skip(size);
+    }
+
+    uint8_t* pointer() {
+        return buffer_;
+    }
+
+    size_t size() const {
+        return size_;
+    }
+
     void write(const HWAddress<6>& address);
     void write(const IPv4Address& address);
     void write(const IPv6Address& address);
-    void fill(size_t size, uint8_t value);
-    uint8_t* pointer();
-    size_t size() const;
 private:
     uint8_t* buffer_;
     size_t size_;
diff --git a/include/tins/pdu_option.h b/include/tins/pdu_option.h
index c614828..4724e56 100644
--- a/include/tins/pdu_option.h
+++ b/include/tins/pdu_option.h
@@ -226,7 +226,7 @@ public:
      * \brief Move constructor.
      * \param rhs The PDUOption to be moved.
      */
-    PDUOption(PDUOption&& rhs) {
+    PDUOption(PDUOption&& rhs) TINS_NOEXCEPT {
         real_size_ = 0;
         *this = std::move(rhs);
     }
@@ -235,7 +235,7 @@ public:
      * \brief Move assignment operator.
      * \param rhs The PDUOption to be moved.
      */
-    PDUOption& operator=(PDUOption&& rhs) {
+    PDUOption& operator=(PDUOption&& rhs) TINS_NOEXCEPT {
         option_ = rhs.option_;
         size_ = rhs.size_;
         if (real_size_ > small_buffer_size) {
@@ -250,7 +250,7 @@ public:
         else {
             std::memcpy(payload_.small_buffer, rhs.data_ptr(), rhs.data_size());
         }
-        return* this;
+        return *this;
     }
     
     #endif // TINS_IS_CXX11
diff --git a/include/tins/tcp.h b/include/tins/tcp.h
index 8794ca7..9ba2019 100644
--- a/include/tins/tcp.h
+++ b/include/tins/tcp.h
@@ -475,7 +475,6 @@ public:
          * \param option The option to be added.
          */
         void add_option(option &&opt) {
-            internal_add_option(opt);
             options_.push_back(std::move(opt));
         }
 
@@ -490,7 +489,6 @@ public:
         template <typename... Args>
         void add_option(Args&&... args) {
             options_.emplace_back(std::forward<Args>(args)...);
-            internal_add_option(options_.back());
         }
     #endif
 
@@ -606,18 +604,17 @@ private:
         return opt->to<T>();
     }
     
-    void internal_add_option(const option& option);
     void write_serialization(uint8_t* buffer, uint32_t total_sz);
     void checksum(uint16_t new_check);
-    void update_options_size();
+    uint32_t calculate_options_size() const;
+    uint32_t pad_options_size(uint32_t size) const;
     options_type::const_iterator search_option_iterator(OptionTypes type) const;
     options_type::iterator search_option_iterator(OptionTypes type);
     
     void write_option(const option& opt, Memory::OutputMemoryStream& stream);
 
-    tcp_header header_;
-    uint16_t options_size_, total_options_size_;
     options_type options_;
+    tcp_header header_;
 };
 
 } // Tins
diff --git a/src/ip.cpp b/src/ip.cpp
index ec4bd94..2380126 100644
--- a/src/ip.cpp
+++ b/src/ip.cpp
@@ -73,14 +73,13 @@ IP::IP(address_type ip_dst, address_type ip_src) {
     this->src_addr(ip_src); 
 }
 
-IP::IP(const uint8_t* buffer, uint32_t total_sz)
-: options_size_(0) {
+IP::IP(const uint8_t* buffer, uint32_t total_sz) {
     InputMemoryStream stream(buffer, total_sz);
     stream.read(header_);
 
     // Make sure we have enough size for options and not less than we should
-    if (head_len() * sizeof(uint32_t) > total_sz || 
-        head_len() * sizeof(uint32_t) < sizeof(header_)) {
+    if (TINS_UNLIKELY(head_len() * sizeof(uint32_t) > total_sz || 
+                      head_len() * sizeof(uint32_t) < sizeof(header_))) {
         throw malformed_packet();
     }
     const uint8_t* options_end = buffer + head_len() * sizeof(uint32_t);
@@ -108,7 +107,6 @@ IP::IP(const uint8_t* buffer, uint32_t total_sz)
             else {
                 options_.push_back(option(opt_type));
             }
-            options_size_ += option_size;
         }
         else if (opt_type == END) {
             // If the end option found, we're done
@@ -120,10 +118,8 @@ IP::IP(const uint8_t* buffer, uint32_t total_sz)
         }
         else {
             options_.push_back(option(opt_type));
-            options_size_++;
         }
     }
-    update_padded_options_size();
     if (stream) {
         // Don't avoid consuming more than we should if tot_len is 0,
         // since this is the case when using TCP segmentation offload
@@ -171,8 +167,6 @@ void IP::init_ip_fields() {
     header_.version = 4;
     ttl(DEFAULT_TTL);
     id(1);
-    options_size_ = 0;
-    padded_options_size_ = 0;
 }
 
 bool IP::is_fragmented() const {
@@ -321,18 +315,20 @@ uint16_t IP::stream_identifier() const {
 }
 
 void IP::add_option(const option& opt) {
-    internal_add_option(opt);
     options_.push_back(opt);
 }
 
-void IP::update_padded_options_size() {
-    uint8_t padding = options_size_ % 4;
-    padded_options_size_ = padding ? (options_size_ - padding + 4) : options_size_;
+uint32_t IP::calculate_options_size() const {
+    uint32_t options_size = 0;
+    for (options_type::const_iterator iter = options_.begin(); iter != options_.end(); ++iter) {
+        options_size += 1 + iter->data_size();
+    }
+    return options_size;    
 }
 
-void IP::internal_add_option(const option& opt) {
-    options_size_ += static_cast<uint16_t>(1 + opt.data_size());
-    update_padded_options_size();
+uint32_t IP::pad_options_size(uint32_t size) const {
+    uint8_t padding = size % 4;
+    return padding ? (size - padding + 4) : size;
 }
 
 bool IP::remove_option(option_identifier id) {
@@ -340,9 +336,7 @@ bool IP::remove_option(option_identifier id) {
     if (iter == options_.end()) {
         return false;
     }
-    options_size_ -= static_cast<uint16_t>(1 + iter->data_size());
     options_.erase(iter);
-    update_padded_options_size();
     return true;
 }
 
@@ -375,7 +369,7 @@ void IP::write_option(const option& opt, OutputMemoryStream& stream) {
 // Virtual method overriding
 
 uint32_t IP::header_size() const {
-    return sizeof(header_) + padded_options_size_;
+    return sizeof(header_) + pad_options_size(calculate_options_size());
 }
 
 PacketSender::SocketType pdu_type_to_sender_type(PDU::PDUType type) {
@@ -459,8 +453,10 @@ void IP::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     for (options_type::const_iterator it = options_.begin(); it != options_.end(); ++it) {
         write_option(*it, stream);
     }
+    const uint32_t options_size = calculate_options_size();
+    const uint32_t padded_options_size = pad_options_size(options_size);
     // Add option padding
-    stream.fill(padded_options_size_ - options_size_, 0);
+    stream.fill(padded_options_size - options_size, 0);
 
     uint32_t check = Utils::do_checksum(buffer, stream.pointer());
     while (check >> 16) {
diff --git a/src/memory_helpers.cpp b/src/memory_helpers.cpp
index 9d6d242..a547e1f 100644
--- a/src/memory_helpers.cpp
+++ b/src/memory_helpers.cpp
@@ -39,26 +39,6 @@ namespace Memory {
 
 // InputMemoryStream
 
-InputMemoryStream::InputMemoryStream(const uint8_t* buffer, size_t total_sz)
-: buffer_(buffer), size_(total_sz) {
-}
-
-InputMemoryStream::InputMemoryStream(const vector<uint8_t>& data)
-: buffer_(&data[0]), size_(data.size()) {
-}
-
-void InputMemoryStream::skip(size_t size) {
-    if (TINS_UNLIKELY(size > size_)) {
-        throw malformed_packet();
-    }
-    buffer_ += size;
-    size_ -= size;
-}
-
-bool InputMemoryStream::can_read(size_t byte_count) const {
-    return TINS_LIKELY(size_ >= byte_count);
-}
-
 void InputMemoryStream::read(vector<uint8_t>& value, size_t count) {
     if (!can_read(count)) {
         throw malformed_packet();
@@ -87,52 +67,8 @@ void InputMemoryStream::read(IPv6Address& address) {
     skip(IPv6Address::address_size);
 }
 
-void InputMemoryStream::read(void* output_buffer, size_t output_buffer_size) {
-    if (!can_read(output_buffer_size)) {
-        throw malformed_packet();
-    }
-    read_data(buffer_, (uint8_t*)output_buffer, output_buffer_size);
-    skip(output_buffer_size);
-}
-
-const uint8_t* InputMemoryStream::pointer() const {
-    return buffer_;
-}
-
-size_t InputMemoryStream::size() const {
-    return size_;
-}
-
-void InputMemoryStream::size(size_t new_size) {
-    size_ = new_size;
-}
-
-InputMemoryStream::operator bool() const {
-    return size_ > 0;
-}
-
 // OutputMemoryStream
 
-OutputMemoryStream::OutputMemoryStream(uint8_t* buffer, size_t total_sz)
-: buffer_(buffer), size_(total_sz) {
-}
-
-OutputMemoryStream::OutputMemoryStream(vector<uint8_t>& buffer)
-: buffer_(&buffer[0]), size_(buffer.size()) {
-}
-
-void OutputMemoryStream::skip(size_t size) {
-    if (TINS_UNLIKELY(size > size_)) {
-        throw malformed_packet();
-    }
-    buffer_ += size;
-    size_ -= size;
-}
-
-void OutputMemoryStream::write(const uint8_t* ptr, size_t length) {
-    write(ptr, ptr + length);
-}
-
 void OutputMemoryStream::write(const HWAddress<6>& address) {
     write(address.begin(), address.end());
 }
@@ -145,21 +81,5 @@ void OutputMemoryStream::write(const IPv6Address& address) {
     write(address.begin(), address.end());
 }
 
-void OutputMemoryStream::fill(size_t size, uint8_t value) {
-    if (TINS_UNLIKELY(size_ < size)) {
-        throw serialization_error();
-    }
-    std::memset(buffer_, value, size);
-    skip(size);
-}
-
-uint8_t* OutputMemoryStream::pointer() {
-    return buffer_;
-}
-
-size_t OutputMemoryStream::size() const {
-    return size_;
-}
-
 } // Memory
 } // Tins
diff --git a/src/tcp.cpp b/src/tcp.cpp
index bbafe4c..2906302 100644
--- a/src/tcp.cpp
+++ b/src/tcp.cpp
@@ -56,15 +56,14 @@ PDU::metadata TCP::extract_metadata(const uint8_t *buffer, uint32_t total_sz) {
 }
 
 TCP::TCP(uint16_t dport, uint16_t sport) 
-: header_(), options_size_(0), total_options_size_(0) {
+: header_() {
     this->dport(dport);
     this->sport(sport);
     data_offset(sizeof(tcp_header) / sizeof(uint32_t));
     window(DEFAULT_WINDOW);
 }
 
-TCP::TCP(const uint8_t* buffer, uint32_t total_sz) 
-: options_size_(0), total_options_size_(0) {
+TCP::TCP(const uint8_t* buffer, uint32_t total_sz) {
     InputMemoryStream stream(buffer, total_sz);
     stream.read(header_);
     // Check that we have at least the amount of bytes we need and not less
@@ -74,6 +73,12 @@ TCP::TCP(const uint8_t* buffer, uint32_t total_sz)
     }
     const uint8_t* header_end = buffer + (data_offset() * sizeof(uint32_t));
 
+    if (stream.pointer() < header_end) {
+        // Estimate about 4 bytes per option and reserver that so we avoid doing 
+        // multiple reallocations on the vector
+        options_.reserve((header_end - stream.pointer()) / sizeof(uint32_t));
+    }
+
     while (stream.pointer() < header_end) {
         const OptionTypes option_type = (OptionTypes)stream.read<uint8_t>();
         if (option_type <= NOP) {
@@ -284,25 +289,26 @@ void TCP::flags(small_uint<12> value) {
 
 void TCP::add_option(const option& opt) {
     options_.push_back(opt);
-    internal_add_option(opt);
 }
 
 uint32_t TCP::header_size() const {
-    return sizeof(header_) + total_options_size_;
+    return sizeof(header_) + pad_options_size(calculate_options_size());
 }
 
 void TCP::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
+    const uint32_t options_size = calculate_options_size();
+    const uint32_t total_options_size = pad_options_size(options_size);
     // Set checksum to 0, we'll calculate it at the end
     checksum(0);
-    header_.doff = (sizeof(tcp_header) + total_options_size_) / sizeof(uint32_t);
+    header_.doff = (sizeof(tcp_header) + total_options_size) / sizeof(uint32_t);
     stream.write(header_);
     for (options_type::const_iterator it = options_.begin(); it != options_.end(); ++it) {
         write_option(*it, stream);
     }
 
-    if (options_size_ < total_options_size_) {
-        const uint16_t padding = total_options_size_ - options_size_;
+    if (options_size < total_options_size) {
+        const uint16_t padding = total_options_size - options_size;
         stream.fill(padding, 1);
     }
 
@@ -366,19 +372,23 @@ void TCP::write_option(const option& opt, OutputMemoryStream& stream) {
     }
 }
 
-void TCP::update_options_size() {
-    uint8_t padding = options_size_ & 3;
-    total_options_size_ = (padding) ? (options_size_ - padding + 4) : options_size_;
+uint32_t TCP::calculate_options_size() const {
+    uint32_t options_size = 0;
+    for (options_type::const_iterator iter = options_.begin(); iter != options_.end(); ++iter) {
+        const option& opt = *iter;
+        options_size += sizeof(uint8_t);
+        // SACK_OK contains length but not data
+        if (opt.data_size() || opt.option() == SACK_OK) {
+            options_size += sizeof(uint8_t);    
+            options_size += static_cast<uint16_t>(opt.data_size());
+        }
+    }
+    return options_size;    
 }
 
-void TCP::internal_add_option(const option& opt) {
-    options_size_ += sizeof(uint8_t);
-    // SACK_OK contains length but not data....
-    if (opt.data_size() || opt.option() == SACK_OK) {
-        options_size_ += sizeof(uint8_t);    
-        options_size_ += static_cast<uint16_t>(opt.data_size());
-    }
-    update_options_size();
+uint32_t TCP::pad_options_size(uint32_t size) const {
+    uint8_t padding = size & 3;
+    return padding ? (size - padding + 4) : size;
 }
 
 bool TCP::remove_option(OptionTypes type) {
@@ -386,14 +396,7 @@ bool TCP::remove_option(OptionTypes type) {
     if (iter == options_.end()) {
         return false;
     }
-    options_size_ -= sizeof(uint8_t);
-    // SACK_OK contains length but not data....
-    if (iter->data_size() || iter->option() == SACK_OK) {
-        options_size_ -= sizeof(uint8_t);
-        options_size_ -= static_cast<uint16_t>(iter->data_size());
-    }
     options_.erase(iter);
-    update_options_size();
     return true;
 }
 

From 4def99518568b623380358d8175efb1d12df73b9 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sat, 13 May 2017 17:48:22 -0700
Subject: [PATCH 51/73] Fix build issue on VS

---
 src/dot11/dot11_mgmt.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dot11/dot11_mgmt.cpp b/src/dot11/dot11_mgmt.cpp
index aa9acb1..2b98bac 100644
--- a/src/dot11/dot11_mgmt.cpp
+++ b/src/dot11/dot11_mgmt.cpp
@@ -31,6 +31,7 @@
 #ifdef TINS_HAVE_DOT11
 
 #include <cstring>
+#include <iterator>
 #include "rsn_information.h"
 #include "memory_helpers.h"
 

From 993831709d6bc47633172920e367180f83fb7d0e Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sat, 13 May 2017 19:44:57 -0700
Subject: [PATCH 52/73] Improve DNS class performance slightly

---
 include/tins/dns.h | 16 ++++++++++++++++
 src/dns.cpp        | 39 +++++++++++++++++++++++++++------------
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/include/tins/dns.h b/include/tins/dns.h
index fa12cd4..ef93eaa 100644
--- a/include/tins/dns.h
+++ b/include/tins/dns.h
@@ -183,8 +183,13 @@ public:
          * \param tp The query type.
          * \param cl The query class.
          */
+        #if TINS_IS_CXX11
+        query(std::string nm, QueryType tp, QueryClass cl) 
+        : name_(std::move(nm)), type_(tp), qclass_(cl) {}
+        #else
         query(const std::string& nm, QueryType tp, QueryClass cl) 
         : name_(nm), type_(tp), qclass_(cl) {}
+        #endif
         
         /**
          * \brief Default constructs this Query.
@@ -448,6 +453,16 @@ public:
          * \param rclass The class of this record.
          * \param ttl The time-to-live of this record.
          */
+        #if TINS_IS_CXX11
+        resource(std::string dname, 
+                 std::string data, 
+                 uint16_t type,
+                 uint16_t rclass,
+                 uint32_t ttl,
+                 uint16_t preference = 0) 
+        : dname_(std::move(dname)), data_(std::move(data)), type_(type),
+          qclass_(rclass), ttl_(ttl), preference_(preference) {}
+        #else
         resource(const std::string& dname, 
                  const std::string& data, 
                  uint16_t type,
@@ -456,6 +471,7 @@ public:
                  uint16_t preference = 0) 
         : dname_(dname), data_(data), type_(type), qclass_(rclass), 
           ttl_(ttl), preference_(preference) {}
+        #endif 
         
         resource() : type_(), qclass_(), ttl_(), preference_() {}
         
diff --git a/src/dns.cpp b/src/dns.cpp
index 046fec1..d36c87a 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -105,7 +105,7 @@ void DNS::skip_to_section_end(InputMemoryStream& stream,
         skip_to_dname_end(stream);
         stream.skip(sizeof(uint16_t) * 2 + sizeof(uint32_t));
         uint16_t data_size = stream.read_be<uint16_t>();
-        if (!stream.can_read(data_size)) {
+        if (TINS_UNLIKELY(!stream.can_read(data_size))) {
             throw malformed_packet();
         }
         stream.skip(data_size);
@@ -339,7 +339,7 @@ uint32_t DNS::compose_name(const uint8_t* ptr, char* out_ptr) const {
     while (*ptr) {
         // It's an offset
         if ((*ptr & 0xc0)) {
-            if (ptr + sizeof(uint16_t) > end) {
+            if (TINS_UNLIKELY(ptr + sizeof(uint16_t) > end)) {
                 throw malformed_packet();
             }
             uint16_t index;
@@ -360,7 +360,7 @@ uint32_t DNS::compose_name(const uint8_t* ptr, char* out_ptr) const {
             // It's a label, grab its size.
             uint8_t size = *ptr;
             ptr++;
-            if (ptr + size > end || current_out_ptr - out_ptr + size + 1 > 255) {
+            if (TINS_UNLIKELY(ptr + size > end || current_out_ptr - out_ptr + size + 1 > 255)) {
                 throw malformed_packet();
             }
             // Append a dot if it's not the first one.
@@ -430,7 +430,7 @@ void DNS::convert_records(const uint8_t* ptr,
             preference = stream.read_be<uint16_t>();
             data_size -= sizeof(uint16_t);
         }
-        if (!stream.can_read(data_size)) {
+        if (TINS_UNLIKELY(!stream.can_read(data_size))) {
             throw malformed_packet();
         }
 
@@ -470,16 +470,27 @@ void DNS::convert_records(const uint8_t* ptr,
                 stream.skip(data_size);
                 break;
         }
-        res.push_back(
-            resource(
+        #if TINS_IS_CXX11
+            res.emplace_back(
                 dname, 
-                (used_small_buffer) ? small_addr_buf : data, 
+                (used_small_buffer) ? small_addr_buf : std::move(data), 
                 type, 
                 qclass, 
                 ttl,
                 preference
-            )
-        );
+            );
+        #else
+            res.push_back(
+                resource(
+                    dname, 
+                    (used_small_buffer) ? small_addr_buf : data, 
+                    type, 
+                    qclass, 
+                    ttl,
+                    preference
+                )
+            );
+        #endif
     }
 }
 
@@ -544,9 +555,13 @@ DNS::queries_type DNS::queries() const {
             stream.skip(compose_name(stream.pointer(), buffer));
             uint16_t query_type = stream.read_be<uint16_t>();
             uint16_t query_class = stream.read_be<uint16_t>();
-            output.push_back(
-                query(buffer, (QueryType)query_type, (QueryClass)query_class)
-            );
+            #if TINS_IS_CXX11
+                output.emplace_back(buffer, (QueryType)query_type, (QueryClass)query_class);
+            #else
+                output.push_back(
+                    query(buffer, (QueryType)query_type, (QueryClass)query_class)
+                );
+            #endif
         }
     }
     return output;

From 9442233a8a876060990d808fb9199ec2ea7b4768 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 14 May 2017 09:04:51 -0700
Subject: [PATCH 53/73] Calculate IPv6 headers size on demand

---
 include/tins/ipv6.h |  2 +-
 src/ipv6.cpp        | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/include/tins/ipv6.h b/include/tins/ipv6.h
index 013581d..ba19222 100644
--- a/include/tins/ipv6.h
+++ b/include/tins/ipv6.h
@@ -320,6 +320,7 @@ public:
 private:
     void write_serialization(uint8_t* buffer, uint32_t total_sz);
     void set_last_next_header(uint8_t value);
+    uint32_t calculate_headers_size() const;
     static void write_header(const ext_header& header, Memory::OutputMemoryStream& stream);
     static bool is_extension_header(uint8_t header_id);
 
@@ -345,7 +346,6 @@ private:
 
     ipv6_header header_;
     headers_type ext_headers_;
-    uint32_t headers_size_;
 };
 }
 
diff --git a/src/ipv6.cpp b/src/ipv6.cpp
index 07170bf..03901fc 100644
--- a/src/ipv6.cpp
+++ b/src/ipv6.cpp
@@ -70,14 +70,13 @@ PDU::metadata IPv6::extract_metadata(const uint8_t *buffer, uint32_t total_sz) {
 }
 
 IPv6::IPv6(address_type ip_dst, address_type ip_src, PDU* /*child*/)
-: header_(), headers_size_(0) {
+: header_() {
     version(6);
     dst_addr(ip_dst);
     src_addr(ip_src);
 }
 
-IPv6::IPv6(const uint8_t* buffer, uint32_t total_sz) 
-: headers_size_(0) {
+IPv6::IPv6(const uint8_t* buffer, uint32_t total_sz) {
     InputMemoryStream stream(buffer, total_sz);
     stream.read(header_);
     uint8_t current_header = header_.next_header;
@@ -208,7 +207,7 @@ void IPv6::dst_addr(const address_type& new_dst_addr) {
 }
 
 uint32_t IPv6::header_size() const {
-    return sizeof(header_) + headers_size_;
+    return sizeof(header_) + calculate_headers_size();
 }
 
 bool IPv6::matches_response(const uint8_t* ptr, uint32_t total_sz) const {
@@ -282,7 +281,6 @@ void IPv6::send(PacketSender& sender, const NetworkInterface &) {
 
 void IPv6::add_ext_header(const ext_header& header) {
     ext_headers_.push_back(header);
-    headers_size_ += static_cast<uint32_t>(header.data_size() + sizeof(uint8_t) * 2);
 }
 
 const IPv6::ext_header* IPv6::search_header(ExtensionHeader id) const {
@@ -307,6 +305,15 @@ void IPv6::set_last_next_header(uint8_t value) {
     }
 }
 
+uint32_t IPv6::calculate_headers_size() const {
+    typedef headers_type::const_iterator const_iterator;
+    uint32_t output = 0;
+    for (const_iterator iter = ext_headers_.begin(); iter != ext_headers_.end(); ++iter) {
+        output += static_cast<uint32_t>(iter->data_size() + sizeof(uint8_t) * 2);
+    }
+    return output;
+}
+
 void IPv6::write_header(const ext_header& header, OutputMemoryStream& stream) {
     const uint8_t length = header.length_field() / 8;
     stream.write(header.option());

From 34072f733c822b3898cb15de7e2886503641df40 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 14 May 2017 10:25:59 -0700
Subject: [PATCH 54/73] Fix next header handling on IPv6

This was broken by design. Each header held the next header's
type, which made iterating through them very tricky (you'd have
to look at the previous header's next header value to know the
current one while doing so).

Now each header contains its own value and the next header
value is computed during serialization and then reverted back
after that.
---
 include/tins/ipv6.h     |  1 +
 src/ipv6.cpp            | 47 +++++++++++++++++++++++++++++----------
 tests/src/ipv6_test.cpp | 49 ++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 84 insertions(+), 13 deletions(-)

diff --git a/include/tins/ipv6.h b/include/tins/ipv6.h
index ba19222..82bf37b 100644
--- a/include/tins/ipv6.h
+++ b/include/tins/ipv6.h
@@ -346,6 +346,7 @@ private:
 
     ipv6_header header_;
     headers_type ext_headers_;
+    uint8_t next_header_;
 };
 }
 
diff --git a/src/ipv6.cpp b/src/ipv6.cpp
index 03901fc..31144b2 100644
--- a/src/ipv6.cpp
+++ b/src/ipv6.cpp
@@ -43,7 +43,7 @@
 #include "memory_helpers.h"
 #include "detail/pdu_helpers.h"
 
-using std::copy;
+using std::vector;
 
 using Tins::Memory::InputMemoryStream;
 using Tins::Memory::OutputMemoryStream;
@@ -70,7 +70,7 @@ PDU::metadata IPv6::extract_metadata(const uint8_t *buffer, uint32_t total_sz) {
 }
 
 IPv6::IPv6(address_type ip_dst, address_type ip_src, PDU* /*child*/)
-: header_() {
+: header_(), next_header_() {
     version(6);
     dst_addr(ip_dst);
     src_addr(ip_src);
@@ -95,8 +95,9 @@ IPv6::IPv6(const uint8_t* buffer, uint32_t total_sz) {
             if (!stream.can_read(payload_size)) {
                 throw malformed_packet();
             }
-            // minus one, from the size field
-            add_ext_header(ext_header(ext_type, payload_size, stream.pointer()));
+            // Add a header using the current header type (e.g. what we saw as the next
+            // header type in the previous)
+            add_ext_header(ext_header(current_header, payload_size, stream.pointer()));
             if (actual_payload_length == 0u && current_header == HOP_BY_HOP) {
                 // could be a jumbogram, look for Jumbo Payload Option
                 InputMemoryStream options(stream.pointer(), payload_size);
@@ -153,6 +154,7 @@ IPv6::IPv6(const uint8_t* buffer, uint32_t total_sz) {
             break;
         }
     }
+    next_header_ = current_header;
 }
 
 bool IPv6::is_extension_header(uint8_t header_id) {
@@ -191,7 +193,7 @@ void IPv6::payload_length(uint16_t new_payload_length) {
 }
 
 void IPv6::next_header(uint8_t new_next_header) {
-    header_.next_header = new_next_header;
+    next_header_ = header_.next_header = new_next_header;
 }
 
 void IPv6::hop_limit(uint8_t new_hop_limit) {
@@ -243,6 +245,20 @@ bool IPv6::matches_response(const uint8_t* ptr, uint32_t total_sz) const {
 
 void IPv6::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
+    vector<uint8_t> header_types;
+    // Iterate the headers and store their current values. At the same time, update header X
+    // so it has the option type of header X + 1
+    for (size_t i = 0; i < ext_headers_.size(); ++i) {
+        const uint8_t option = ext_headers_[i].option();
+        header_types.push_back(option);
+        if (i > 0) {
+            ext_headers_[i - 1].option(option);
+        }
+    }
+    // If we have at least one, then update our IPv6 header's next header type
+    if (!header_types.empty()) {
+        header_.next_header = header_types[0];
+    }
     if (inner_pdu()) {
         uint8_t new_flag = Internals::pdu_flag_to_ip_type(inner_pdu()->pdu_type());
         if (new_flag == 0xff && Internals::pdu_type_registered<IPv6>(inner_pdu()->pdu_type())) {
@@ -250,9 +266,14 @@ void IPv6::write_serialization(uint8_t* buffer, uint32_t total_sz) {
                 Internals::pdu_type_to_id<IPv6>(inner_pdu()->pdu_type())
             );
         }
+        // If we managed to find the next flag, then set it. Otherwise, fall back to the 
+        // original (or user set) next header
         if (new_flag != 0xff) {
             set_last_next_header(new_flag);
         }
+        else {
+            set_last_next_header(next_header_);
+        }
     }
     else {
         set_last_next_header(0);
@@ -262,6 +283,10 @@ void IPv6::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     for (headers_type::const_iterator it = ext_headers_.begin(); it != ext_headers_.end(); ++it) {
         write_header(*it, stream);
     }
+    // Restore our original header types
+    for (size_t i = 0; i < ext_headers_.size(); ++i) {
+        ext_headers_[i].option(header_types[i]);
+    }
 }
 
 #ifndef BSD
@@ -284,16 +309,14 @@ void IPv6::add_ext_header(const ext_header& header) {
 }
 
 const IPv6::ext_header* IPv6::search_header(ExtensionHeader id) const {
-    uint8_t current_header = header_.next_header;
     headers_type::const_iterator it = ext_headers_.begin();
-    while (it != ext_headers_.end() && current_header != id) {
-        current_header = it->option();
+    while (it != ext_headers_.end()) {
+        if (it->option() == id) {
+            return &*it;
+        }
         ++it;
     }
-    if (it == ext_headers_.end()) {
-        return 0;
-    }
-    return &*it;
+    return 0;
 }
 
 void IPv6::set_last_next_header(uint8_t value) {
diff --git a/tests/src/ipv6_test.cpp b/tests/src/ipv6_test.cpp
index 72809b6..8c7549e 100644
--- a/tests/src/ipv6_test.cpp
+++ b/tests/src/ipv6_test.cpp
@@ -24,7 +24,7 @@ class IPv6Test : public testing::Test {
 public:
     static const uint8_t expected_packet1[], expected_packet2[], 
                          hop_by_hop_options[], broken1[],
-                         fcs_suffix[];
+                         fcs_suffix[], routing_header[];
     
     void test_equals(IPv6& ip1, IPv6& ip2);
 };
@@ -70,6 +70,20 @@ const uint8_t IPv6Test::fcs_suffix[] = {
     0x57, 0xb7
 };
 
+const uint8_t IPv6Test::routing_header[] = {
+    134, 147, 35, 211, 55, 142, 34, 26, 149, 214, 122, 35, 134, 221, 
+    96, 15, 187, 116, 0, 136, 43, 63, 252, 0, 0, 66, 0, 0, 0, 1, 0, 0
+    , 0, 0, 0, 0, 0, 2, 252, 0, 0, 2, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0
+    , 1, 41, 6, 4, 2, 2, 0, 0, 0, 252, 0, 0, 2, 0, 0, 0, 6, 0, 0, 0, 
+    0, 0, 0, 0, 1, 252, 0, 0, 2, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 1, 
+    252, 0, 0, 2, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 1, 96, 15, 187, 
+    116, 0, 40, 6, 64, 252, 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+    1, 252, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 1, 31, 144, 
+    169, 160, 186, 49, 30, 141, 2, 27, 99, 141, 160, 18, 112, 248, 
+    138, 245, 0, 0, 2, 4, 7, 148, 4, 2, 8, 10, 128, 29, 165, 34, 128,
+    29, 165, 34, 1, 3, 3, 7
+};
+
 void IPv6Test::test_equals(IPv6& ip1, IPv6& ip2) {
     EXPECT_EQ(ip1.version(), ip2.version());
     EXPECT_EQ(ip1.traffic_class(), ip2.traffic_class());
@@ -178,6 +192,10 @@ TEST_F(IPv6Test, Serialize) {
 
 TEST_F(IPv6Test, Broken1) {
     EthernetII pkt(broken1, sizeof(broken1));
+    for (auto c : pkt.serialize()) {
+        printf("%2d, ", (int)c);
+    }
+    printf("\n");
     EXPECT_EQ(
         PDU::serialization_type(broken1, broken1 + sizeof(broken1)),
         pkt.serialize()
@@ -317,3 +335,32 @@ TEST_F(IPv6Test, MDLv1Request) {
     );
 }
 
+TEST_F(IPv6Test, OptionIteration) {
+    EthernetII pkt(routing_header, sizeof(routing_header));
+    IPv6& ipv6 = pkt.rfind_pdu<IPv6>();
+    const IPv6::headers_type& headers = ipv6.headers();
+
+    ASSERT_EQ(1, headers.size());
+    const IPv6::ext_header& header = headers[0];
+    EXPECT_EQ(IPv6::ROUTING, header.option());
+}
+
+TEST_F(IPv6Test, OptionAddition) {
+    EthernetII pkt(routing_header, sizeof(routing_header));
+    IPv6& ipv6 = pkt.rfind_pdu<IPv6>();
+    // Add a dummy header
+    ipv6.add_ext_header(IPv6::ext_header(IPv6::AUTHENTICATION));
+
+    const IPv6::headers_type& headers = ipv6.headers();
+
+    ASSERT_EQ(2, headers.size());
+    EXPECT_EQ(IPv6::ROUTING, headers[0].option());
+    EXPECT_EQ(IPv6::AUTHENTICATION, headers[1].option());
+
+    ipv6.serialize();
+    EXPECT_EQ(IPv6::ROUTING, headers[0].option());
+    EXPECT_EQ(IPv6::AUTHENTICATION, headers[1].option());
+
+    EXPECT_TRUE(ipv6.search_header(IPv6::ROUTING) != 0);
+    EXPECT_TRUE(ipv6.search_header(IPv6::AUTHENTICATION) != 0);
+}

From 7589a0a1084eafe92cdf67a0f146e41cd77a411a Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 14 May 2017 10:33:04 -0700
Subject: [PATCH 55/73] Rename IPv6::add_ext_header to IPv6::add_header
 (deprecate former)

---
 include/tins/ipv6.h     | 35 ++++++++++++++++++++++++++++++++++-
 src/ipv6.cpp            |  6 +++++-
 tests/src/ipv6_test.cpp |  2 +-
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/include/tins/ipv6.h b/include/tins/ipv6.h
index 82bf37b..e3a33bd 100644
--- a/include/tins/ipv6.h
+++ b/include/tins/ipv6.h
@@ -31,6 +31,7 @@
 #define TINS_IPV6_h
 
 #include "macros.h"
+#include "cxxstd.h"
 #include "pdu.h"
 #include "endianness.h"
 #include "small_uint.h"
@@ -302,10 +303,42 @@ public:
     /**
      * Adds an extension header.
      * 
+     * \deprecated Use IPv6::add_header
      * \param header The extension header to be added.
      */
-    void add_ext_header(const ext_header& header);
+    TINS_DEPRECATED(void add_ext_header(const ext_header& header));
     
+    /**
+     * Adds an extension header
+     * 
+     * \deprecated Use IPv6::add_header
+     * \param header The extension header to be added.
+     */
+    void add_header(const ext_header& header);
+
+    #if TINS_IS_CXX11
+
+    /**
+     * Adds an extension header by moving it
+     * 
+     * \param header The extension header to be added.
+     */
+    void add_header(ext_header&& header) {
+        ext_headers_.emplace_back(std::move(header));
+    }
+
+    /**
+     * Adds an extension header by using the provided parameters
+     * 
+     * \param header The extension header to be added.
+     */
+    template <typename... Args>
+    void add_header(Args&&... args) {
+        ext_headers_.emplace_back(std::forward<Args>(args)...);
+    }
+
+    #endif // TINS_IS_CXX11
+
     /**
      * \brief Searchs for an extension header that matchs the given 
      * flag.
diff --git a/src/ipv6.cpp b/src/ipv6.cpp
index 31144b2..281433b 100644
--- a/src/ipv6.cpp
+++ b/src/ipv6.cpp
@@ -97,7 +97,7 @@ IPv6::IPv6(const uint8_t* buffer, uint32_t total_sz) {
             }
             // Add a header using the current header type (e.g. what we saw as the next
             // header type in the previous)
-            add_ext_header(ext_header(current_header, payload_size, stream.pointer()));
+            add_header(ext_header(current_header, payload_size, stream.pointer()));
             if (actual_payload_length == 0u && current_header == HOP_BY_HOP) {
                 // could be a jumbogram, look for Jumbo Payload Option
                 InputMemoryStream options(stream.pointer(), payload_size);
@@ -305,6 +305,10 @@ void IPv6::send(PacketSender& sender, const NetworkInterface &) {
 #endif
 
 void IPv6::add_ext_header(const ext_header& header) {
+    add_header(header);
+}
+
+void IPv6::add_header(const ext_header& header) {
     ext_headers_.push_back(header);
 }
 
diff --git a/tests/src/ipv6_test.cpp b/tests/src/ipv6_test.cpp
index 8c7549e..e8017cd 100644
--- a/tests/src/ipv6_test.cpp
+++ b/tests/src/ipv6_test.cpp
@@ -349,7 +349,7 @@ TEST_F(IPv6Test, OptionAddition) {
     EthernetII pkt(routing_header, sizeof(routing_header));
     IPv6& ipv6 = pkt.rfind_pdu<IPv6>();
     // Add a dummy header
-    ipv6.add_ext_header(IPv6::ext_header(IPv6::AUTHENTICATION));
+    ipv6.add_header(IPv6::ext_header(IPv6::AUTHENTICATION));
 
     const IPv6::headers_type& headers = ipv6.headers();
 

From 76395370ded6cd97812fe504c92a280b3aaf0c19 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 14 May 2017 15:01:36 -0700
Subject: [PATCH 56/73] Use the right checks to consider an interface up on
 Windows

Fixes #182

Thanks @gvanem!
---
 src/network_interface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/network_interface.cpp b/src/network_interface.cpp
index 5f511d0..1dfc97d 100644
--- a/src/network_interface.cpp
+++ b/src/network_interface.cpp
@@ -143,6 +143,7 @@ struct InterfaceInfoCollector {
         if (iface_id == uint32_t(iface->IfIndex)) {
             copy(iface->PhysicalAddress, iface->PhysicalAddress + 6, info->hw_addr.begin());
             found_hw = true;
+            info->is_up = (iface->OperStatus == IfOperStatusUp);
             IP_ADAPTER_UNICAST_ADDRESS* unicast = iface->FirstUnicastAddress;
             while (unicast) {
                 int family = ((const struct sockaddr*)unicast->Address.lpSockaddr)->sa_family;
@@ -150,7 +151,6 @@ struct InterfaceInfoCollector {
                     info->ip_addr = IPv4Address(((const struct sockaddr_in *)unicast->Address.lpSockaddr)->sin_addr.s_addr);
                     info->netmask = IPv4Address(host_to_be<uint32_t>(0xffffffff << (32 - unicast->OnLinkPrefixLength)));
                     info->bcast_addr = IPv4Address((info->ip_addr & info->netmask) | ~info->netmask);
-                    info->is_up = (iface->Flags & IP_ADAPTER_IPV4_ENABLED) != 0;
                     found_ip = true;
                 }
                 else if (family == AF_INET6) {

From 1da2c1dcdc2ed1bf3b7cd35d5451796da6b1be8f Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sat, 20 May 2017 13:43:16 -0700
Subject: [PATCH 57/73] Add overload of Sniffer ctor taking only the device

---
 include/tins/sniffer.h | 16 ++++++++----
 src/sniffer.cpp        | 56 ++++++++----------------------------------
 2 files changed, 21 insertions(+), 51 deletions(-)

diff --git a/include/tins/sniffer.h b/include/tins/sniffer.h
index cd0383b..942cd71 100644
--- a/include/tins/sniffer.h
+++ b/include/tins/sniffer.h
@@ -299,13 +299,18 @@ public:
         PROMISC
     };
 
+    /**
+     * \brief Constructs an instance of Sniffer
+     *
+     * \param device The device from which to capture packets
+     */
+    Sniffer(const std::string& device);
+
     /**
      * \brief Constructs an instance of Sniffer using the provided configuration.
      *
-     * This constructor was added as a way to improve the parameter bloat
-     * introduced by the other ones available. You should create an instance
-     * of SnifferConfiguration, set the desired parameters, and then use it
-     * when constructing a Sniffer object.
+     * Use the SnifferConfiguration object to specify how you want to configure
+     * the properties of this sniffer
      *
      * \sa SnifferConfiguration
      *
@@ -344,12 +349,13 @@ public:
      * \param filter A capture filter to be used on the sniffing session.(optional);
      * \param rfmon Indicates if the interface should be put in monitor mode.(optional);
      */
-    TINS_DEPRECATED(Sniffer(const std::string& device, promisc_type promisc = NON_PROMISC,
+    TINS_DEPRECATED(Sniffer(const std::string& device, promisc_type promisc,
                     const std::string& filter = "", bool rfmon = false));
 
 private:
     friend class SnifferConfiguration;
 
+    void init(const std::string& device, const SnifferConfiguration& configuration);
     void set_snap_len(unsigned snap_len);
     void set_buffer_size(unsigned buffer_size);
     void set_promisc_mode(bool promisc_enabled);
diff --git a/src/sniffer.cpp b/src/sniffer.cpp
index e393a1d..105b2e1 100644
--- a/src/sniffer.cpp
+++ b/src/sniffer.cpp
@@ -232,30 +232,12 @@ bool BaseSniffer::set_direction(pcap_direction_t d) {
 
 // ****************************** Sniffer ******************************
 
+Sniffer::Sniffer(const string& device) {
+    init(device, SnifferConfiguration());
+}
+
 Sniffer::Sniffer(const string& device, const SnifferConfiguration& configuration) {
-    char error[PCAP_ERRBUF_SIZE];
-    pcap_t* phandle = pcap_create(TINS_PREFIX_INTERFACE(device).c_str(), error);
-    if (!phandle) {
-        throw pcap_error(error);
-    }
-    set_pcap_handle(phandle);
-
-    // Set the netmask if we are able to find it.
-    bpf_u_int32 ip, if_mask;
-    if (pcap_lookupnet(TINS_PREFIX_INTERFACE(device).c_str(), &ip, &if_mask, error) == 0) {
-        set_if_mask(if_mask);
-    }
-
-    // Configure the sniffer's attributes prior to activation.
-    configuration.configure_sniffer_pre_activation(*this);
-
-    // Finally, activate the pcap. In case of error, throw
-    if (pcap_activate(get_pcap_handle()) < 0) {
-        throw pcap_error(pcap_geterr(get_pcap_handle()));
-    }
-
-    // Configure the sniffer's attributes after activation.
-    configuration.configure_sniffer_post_activation(*this);
+    init(device, configuration);
 }
 
 Sniffer::Sniffer(const string& device,
@@ -269,29 +251,7 @@ Sniffer::Sniffer(const string& device,
     configuration.set_filter(filter);
     configuration.set_rfmon(rfmon);
 
-    char error[PCAP_ERRBUF_SIZE];
-    pcap_t* phandle = pcap_create(TINS_PREFIX_INTERFACE(device).c_str(), error);
-    if (!phandle) {
-        throw pcap_error(error);
-    }
-    set_pcap_handle(phandle);
-
-    // Set the netmask if we are able to find it.
-    bpf_u_int32 ip, if_mask;
-    if (pcap_lookupnet(TINS_PREFIX_INTERFACE(device).c_str(), &ip, &if_mask, error) == 0) {
-        set_if_mask(if_mask);
-    }
-
-    // Configure the sniffer's attributes prior to activation.
-    configuration.configure_sniffer_pre_activation(*this);
-
-    // Finally, activate the pcap. In case of error, throw
-    if (pcap_activate(get_pcap_handle()) < 0) {
-        throw pcap_error(pcap_geterr(get_pcap_handle()));
-    }
-
-    // Configure the sniffer's attributes after activation.
-    configuration.configure_sniffer_post_activation(*this);
+    init(device, configuration);
 }
 
 Sniffer::Sniffer(const string& device, 
@@ -303,6 +263,10 @@ Sniffer::Sniffer(const string& device,
     configuration.set_filter(filter);
     configuration.set_rfmon(rfmon);
 
+    init(device, configuration);
+}
+
+void Sniffer::init(const string& device, const SnifferConfiguration& configuration) {
     char error[PCAP_ERRBUF_SIZE];
     pcap_t* phandle = pcap_create(TINS_PREFIX_INTERFACE(device).c_str(), error);
     if (!phandle) {

From d29296935e10f89cb56a10d26a5efedc5b52575c Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 21 May 2017 09:16:41 -0700
Subject: [PATCH 58/73] Fix C++03 build issues on PDU option

---
 include/tins/pdu_option.h |  8 ++++++++
 src/pdu_option.cpp        | 26 ++++++++++++++++----------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/include/tins/pdu_option.h b/include/tins/pdu_option.h
index 4724e56..e866128 100644
--- a/include/tins/pdu_option.h
+++ b/include/tins/pdu_option.h
@@ -54,6 +54,8 @@ namespace Internals {
     namespace Converters {
         uint8_t convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian,
                         type_to_type<uint8_t>);
+        int8_t convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian,
+                        type_to_type<int8_t>);
         uint16_t convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian,
                          type_to_type<uint16_t>);
         uint32_t convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian,
@@ -110,6 +112,12 @@ namespace Internals {
                                        PDUType::endianness, type);
         }
 
+        template <typename U, typename X, typename PDUType>
+        static U do_convert(const PDUOption<X, PDUType>& opt, type_to_type<int8_t> type) {
+            return Converters::convert(opt.data_ptr(), opt.data_size(),
+                                       PDUType::endianness, type);
+        }
+
         template <typename U, typename X, typename PDUType>
         static U do_convert(const PDUOption<X, PDUType>& opt, type_to_type<uint16_t> type) {
             return Converters::convert(opt.data_ptr(), opt.data_size(),
diff --git a/src/pdu_option.cpp b/src/pdu_option.cpp
index 90b2450..de85404 100644
--- a/src/pdu_option.cpp
+++ b/src/pdu_option.cpp
@@ -81,11 +81,10 @@ vector<T> convert_vector(const uint8_t* u8_ptr, uint32_t data_size, PDU::endian_
     return output;
 }
 
-template<typename T, typename U,
-         typename = typename enable_if<is_unsigned_integral<T>::value &&
-                                       is_unsigned_integral<U>::value>::type>
-vector<std::pair<T, U> > convert_vector(const uint8_t* ptr, uint32_t data_size,
-                                        PDU::endian_type endian) {
+template<typename T, typename U>
+typename enable_if<is_unsigned_integral<T>::value && is_unsigned_integral<U>::value,
+                   vector<std::pair<T, U> > >::type
+convert_vector(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian) {
     if (data_size % (sizeof(T) + sizeof(U)) != 0) {
         throw malformed_option();
     }
@@ -111,10 +110,10 @@ vector<std::pair<T, U> > convert_vector(const uint8_t* ptr, uint32_t data_size,
     return output;
 }
 
-template<typename T, typename U,
-         typename = typename enable_if<is_unsigned_integral<T>::value &&
-                                       is_unsigned_integral<U>::value>::type>
-std::pair<T, U> convert_pair(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian) {
+template<typename T, typename U>
+typename enable_if<is_unsigned_integral<T>::value && is_unsigned_integral<U>::value,
+                   std::pair<T, U> >::type
+convert_pair(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian) {
     if (data_size != sizeof(T) + sizeof(U)) {
         throw malformed_option();
     }
@@ -139,6 +138,13 @@ uint8_t convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type, type_t
     return *ptr;
 }
 
+int8_t convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type, type_to_type<int8_t>) {
+    if (data_size != 1) {
+        throw malformed_option();
+    }
+    return *ptr;
+}
+
 uint16_t convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian,
                  type_to_type<uint16_t>) {
     return convert_to_integral<uint16_t>(ptr, data_size, endian);
@@ -250,7 +256,7 @@ vector<IPv6Address> convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_
     return output;
 }
 
-vector<pair<uint8_t, uint8_t>> convert(const uint8_t* ptr, uint32_t data_size,
+vector<pair<uint8_t, uint8_t> > convert(const uint8_t* ptr, uint32_t data_size,
                                        PDU::endian_type endian,
                                        type_to_type<vector<pair<uint8_t, uint8_t> > >) {
     return convert_vector<uint8_t, uint8_t>(ptr, data_size, endian);

From b8e4c7248b234baebdd0622b701197add48f5a9a Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 21 May 2017 10:06:13 -0700
Subject: [PATCH 59/73] Add RadioTapParser class

---
 CMakeLists.txt                       |   1 +
 include/tins/radiotap.h              |   5 +
 include/tins/utils/radiotap_parser.h | 134 ++++++++++++++
 src/CMakeLists.txt                   |   1 +
 src/utils/radiotap_parser.cpp        | 264 +++++++++++++++++++++++++++
 tests/src/radiotap_test.cpp          |  62 +++++++
 6 files changed, 467 insertions(+)
 create mode 100644 include/tins/utils/radiotap_parser.h
 create mode 100644 src/utils/radiotap_parser.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29d7d2c..91237ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -291,6 +291,7 @@ IF(LIBTINS_BUILD_TESTS)
             BINARY_DIR ${GOOGLETEST_BINARY_DIR}
             CMAKE_CACHE_ARGS "-DBUILD_GTEST:bool=ON" "-DBUILD_GMOCK:bool=OFF"
                             "-Dgtest_force_shared_crt:bool=ON"
+                            "-DCMAKE_CXX_COMPILER:path=${CMAKE_CXX_COMPILER}"
             INSTALL_COMMAND ""
         )
         # Make sure we build googletest before anything else
diff --git a/include/tins/radiotap.h b/include/tins/radiotap.h
index 0855146..14cf6e9 100644
--- a/include/tins/radiotap.h
+++ b/include/tins/radiotap.h
@@ -54,6 +54,11 @@ public:
      */
     static const PDU::PDUType pdu_flag = PDU::RADIOTAP;
 
+    /**
+     * RadioTap is little endian
+     */
+    static const endian_type endianness = LE;
+
     /**
      * \brief Enumeration of the different channel type flags.
      * 
diff --git a/include/tins/utils/radiotap_parser.h b/include/tins/utils/radiotap_parser.h
new file mode 100644
index 0000000..05b0026
--- /dev/null
+++ b/include/tins/utils/radiotap_parser.h
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef TINS_RADIOTAP_PARSER_H
+#define TINS_RADIOTAP_PARSER_H
+
+#include <stdint.h>
+#include "macros.h"
+#include "radiotap.h"
+#include "pdu_option.h"
+
+namespace Tins {
+namespace Utils {
+
+struct RadioTapFlags;
+
+/**
+ * \brief Allows parsing RadioTap options
+ *
+ * RadioTap is a somehow tricky protocol to be parsed, as it has ordered flags,
+ * alignment between options, etc. This class allows parsing options in a RadioTap
+ * header without much trouble.
+ */
+class RadioTapParser {
+public:
+    /**
+     * Represents the RadioTap namespace currently being parsed
+     */
+    enum NamespaceType {
+        RADIOTAP_NS,
+        VENDOR_NS,
+        UNKNOWN_NS
+    };
+
+    typedef PDUOption<uint8_t, RadioTap> option;
+
+    /**
+     * The RadioTap header
+     */
+    TINS_BEGIN_PACK
+    struct RadiotapHeader {
+    #if TINS_IS_LITTLE_ENDIAN
+        uint8_t version; 
+        uint8_t padding;
+    #else
+        uint8_t padding;
+        uint8_t version;
+    #endif // TINS_IS_LITTLE_ENDIAN 
+        uint16_t length;
+        uint32_t flags;
+    } TINS_END_PACK;
+
+    /**
+     * \brief Constructs a RadioTap parser around a payload
+     *
+     * Note that the payload is not copied, hence it must be kept in 
+     * scope while the parser is still being used.
+     *
+     * The buffer should contain an entire RadioTap header, with optionally
+     * extra data at the end, which will be ignored.
+     *
+     * \param buffer The buffer to be parsed
+     */
+    RadioTapParser(const std::vector<uint8_t>& buffer);
+
+    /**
+     * Gets the current namespace being parsed
+     */
+    NamespaceType current_namespace() const;
+
+    /**
+     * Gets the current field being parsed
+     */
+    RadioTap::PresentFlags current_field() const;
+
+    /**
+     * Gets the option the parsed is currently pointing at
+     */
+    option current_option();
+
+    /**
+     * \brief Advances to the next option
+     *
+     * If there's a namespace change, this will handle that as well.
+     *
+     * \returns true iff advancing was successfull (e.g. false if we reached
+     * the end of the header)
+     */
+    bool advance_field();
+private:
+    const uint8_t* find_options_start() const;
+    bool advance_to_next_field(bool start_from_zero);
+    bool advance_to_next_namespace();
+    const RadioTapFlags* get_flags_ptr() const;
+    bool is_field_set(uint32_t bit, const RadioTapFlags* flags) const;
+
+    const uint8_t* start_;
+    const uint8_t* end_; 
+    const uint8_t* current_ptr_;
+    NamespaceType current_namespace_;
+    uint32_t current_bit_;
+    uint32_t namespace_index_;
+};
+
+} // Utils
+} // Tins
+
+#endif // TINS_RADIOTAP_PARSER_H
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d2dbcb4..8068b7c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -76,6 +76,7 @@ set(SOURCES
     dot11/dot11_control.cpp
     utils/checksum_utils.cpp
     utils/frequency_utils.cpp
+    utils/radiotap_parser.cpp
     utils/routing_utils.cpp
     utils/resolve_utils.cpp
     utils/pdu_utils.cpp
diff --git a/src/utils/radiotap_parser.cpp b/src/utils/radiotap_parser.cpp
new file mode 100644
index 0000000..1aed722
--- /dev/null
+++ b/src/utils/radiotap_parser.cpp
@@ -0,0 +1,264 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "utils/radiotap_parser.h"
+#include "exceptions.h"
+
+using std::vector;
+
+namespace Tins {
+namespace Utils {
+
+struct FieldMetadata {
+    uint32_t size;
+    uint32_t alignment;
+};
+
+static const FieldMetadata RADIOTAP_METADATA[] = {
+    { 8, 8 }, /// TSFT
+    { 1, 1 }, // FLAGS
+    { 1, 1 }, // RATE
+    { 4, 2 }, // CHANNEL
+    { 2, 2 }, // FHSS
+    { 1, 1 }, // DBM_SIGNAL
+    { 1, 1 }, // DBM_NOISE
+    { 2, 2 }, // LOCK_QUALITY
+    { 2, 2 }, // TX_ATTENUATION
+    { 2, 2 }, // DB_TX_ATTENUATION
+    { 1, 1 }, // DBM_TX_ATTENUATION
+    { 1, 1 }, // ANTENNA
+    { 1, 1 }, // DB_SIGNAL
+    { 1, 1 }, // DB_NOISE
+    { 2, 2 }, // RX_FLAGS
+    { 2, 2 }, // TX_FLAGS
+    { 1, 1 }, // RTS_RETRIES
+    { 1, 1 }, // DATA_RETRIES
+    { 4, 4 }, // CHANNEL_PLUS
+    { 3, 1 }, // MCS
+};
+
+static const uint64_t BIT_LIMIT = sizeof(RADIOTAP_METADATA) / sizeof(FieldMetadata) + 1;
+
+#if TINS_IS_LITTLE_ENDIAN
+TINS_BEGIN_PACK
+struct RadioTapFlags {
+    uint32_t
+        tsft:1,
+        flags:1,
+        rate:1,
+        channel:1,
+        fhss:1,
+        dbm_signal:1,
+        dbm_noise:1,
+        lock_quality:1,
+
+        tx_attenuation:1,
+        db_tx_attenuation:1,
+        dbm_tx_power:1,
+        antenna:1,
+        db_signal:1,
+        db_noise:1,
+        rx_flags:1,
+        tx_flags:1,
+
+        reserved1:1,
+        data_retries:1,
+        channel_plus:1,
+        mcs:1,
+        reserved2:4,
+
+        reserved3:7,
+        ext:1;
+} TINS_END_PACK;
+#else
+TINS_BEGIN_PACK
+struct RadioTapFlags {
+    uint32_t
+        lock_quality:1,
+        dbm_noise:1,
+        dbm_signal:1,
+        fhss:1,
+        channel:1,
+        rate:1,
+        flags:1,
+        tsft:1,
+
+        tx_flags:1,
+        rx_flags:1,
+        db_noise:1,
+        db_signal:1,
+        antenna:1,
+        dbm_tx_power:1,
+        db_tx_attenuation:1,
+        tx_attenuation:1,
+
+        reserved2:4,
+        mcs:1,
+        channel_plus:1,
+        data_retries:1,
+        reserved1:1,
+
+        ext:1,
+        reserved3:7;
+} TINS_END_PACK;
+#endif
+
+void align_buffer(const uint8_t* buffer_start, const uint8_t*& buffer, uint32_t size, size_t n) {
+    uint32_t offset = ((buffer - buffer_start) % n);
+    if (offset) {
+        offset = n - offset;
+        if (offset > size) {
+            throw malformed_packet();
+        }
+        buffer += offset;
+    }
+}
+
+RadioTapParser::RadioTapParser(const vector<uint8_t>& buffer)
+: current_namespace_(RADIOTAP_NS), current_bit_(0), namespace_index_(0) {
+    if (TINS_UNLIKELY(buffer.empty())) {
+        throw malformed_packet();
+    }
+    start_ = &*buffer.begin();
+    end_ = start_ + buffer.size();
+    const size_t max_size = end_ - start_;
+    if (TINS_UNLIKELY(max_size < sizeof(RadiotapHeader))) {
+        throw malformed_packet();
+    }
+    const RadiotapHeader* radio = (const RadiotapHeader*)start_;
+    end_ = start_ + Endian::le_to_host(radio->length);
+    current_ptr_ = find_options_start();
+    // Skip all fields and make this point to the first flags one
+    advance_to_next_field(true /* start from bit zero */);
+}
+
+RadioTapParser::NamespaceType RadioTapParser::current_namespace() const {
+    return current_namespace_;
+}
+
+RadioTap::PresentFlags RadioTapParser::current_field() const {
+    return static_cast<RadioTap::PresentFlags>(1 << current_bit_);
+}
+
+RadioTapParser::option RadioTapParser::current_option() {
+    const uint32_t size = RADIOTAP_METADATA[current_bit_].size;
+    if (TINS_UNLIKELY(current_ptr_ + size > end_)) {
+        throw malformed_packet();
+    }
+    return option(current_field(), size, current_ptr_);
+}
+
+bool RadioTapParser::advance_field() {
+    // If we manage to advance the field, return true
+    if (advance_to_next_field(false /* keep going from current */)) {
+        return true;
+    }
+    // Otherwise, let's try advancing the namespace. If we fail, then we failed
+    if (!advance_to_next_namespace()) {
+        return false;
+    }
+    // Otherwise restart bit and try to find the first field in this namespace
+    current_bit_ = 0;
+    return advance_to_next_field(true /* start from 0*/);
+}
+
+const uint8_t* RadioTapParser::find_options_start() const {
+    uint32_t total_sz = end_ - start_;
+    if (TINS_UNLIKELY(total_sz < sizeof(RadiotapHeader))) {
+        throw malformed_packet();
+    }
+    // Skip fields before the flags one
+    const RadioTapFlags* flags = get_flags_ptr();
+    while (flags->ext == 1) {
+        if (TINS_UNLIKELY(total_sz < sizeof(RadioTapFlags))) {
+            throw malformed_packet();
+        }
+        ++flags;
+        total_sz -= sizeof(RadioTapFlags);
+    }
+    return reinterpret_cast<const uint8_t*>(flags) + sizeof(RadioTapFlags);
+}
+
+bool RadioTapParser::advance_to_next_field(bool start_from_zero) {
+    const RadioTapFlags* flags = get_flags_ptr();
+    uint64_t bit;
+    if (start_from_zero) {
+        bit = 0;
+    }
+    else {
+        // Skip the payload
+        current_ptr_ += RADIOTAP_METADATA[current_bit_].size;
+        bit = current_bit_ + 1;
+    }
+    while (!is_field_set(1 << bit, flags) && bit < BIT_LIMIT) {
+        bit++; 
+    }
+    if (bit < BIT_LIMIT) {
+        // Skip and align the buffer
+        align_buffer(start_, current_ptr_, end_ - start_, RADIOTAP_METADATA[bit].alignment);
+        current_bit_ = bit;
+        return true;
+    }
+    return false;
+}
+
+bool RadioTapParser::advance_to_next_namespace() {
+    const uint32_t initial_index = namespace_index_;
+    while (get_flags_ptr()->ext == 1) {
+        const RadioTapFlags* flags = get_flags_ptr();
+        if (is_field_set(29, flags)) {
+            current_namespace_ = RADIOTAP_NS;
+        }
+        else if (is_field_set(30, flags)) {
+            current_namespace_ = VENDOR_NS;
+        }
+        else {
+            current_namespace_ = UNKNOWN_NS;
+        }
+        namespace_index_++;
+    }
+    return initial_index != namespace_index_;
+}
+
+bool RadioTapParser::is_field_set(uint32_t bit, const RadioTapFlags* flags) const {
+    TINS_BEGIN_PACK
+    union FlagsUnion {
+        RadioTapFlags* flags;
+        uint32_t flags_32;
+    } TINS_END_PACK;
+    const FlagsUnion* flags_union = reinterpret_cast<const FlagsUnion*>(flags); 
+    return (Endian::le_to_host(flags_union->flags_32) & bit) != 0;
+}
+
+const RadioTapFlags* RadioTapParser::get_flags_ptr() const {
+    return (const RadioTapFlags*)(start_ + sizeof(uint32_t) * (namespace_index_ + 1));
+}
+
+} // Utils
+} // Tins
diff --git a/tests/src/radiotap_test.cpp b/tests/src/radiotap_test.cpp
index 6618d36..2f215cb 100644
--- a/tests/src/radiotap_test.cpp
+++ b/tests/src/radiotap_test.cpp
@@ -12,9 +12,11 @@
 #include "snap.h"
 #include "eapol.h"
 #include "utils.h"
+#include "utils/radiotap_parser.h"
 
 using namespace std;
 using namespace Tins;
+using Tins::Utils::RadioTapParser;
 
 class RadioTapTest : public testing::Test {
 public:
@@ -400,4 +402,64 @@ TEST_F(RadioTapTest, SerializationWorksFine) {
     );
 }
 
+// RadioTapParser
+
+TEST_F(RadioTapTest, RadioTapParsing) {
+    vector<uint8_t> buffer(expected_packet, expected_packet + sizeof(expected_packet));
+    RadioTapParser parser(buffer);
+    EXPECT_EQ(RadioTap::TSTF, parser.current_field());
+    EXPECT_EQ(616089172U, parser.current_option().to<uint64_t>());
+    EXPECT_TRUE(parser.advance_field());
+    
+    EXPECT_EQ(RadioTap::FLAGS, parser.current_field());
+    EXPECT_EQ((uint32_t)RadioTap::FCS, parser.current_option().to<uint8_t>());
+    EXPECT_TRUE(parser.advance_field());
+
+    EXPECT_EQ(RadioTap::RATE, parser.current_field());
+    EXPECT_EQ(12, parser.current_option().to<uint8_t>());
+    EXPECT_TRUE(parser.advance_field());
+    
+    EXPECT_EQ(RadioTap::DBM_SIGNAL, parser.current_field());
+    EXPECT_EQ(-38, parser.current_option().to<int8_t>());
+    EXPECT_TRUE(parser.advance_field());
+    
+    EXPECT_EQ(RadioTap::DBM_NOISE, parser.current_field());
+    EXPECT_EQ(-96, parser.current_option().to<int8_t>());
+    EXPECT_TRUE(parser.advance_field());
+    
+    EXPECT_EQ(RadioTap::ANTENNA, parser.current_field());
+    EXPECT_EQ(2, parser.current_option().to<uint8_t>());
+    EXPECT_TRUE(parser.advance_field());
+    
+    EXPECT_EQ(RadioTap::CHANNEL_PLUS,parser.current_field());
+    EXPECT_EQ(0x140U, parser.current_option().to<uint32_t>());
+
+    EXPECT_FALSE(parser.advance_field());
+}
+
+TEST_F(RadioTapTest, RadioTapParsingMultipleNamespaces) {
+    vector<uint8_t> buffer(expected_packet4, expected_packet4 + sizeof(expected_packet4));
+    RadioTapParser parser(buffer);
+    EXPECT_EQ(RadioTapParser::RADIOTAP_NS, parser.current_namespace());
+    while (parser.current_field() != RadioTap::MCS) {
+        ASSERT_TRUE(parser.advance_field());
+    }
+    // MCS is the last option in this namespace. After this, we should jump to the next one
+    EXPECT_TRUE(parser.advance_field());
+
+    // These are on the second namespace
+    EXPECT_EQ(RadioTap::DBM_SIGNAL, parser.current_field());
+    EXPECT_EQ(-70, parser.current_option().to<int8_t>());
+    EXPECT_TRUE(parser.advance_field());
+
+    EXPECT_EQ(RadioTap::ANTENNA, parser.current_field());
+    EXPECT_EQ(0, parser.current_option().to<uint8_t>());
+    EXPECT_FALSE(parser.advance_field());
+
+    // Subsequent calls shouldn't change anything
+    EXPECT_FALSE(parser.advance_field());
+    EXPECT_FALSE(parser.advance_field());
+    EXPECT_EQ(RadioTapParser::RADIOTAP_NS, parser.current_namespace());
+}
+
 #endif // TINS_HAVE_DOT11

From a641589b09c24b05a4bb3d5f16ab6cb4582defa7 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 21 May 2017 12:56:22 -0700
Subject: [PATCH 60/73] Make RadioTapParser work using only the options buffer

---
 include/tins/utils/radiotap_parser.h | 11 ++++++---
 src/utils/radiotap_parser.cpp        | 34 ++++++++++++++++------------
 tests/src/radiotap_test.cpp          |  4 ++--
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/include/tins/utils/radiotap_parser.h b/include/tins/utils/radiotap_parser.h
index 05b0026..f63ff7d 100644
--- a/include/tins/utils/radiotap_parser.h
+++ b/include/tins/utils/radiotap_parser.h
@@ -31,9 +31,9 @@
 #define TINS_RADIOTAP_PARSER_H
 
 #include <stdint.h>
-#include "macros.h"
-#include "radiotap.h"
-#include "pdu_option.h"
+#include "../macros.h"
+#include "../radiotap.h"
+#include "../pdu_option.h"
 
 namespace Tins {
 namespace Utils {
@@ -104,6 +104,11 @@ public:
      */
     option current_option();
 
+    /**
+     * Gets the pointer at which the current option is located
+     */
+    const uint8_t* current_option_ptr() const;
+
     /**
      * \brief Advances to the next option
      *
diff --git a/src/utils/radiotap_parser.cpp b/src/utils/radiotap_parser.cpp
index 1aed722..8954af5 100644
--- a/src/utils/radiotap_parser.cpp
+++ b/src/utils/radiotap_parser.cpp
@@ -142,20 +142,18 @@ void align_buffer(const uint8_t* buffer_start, const uint8_t*& buffer, uint32_t
 
 RadioTapParser::RadioTapParser(const vector<uint8_t>& buffer)
 : current_namespace_(RADIOTAP_NS), current_bit_(0), namespace_index_(0) {
-    if (TINS_UNLIKELY(buffer.empty())) {
-        throw malformed_packet();
+    if (buffer.empty()) {
+        start_ = 0;
+        end_ = 0;
+        current_ptr_ = start_;
     }
-    start_ = &*buffer.begin();
-    end_ = start_ + buffer.size();
-    const size_t max_size = end_ - start_;
-    if (TINS_UNLIKELY(max_size < sizeof(RadiotapHeader))) {
-        throw malformed_packet();
+    else {
+        start_ = &*buffer.begin();
+        end_ = start_ + buffer.size();
+        current_ptr_ = find_options_start();
+        // Skip all fields and make this point to the first flags one
+        advance_to_next_field(true /* start from bit zero */);
     }
-    const RadiotapHeader* radio = (const RadiotapHeader*)start_;
-    end_ = start_ + Endian::le_to_host(radio->length);
-    current_ptr_ = find_options_start();
-    // Skip all fields and make this point to the first flags one
-    advance_to_next_field(true /* start from bit zero */);
 }
 
 RadioTapParser::NamespaceType RadioTapParser::current_namespace() const {
@@ -174,6 +172,10 @@ RadioTapParser::option RadioTapParser::current_option() {
     return option(current_field(), size, current_ptr_);
 }
 
+const uint8_t* RadioTapParser::current_option_ptr() const {
+    return current_ptr_;
+}
+
 bool RadioTapParser::advance_field() {
     // If we manage to advance the field, return true
     if (advance_to_next_field(false /* keep going from current */)) {
@@ -190,7 +192,7 @@ bool RadioTapParser::advance_field() {
 
 const uint8_t* RadioTapParser::find_options_start() const {
     uint32_t total_sz = end_ - start_;
-    if (TINS_UNLIKELY(total_sz < sizeof(RadiotapHeader))) {
+    if (TINS_UNLIKELY(total_sz < sizeof(RadioTapFlags))) {
         throw malformed_packet();
     }
     // Skip fields before the flags one
@@ -220,8 +222,10 @@ bool RadioTapParser::advance_to_next_field(bool start_from_zero) {
         bit++; 
     }
     if (bit < BIT_LIMIT) {
+        const uint8_t* radiotap_start = start_ - sizeof(uint32_t);
         // Skip and align the buffer
-        align_buffer(start_, current_ptr_, end_ - start_, RADIOTAP_METADATA[bit].alignment);
+        align_buffer(radiotap_start, current_ptr_, end_ - radiotap_start,
+                     RADIOTAP_METADATA[bit].alignment);
         current_bit_ = bit;
         return true;
     }
@@ -257,7 +261,7 @@ bool RadioTapParser::is_field_set(uint32_t bit, const RadioTapFlags* flags) cons
 }
 
 const RadioTapFlags* RadioTapParser::get_flags_ptr() const {
-    return (const RadioTapFlags*)(start_ + sizeof(uint32_t) * (namespace_index_ + 1));
+    return (const RadioTapFlags*)(start_ + sizeof(uint32_t) * namespace_index_);
 }
 
 } // Utils
diff --git a/tests/src/radiotap_test.cpp b/tests/src/radiotap_test.cpp
index 2f215cb..0166197 100644
--- a/tests/src/radiotap_test.cpp
+++ b/tests/src/radiotap_test.cpp
@@ -405,7 +405,7 @@ TEST_F(RadioTapTest, SerializationWorksFine) {
 // RadioTapParser
 
 TEST_F(RadioTapTest, RadioTapParsing) {
-    vector<uint8_t> buffer(expected_packet, expected_packet + sizeof(expected_packet));
+    vector<uint8_t> buffer(expected_packet+4, expected_packet + sizeof(expected_packet)-4);
     RadioTapParser parser(buffer);
     EXPECT_EQ(RadioTap::TSTF, parser.current_field());
     EXPECT_EQ(616089172U, parser.current_option().to<uint64_t>());
@@ -438,7 +438,7 @@ TEST_F(RadioTapTest, RadioTapParsing) {
 }
 
 TEST_F(RadioTapTest, RadioTapParsingMultipleNamespaces) {
-    vector<uint8_t> buffer(expected_packet4, expected_packet4 + sizeof(expected_packet4));
+    vector<uint8_t> buffer(expected_packet4+4, expected_packet4 + sizeof(expected_packet4)-4);
     RadioTapParser parser(buffer);
     EXPECT_EQ(RadioTapParser::RADIOTAP_NS, parser.current_namespace());
     while (parser.current_field() != RadioTap::MCS) {

From 4e95797710065017394f05a0ff84bd7dfdeabe12 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 21 May 2017 13:09:53 -0700
Subject: [PATCH 61/73] Allow constructing RadioTapParser from an empty buffer

---
 include/tins/utils/radiotap_parser.h | 21 +++++----------------
 src/utils/radiotap_parser.cpp        | 19 ++++++++++++++-----
 tests/src/radiotap_test.cpp          | 10 ++++++++++
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/include/tins/utils/radiotap_parser.h b/include/tins/utils/radiotap_parser.h
index f63ff7d..4afd980 100644
--- a/include/tins/utils/radiotap_parser.h
+++ b/include/tins/utils/radiotap_parser.h
@@ -60,22 +60,6 @@ public:
 
     typedef PDUOption<uint8_t, RadioTap> option;
 
-    /**
-     * The RadioTap header
-     */
-    TINS_BEGIN_PACK
-    struct RadiotapHeader {
-    #if TINS_IS_LITTLE_ENDIAN
-        uint8_t version; 
-        uint8_t padding;
-    #else
-        uint8_t padding;
-        uint8_t version;
-    #endif // TINS_IS_LITTLE_ENDIAN 
-        uint16_t length;
-        uint32_t flags;
-    } TINS_END_PACK;
-
     /**
      * \brief Constructs a RadioTap parser around a payload
      *
@@ -118,6 +102,11 @@ public:
      * the end of the header)
      */
     bool advance_field();
+
+    /**
+     * Indicates whether this RadioTap options buffer contains any fields set
+     */
+    bool has_fields() const;
 private:
     const uint8_t* find_options_start() const;
     bool advance_to_next_field(bool start_from_zero);
diff --git a/src/utils/radiotap_parser.cpp b/src/utils/radiotap_parser.cpp
index 8954af5..677064c 100644
--- a/src/utils/radiotap_parser.cpp
+++ b/src/utils/radiotap_parser.cpp
@@ -63,7 +63,7 @@ static const FieldMetadata RADIOTAP_METADATA[] = {
     { 3, 1 }, // MCS
 };
 
-static const uint64_t BIT_LIMIT = sizeof(RADIOTAP_METADATA) / sizeof(FieldMetadata) + 1;
+static const uint32_t BIT_LIMIT = sizeof(RADIOTAP_METADATA) / sizeof(FieldMetadata) + 1;
 
 #if TINS_IS_LITTLE_ENDIAN
 TINS_BEGIN_PACK
@@ -141,7 +141,7 @@ void align_buffer(const uint8_t* buffer_start, const uint8_t*& buffer, uint32_t
 }
 
 RadioTapParser::RadioTapParser(const vector<uint8_t>& buffer)
-: current_namespace_(RADIOTAP_NS), current_bit_(0), namespace_index_(0) {
+: current_namespace_(RADIOTAP_NS), current_bit_(BIT_LIMIT), namespace_index_(0) {
     if (buffer.empty()) {
         start_ = 0;
         end_ = 0;
@@ -177,19 +177,28 @@ const uint8_t* RadioTapParser::current_option_ptr() const {
 }
 
 bool RadioTapParser::advance_field() {
+    // If we have no buffer to parse, then we can't advance
+    if (start_ == 0 || current_bit_ == BIT_LIMIT) {
+        return false;
+    }
     // If we manage to advance the field, return true
     if (advance_to_next_field(false /* keep going from current */)) {
         return true;
     }
+    // We finished iterating the current namespace (if any). Reset our bit
+    current_bit_ = BIT_LIMIT;
     // Otherwise, let's try advancing the namespace. If we fail, then we failed
     if (!advance_to_next_namespace()) {
         return false;
     }
-    // Otherwise restart bit and try to find the first field in this namespace
-    current_bit_ = 0;
+    // Try to find the first field in this new namespace
     return advance_to_next_field(true /* start from 0*/);
 }
 
+bool RadioTapParser::has_fields() const {
+    return current_bit_ != BIT_LIMIT;
+}
+
 const uint8_t* RadioTapParser::find_options_start() const {
     uint32_t total_sz = end_ - start_;
     if (TINS_UNLIKELY(total_sz < sizeof(RadioTapFlags))) {
@@ -209,7 +218,7 @@ const uint8_t* RadioTapParser::find_options_start() const {
 
 bool RadioTapParser::advance_to_next_field(bool start_from_zero) {
     const RadioTapFlags* flags = get_flags_ptr();
-    uint64_t bit;
+    uint32_t bit;
     if (start_from_zero) {
         bit = 0;
     }
diff --git a/tests/src/radiotap_test.cpp b/tests/src/radiotap_test.cpp
index 0166197..59c5a1b 100644
--- a/tests/src/radiotap_test.cpp
+++ b/tests/src/radiotap_test.cpp
@@ -446,6 +446,7 @@ TEST_F(RadioTapTest, RadioTapParsingMultipleNamespaces) {
     }
     // MCS is the last option in this namespace. After this, we should jump to the next one
     EXPECT_TRUE(parser.advance_field());
+    EXPECT_TRUE(parser.has_fields());
 
     // These are on the second namespace
     EXPECT_EQ(RadioTap::DBM_SIGNAL, parser.current_field());
@@ -460,6 +461,15 @@ TEST_F(RadioTapTest, RadioTapParsingMultipleNamespaces) {
     EXPECT_FALSE(parser.advance_field());
     EXPECT_FALSE(parser.advance_field());
     EXPECT_EQ(RadioTapParser::RADIOTAP_NS, parser.current_namespace());
+    EXPECT_FALSE(parser.has_fields());
+}
+
+TEST_F(RadioTapTest, RadioTapParsingUsingEmptyBuffer) {
+    vector<uint8_t> buffer;
+    RadioTapParser parser(buffer);
+    EXPECT_FALSE(parser.has_fields());
+    EXPECT_FALSE(parser.advance_field());
+    EXPECT_FALSE(parser.has_fields());
 }
 
 #endif // TINS_HAVE_DOT11

From 7af1ec0984a359d39321e72a10afecb7b798df95 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Tue, 23 May 2017 19:07:49 -0700
Subject: [PATCH 62/73] Add some useful member functions to RadioTapParser

---
 include/tins/utils/radiotap_parser.h | 44 ++++++++++++++++++++++++-
 src/utils/radiotap_parser.cpp        | 49 ++++++++++++++++++++--------
 2 files changed, 79 insertions(+), 14 deletions(-)

diff --git a/include/tins/utils/radiotap_parser.h b/include/tins/utils/radiotap_parser.h
index 4afd980..9a08b85 100644
--- a/include/tins/utils/radiotap_parser.h
+++ b/include/tins/utils/radiotap_parser.h
@@ -58,7 +58,25 @@ public:
         UNKNOWN_NS
     };
 
-    typedef PDUOption<uint8_t, RadioTap> option;
+    typedef PDUOption<RadioTap::PresentFlags, RadioTap> option;
+
+    /**
+     * Represents the size and alignment of each RadioTap field
+     */
+    struct FieldMetadata {
+        uint32_t size;
+        uint32_t alignment;
+    };
+
+    /**
+     * Contains metadata for each data field in RadioTap
+     */
+    static const FieldMetadata RADIOTAP_METADATA[];
+
+    /**
+     * Represents the maximum bit we have information for
+     */
+    static const uint32_t MAX_RADIOTAP_FIELD;
 
     /**
      * \brief Constructs a RadioTap parser around a payload
@@ -78,6 +96,13 @@ public:
      */
     NamespaceType current_namespace() const;
 
+    /**
+     * \brief Gets a 0 index based namespace index.
+     *
+     * This index will be incremented every time a new namespace is found
+     */
+    uint32_t current_namespace_index() const;
+
     /**
      * Gets the current field being parsed
      */
@@ -103,10 +128,27 @@ public:
      */
     bool advance_field();
 
+    /**
+     * \brief Skips all fields until the provided one is found
+     *
+     * This will effectively move the current option pointer until the field is 
+     * found or the end of the options list is reached
+     *
+     * \return true iff the field was foudn
+     */
+    bool skip_to_field(RadioTap::PresentFlags flag);
+
     /**
      * Indicates whether this RadioTap options buffer contains any fields set
      */
     bool has_fields() const;
+
+    /**
+     * \brief Indicates whether the provided field is set.
+     *
+     * This will look the field up in all flag sets and not just the current one
+     */
+    bool has_field(RadioTap::PresentFlags flag) const;
 private:
     const uint8_t* find_options_start() const;
     bool advance_to_next_field(bool start_from_zero);
diff --git a/src/utils/radiotap_parser.cpp b/src/utils/radiotap_parser.cpp
index 677064c..058655a 100644
--- a/src/utils/radiotap_parser.cpp
+++ b/src/utils/radiotap_parser.cpp
@@ -35,12 +35,7 @@ using std::vector;
 namespace Tins {
 namespace Utils {
 
-struct FieldMetadata {
-    uint32_t size;
-    uint32_t alignment;
-};
-
-static const FieldMetadata RADIOTAP_METADATA[] = {
+const RadioTapParser::FieldMetadata RadioTapParser::RADIOTAP_METADATA[] = {
     { 8, 8 }, /// TSFT
     { 1, 1 }, // FLAGS
     { 1, 1 }, // RATE
@@ -63,7 +58,8 @@ static const FieldMetadata RADIOTAP_METADATA[] = {
     { 3, 1 }, // MCS
 };
 
-static const uint32_t BIT_LIMIT = sizeof(RADIOTAP_METADATA) / sizeof(FieldMetadata) + 1;
+const uint32_t RadioTapParser::MAX_RADIOTAP_FIELD = sizeof(RADIOTAP_METADATA) /
+                                                    sizeof(FieldMetadata) + 1;
 
 #if TINS_IS_LITTLE_ENDIAN
 TINS_BEGIN_PACK
@@ -141,7 +137,7 @@ void align_buffer(const uint8_t* buffer_start, const uint8_t*& buffer, uint32_t
 }
 
 RadioTapParser::RadioTapParser(const vector<uint8_t>& buffer)
-: current_namespace_(RADIOTAP_NS), current_bit_(BIT_LIMIT), namespace_index_(0) {
+: current_namespace_(RADIOTAP_NS), current_bit_(MAX_RADIOTAP_FIELD), namespace_index_(0) {
     if (buffer.empty()) {
         start_ = 0;
         end_ = 0;
@@ -160,6 +156,10 @@ RadioTapParser::NamespaceType RadioTapParser::current_namespace() const {
     return current_namespace_;
 }
 
+uint32_t RadioTapParser::current_namespace_index() const {
+    return namespace_index_;
+}
+
 RadioTap::PresentFlags RadioTapParser::current_field() const {
     return static_cast<RadioTap::PresentFlags>(1 << current_bit_);
 }
@@ -178,7 +178,7 @@ const uint8_t* RadioTapParser::current_option_ptr() const {
 
 bool RadioTapParser::advance_field() {
     // If we have no buffer to parse, then we can't advance
-    if (start_ == 0 || current_bit_ == BIT_LIMIT) {
+    if (start_ == 0 || current_bit_ == MAX_RADIOTAP_FIELD) {
         return false;
     }
     // If we manage to advance the field, return true
@@ -186,7 +186,7 @@ bool RadioTapParser::advance_field() {
         return true;
     }
     // We finished iterating the current namespace (if any). Reset our bit
-    current_bit_ = BIT_LIMIT;
+    current_bit_ = MAX_RADIOTAP_FIELD;
     // Otherwise, let's try advancing the namespace. If we fail, then we failed
     if (!advance_to_next_namespace()) {
         return false;
@@ -195,8 +195,31 @@ bool RadioTapParser::advance_field() {
     return advance_to_next_field(true /* start from 0*/);
 }
 
+bool RadioTapParser::skip_to_field(RadioTap::PresentFlags flag) {
+    while (has_fields() && current_field() != flag) {
+        advance_field();
+    }
+    return has_fields();
+}
+
 bool RadioTapParser::has_fields() const {
-    return current_bit_ != BIT_LIMIT;
+    return current_bit_ != MAX_RADIOTAP_FIELD;
+}
+
+bool RadioTapParser::has_field(RadioTap::PresentFlags flag) const {
+    const uint8_t* ptr = start_;
+    while (ptr + sizeof(uint32_t) < end_) {
+        const RadioTapFlags* flags = (const RadioTapFlags*)ptr;
+        if (is_field_set(flag, flags)) {
+            return true;
+        }
+        if (!flags->ext) {
+            break;
+        }
+        // Jump to the next flags field
+        ptr += sizeof(uint32_t);
+    }
+    return false;
 }
 
 const uint8_t* RadioTapParser::find_options_start() const {
@@ -227,10 +250,10 @@ bool RadioTapParser::advance_to_next_field(bool start_from_zero) {
         current_ptr_ += RADIOTAP_METADATA[current_bit_].size;
         bit = current_bit_ + 1;
     }
-    while (!is_field_set(1 << bit, flags) && bit < BIT_LIMIT) {
+    while (!is_field_set(1 << bit, flags) && bit < MAX_RADIOTAP_FIELD) {
         bit++; 
     }
-    if (bit < BIT_LIMIT) {
+    if (bit < MAX_RADIOTAP_FIELD) {
         const uint8_t* radiotap_start = start_ - sizeof(uint32_t);
         // Skip and align the buffer
         align_buffer(radiotap_start, current_ptr_, end_ - radiotap_start,

From 63e22fc34921e3c861fd40011642493d89c756ff Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Tue, 23 May 2017 20:55:18 -0700
Subject: [PATCH 63/73] Add RadioTapWriter class

---
 include/tins/utils/radiotap_writer.h |  79 +++++++++++++
 src/CMakeLists.txt                   |   1 +
 src/utils/radiotap_writer.cpp        | 168 +++++++++++++++++++++++++++
 tests/src/radiotap_test.cpp          |  88 +++++++++++++-
 4 files changed, 332 insertions(+), 4 deletions(-)
 create mode 100644 include/tins/utils/radiotap_writer.h
 create mode 100644 src/utils/radiotap_writer.cpp

diff --git a/include/tins/utils/radiotap_writer.h b/include/tins/utils/radiotap_writer.h
new file mode 100644
index 0000000..e729a23
--- /dev/null
+++ b/include/tins/utils/radiotap_writer.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef TINS_RADIOTAP_WRITER_H
+#define TINS_RADIOTAP_WRITER_H
+
+#include <vector>
+#include <stdint.h>
+#include "radiotap_parser.h"
+
+namespace Tins {
+namespace Utils {
+
+/**
+ * \brief Writes RadioTap options into a buffer
+ *
+ * This class can write RadioTap options into a buffer, respecting the alignment
+ * of each of them.
+ *
+ * Note that RadioTap options are ordered. Writing multiple of them in a non
+ * ascending order will involve several memory moves around the buffer so it
+ * will be less efficient.
+ */
+class RadioTapWriter {
+public:
+    /**
+     * \brief Constructs a RadioTapWriter object
+     * 
+     * Note that a reference to the buffer will be kept and updated so it must
+     * be kept in scope while writing options to it
+     */
+    RadioTapWriter(std::vector<uint8_t>& buffer);
+
+    /**
+     * \brief Writes an option, adding/removing padding as needed
+     *
+     * The function returns true iff the option was added successfully. This will
+     * always be the case, unless an option having that type is already set.
+     *
+     * \param option The option to be written
+     */
+    bool write_option(const RadioTapParser::option& option);
+private:
+    std::vector<uint8_t> build_padding_vector(const uint8_t* last_ptr, RadioTapParser& parser);
+    void update_paddings(const std::vector<uint8_t>& paddings, uint32_t offset);
+
+    std::vector<uint8_t>& buffer_;
+};
+
+} // Utils
+} // Tins
+
+#endif // TINS_RADIOTAP_WRITER_H
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8068b7c..07b0540 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -77,6 +77,7 @@ set(SOURCES
     utils/checksum_utils.cpp
     utils/frequency_utils.cpp
     utils/radiotap_parser.cpp
+    utils/radiotap_writer.cpp
     utils/routing_utils.cpp
     utils/resolve_utils.cpp
     utils/pdu_utils.cpp
diff --git a/src/utils/radiotap_writer.cpp b/src/utils/radiotap_writer.cpp
new file mode 100644
index 0000000..7d76b47
--- /dev/null
+++ b/src/utils/radiotap_writer.cpp
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <cmath>
+#include "utils/radiotap_writer.h"
+#include "exceptions.h"
+
+using std::vector;
+
+namespace Tins {
+namespace Utils {
+
+uint32_t calculate_padding(uint32_t alignment, uint32_t offset) {
+    return offset % alignment;
+}
+
+uint32_t get_bit(uint32_t value) {
+    return log(value) / log(2);
+}
+
+RadioTapWriter::RadioTapWriter(vector<uint8_t>& buffer)
+: buffer_(buffer) {
+}
+
+bool RadioTapWriter::write_option(const RadioTapParser::option& option) {
+    const uint32_t bit = get_bit(option.option());
+    if (bit > RadioTapParser::MAX_RADIOTAP_FIELD) {
+        throw malformed_option();
+    }
+    const bool is_empty = buffer_.empty();
+    RadioTapParser parser(buffer_);
+    const uint8_t* candidate_ptr = parser.current_option_ptr();
+    // Loop while we find lower fields and we're still in the first namespace
+    while (parser.has_fields()) {
+        if (parser.current_field() > option.option()) {
+            break;
+        }
+        else if (parser.current_field() == option.option()) {
+            // We can't add the same option twice
+            return false;
+        }
+        else {
+            const uint32_t bit = get_bit(parser.current_field());
+            const RadioTapParser::FieldMetadata& meta = RadioTapParser::RADIOTAP_METADATA[bit];
+            candidate_ptr = parser.current_option_ptr() + meta.size;
+        }
+        parser.advance_field();
+    }
+    size_t offset = candidate_ptr - &*buffer_.begin();
+    const RadioTapParser::FieldMetadata& meta = RadioTapParser::RADIOTAP_METADATA[bit];
+
+    vector<uint8_t> paddings = build_padding_vector(candidate_ptr, parser);
+
+    // Calculate the offset based on the RadioTap header (add 4 bytes)
+    const uint32_t padding = calculate_padding(meta.alignment, offset + sizeof(uint32_t));
+
+    // Now actually insert our new field (padding first)
+    buffer_.insert(buffer_.begin() + offset, padding, 0);
+    buffer_.insert(buffer_.begin() + offset + padding, option.data_ptr(),
+                   option.data_ptr() + option.data_size());
+
+    update_paddings(paddings, offset + padding + option.data_size());
+
+    // Finally, update the flags
+    uint32_t flags = 0;
+    if (is_empty) {
+        buffer_.insert(buffer_.begin(), sizeof(flags), 0);
+    }
+    else {
+        memcpy(&flags, &*buffer_.begin(), sizeof(flags));
+    }
+    flags |= Endian::host_to_le<uint32_t>(option.option());
+    memcpy(&*buffer_.begin(), &flags, sizeof(flags));
+    return true;
+}
+
+// Builds a vector that will contain the padding required for every position.
+// e.g. if a 2 byte field is found, then in those 2 indexes we'll have the values [2, 1].
+// 2 to indicate that the first field requires 16 bit padding and the second one is fine
+// with 1 byte padding as long as the first one is as well.
+//
+// Padding bytes are filled with the value 0 to indicate a special index that can be 
+// compacted/removed if less/more padding is required
+vector<uint8_t> RadioTapWriter::build_padding_vector(const uint8_t* last_ptr,
+                                                     RadioTapParser& parser) {
+    vector<uint8_t> paddings;
+    while (parser.has_fields()) {
+        const uint32_t flag = static_cast<uint32_t>(parser.current_field());
+        const uint32_t bit = get_bit(flag);
+        const RadioTapParser::FieldMetadata& meta = RadioTapParser::RADIOTAP_METADATA[bit];
+        const uint8_t* current_ptr = parser.current_option_ptr();
+        // These are just paddings
+        paddings.insert(paddings.end(), current_ptr - last_ptr, 0);
+        // Say this byte has to be padded to whatever the alignment is for this field
+        paddings.push_back(meta.alignment);
+        // The rest of the bytes for this field don't really need alignment
+        for (size_t i = 0; i < meta.size - 1; ++i) {
+            paddings.push_back(1);
+        }
+        last_ptr = current_ptr + meta.size;
+        parser.advance_field();
+    }
+    return paddings;
+}
+
+// Iterates the padding vector and extends/compacts the paddings as needed
+void RadioTapWriter::update_paddings(const vector<uint8_t>& paddings, uint32_t offset) {
+    size_t i = 0;
+    while (i != paddings.size()) {
+        // Skip everything that doesn't need padding
+        while (i != paddings.size() && paddings[i] == 1) {
+            ++i;
+        }
+        const size_t start = i;
+        // Find the next field
+        while (i != paddings.size() && paddings[i] == 0) {
+            ++i;
+        }
+        if (i == paddings.size()) {
+            break;
+        }
+        offset += start;
+        const uint8_t needed_padding = calculate_padding(paddings[i], offset + sizeof(uint32_t));
+        const size_t existing_padding = i - start;
+        // Remove padding if there's too much
+        if (existing_padding > needed_padding) {
+            buffer_.erase(buffer_.begin() + offset,
+                          buffer_.begin() + offset + (existing_padding - needed_padding));
+            offset -= existing_padding - needed_padding;
+        }
+        // Add padding if there's too little
+        else if (existing_padding < needed_padding) {
+            buffer_.insert(buffer_.begin() + offset, needed_padding - existing_padding, 0);
+            offset += needed_padding - existing_padding;
+        }
+        offset += i - start;
+        ++i;
+    }
+}
+
+} // Utils
+} // Tins
diff --git a/tests/src/radiotap_test.cpp b/tests/src/radiotap_test.cpp
index 59c5a1b..be7a37d 100644
--- a/tests/src/radiotap_test.cpp
+++ b/tests/src/radiotap_test.cpp
@@ -13,10 +13,12 @@
 #include "eapol.h"
 #include "utils.h"
 #include "utils/radiotap_parser.h"
+#include "utils/radiotap_writer.h"
 
 using namespace std;
 using namespace Tins;
 using Tins::Utils::RadioTapParser;
+using Tins::Utils::RadioTapWriter;
 
 class RadioTapTest : public testing::Test {
 public:
@@ -412,7 +414,7 @@ TEST_F(RadioTapTest, RadioTapParsing) {
     EXPECT_TRUE(parser.advance_field());
     
     EXPECT_EQ(RadioTap::FLAGS, parser.current_field());
-    EXPECT_EQ((uint32_t)RadioTap::FCS, parser.current_option().to<uint8_t>());
+    EXPECT_EQ((uint8_t)RadioTap::FCS, parser.current_option().to<uint8_t>());
     EXPECT_TRUE(parser.advance_field());
 
     EXPECT_EQ(RadioTap::RATE, parser.current_field());
@@ -441,9 +443,13 @@ TEST_F(RadioTapTest, RadioTapParsingMultipleNamespaces) {
     vector<uint8_t> buffer(expected_packet4+4, expected_packet4 + sizeof(expected_packet4)-4);
     RadioTapParser parser(buffer);
     EXPECT_EQ(RadioTapParser::RADIOTAP_NS, parser.current_namespace());
-    while (parser.current_field() != RadioTap::MCS) {
-        ASSERT_TRUE(parser.advance_field());
-    }
+    // Skip to MCS, which is teh last one on the first set of flags
+    parser.skip_to_field(RadioTap::MCS);
+    // Check if a specific option is set
+    EXPECT_TRUE(parser.has_field(RadioTap::MCS));
+    // Check if we can find this one which is in the second namespace
+    EXPECT_TRUE(parser.has_field(RadioTap::ANTENNA));
+
     // MCS is the last option in this namespace. After this, we should jump to the next one
     EXPECT_TRUE(parser.advance_field());
     EXPECT_TRUE(parser.has_fields());
@@ -470,6 +476,80 @@ TEST_F(RadioTapTest, RadioTapParsingUsingEmptyBuffer) {
     EXPECT_FALSE(parser.has_fields());
     EXPECT_FALSE(parser.advance_field());
     EXPECT_FALSE(parser.has_fields());
+    EXPECT_FALSE(parser.has_field(RadioTap::ANTENNA));
+}
+
+TEST_F(RadioTapTest, RadioTapWritingEmptyBuffer) {
+    vector<uint8_t> buffer;
+    RadioTapWriter writer(buffer);
+    {
+        const uint8_t value = 0xca;
+        writer.write_option(RadioTapParser::option(RadioTap::ANTENNA, sizeof(value), &value));
+    }
+    {
+        const uint8_t value = (uint8_t)RadioTap::FCS;
+        writer.write_option(RadioTapParser::option(RadioTap::FLAGS, sizeof(value), &value));
+    }
+    {
+        const uint64_t value = Endian::host_to_le<uint64_t>(616089172U);
+        uint8_t buffer[sizeof(value)];
+        memcpy(buffer, &value, sizeof(value));
+        writer.write_option(RadioTapParser::option(RadioTap::TSTF, sizeof(buffer), buffer));
+    }
+    {
+        const uint16_t value = Endian::host_to_le<uint16_t>(0x1234);
+        uint8_t buffer[sizeof(value)];
+        memcpy(buffer, &value, sizeof(value));
+        writer.write_option(RadioTapParser::option(RadioTap::FHSS, sizeof(buffer), buffer));
+    }
+    {
+        const uint8_t value = 0xab;
+        writer.write_option(RadioTapParser::option(RadioTap::RATE, sizeof(value), &value));
+        // We can't add the same option twice
+        EXPECT_FALSE(writer.write_option(RadioTapParser::option(RadioTap::RATE, sizeof(value),
+                                                                &value)));
+    }
+    {
+        const uint8_t value = 0xf7;
+        writer.write_option(RadioTapParser::option(RadioTap::DBM_SIGNAL, sizeof(value), &value));
+    }
+    {
+        const uint16_t value = Endian::host_to_le<uint16_t>(0x4321);
+        uint8_t buffer[sizeof(value)];
+        memcpy(buffer, &value, sizeof(value));
+        writer.write_option(RadioTapParser::option(RadioTap::RX_FLAGS, sizeof(buffer), buffer));
+    }
+
+    RadioTapParser parser(buffer);
+    EXPECT_EQ(RadioTap::TSTF, parser.current_field());
+    EXPECT_EQ(616089172U, parser.current_option().to<uint64_t>());
+    EXPECT_TRUE(parser.advance_field());
+
+    EXPECT_EQ(RadioTap::FLAGS, parser.current_field());
+    EXPECT_EQ((uint8_t)RadioTap::FCS, parser.current_option().to<uint8_t>());
+    EXPECT_TRUE(parser.advance_field());
+
+    EXPECT_EQ(RadioTap::RATE, parser.current_field());
+    EXPECT_EQ(0xab, parser.current_option().to<uint8_t>());
+    EXPECT_TRUE(parser.advance_field());
+
+    EXPECT_EQ(RadioTap::FHSS, parser.current_field());
+    EXPECT_EQ(0x1234, parser.current_option().to<uint16_t>());
+    EXPECT_TRUE(parser.advance_field());
+
+    EXPECT_EQ(RadioTap::DBM_SIGNAL, parser.current_field());
+    EXPECT_EQ(0xf7, parser.current_option().to<uint8_t>());
+    EXPECT_TRUE(parser.advance_field());
+
+    EXPECT_EQ(RadioTap::ANTENNA, parser.current_field());
+    EXPECT_EQ(0xca, parser.current_option().to<uint8_t>());
+    EXPECT_TRUE(parser.advance_field());
+
+    EXPECT_EQ(RadioTap::RX_FLAGS, parser.current_field());
+    EXPECT_EQ(0x4321, parser.current_option().to<uint16_t>());
+
+    EXPECT_FALSE(parser.advance_field());
+
 }
 
 #endif // TINS_HAVE_DOT11

From 5fcde410239a80673ea76702c64ba7ccf04040a8 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Thu, 25 May 2017 07:56:23 -0700
Subject: [PATCH 64/73] Use RadioTapParser/Writer in RadioTap

---
 include/tins/radiotap.h              | 126 ++-----
 include/tins/utils/radiotap_parser.h |  19 +-
 include/tins/utils/radiotap_writer.h |   6 +-
 src/radiotap.cpp                     | 479 ++++++++-------------------
 src/utils/radiotap_parser.cpp        |  21 +-
 src/utils/radiotap_writer.cpp        |   9 +-
 tests/src/radiotap_test.cpp          |  36 +-
 7 files changed, 224 insertions(+), 472 deletions(-)

diff --git a/include/tins/radiotap.h b/include/tins/radiotap.h
index 14cf6e9..22b322f 100644
--- a/include/tins/radiotap.h
+++ b/include/tins/radiotap.h
@@ -35,6 +35,7 @@
 #include "macros.h"
 #include "pdu.h"
 #include "endianness.h"
+#include "pdu_option.h"
 
 namespace Tins {
 class PacketSender;
@@ -82,7 +83,7 @@ public:
      * \sa RadioTap::present()
      */
     enum PresentFlags {
-        TSTF                = 1 << 0,
+        TSFT                = 1 << 0,
         FLAGS               = 1 << 1,
         RATE                = 1 << 2,
         CHANNEL             = 1 << 3,
@@ -127,6 +128,11 @@ public:
         uint8_t mcs;
     } TINS_END_PACK;
     
+    /**
+     * The type used to store RadioTap options
+     */
+    typedef PDUOption<RadioTap::PresentFlags, RadioTap> option;
+
     /**
      * \brief Default constructor.
      */
@@ -369,10 +375,7 @@ public:
      * will be undefined. It is only safe to use the getter of a field 
      * if its corresponding bit flag is set in the present field.
      */
-    PresentFlags present() const { 
-        //return (PresentFlags)*(uint32_t*)(&radio_.it_len + 1); 
-        return (PresentFlags)Endian::le_to_host(radio_.flags_32);
-    }
+    PresentFlags present() const;
     
     /** \brief Check whether ptr points to a valid response for this PDU.
      *
@@ -396,6 +399,13 @@ public:
      */
     uint32_t trailer_size() const;
     
+    /**
+     * Adds the given option
+     *
+     * \param option The option to be added.
+     */
+    void add_option(const option& opt);
+
     /**
      * \sa PDU::clone
      */
@@ -412,70 +422,7 @@ public:
     }
 private:
     TINS_BEGIN_PACK
-    #if TINS_IS_LITTLE_ENDIAN
-        struct flags_type {
-            uint32_t
-                tsft:1,
-                flags:1,
-                rate:1,
-                channel:1,
-                fhss:1,
-                dbm_signal:1,
-                dbm_noise:1,
-                lock_quality:1,
-
-                tx_attenuation:1,
-                db_tx_attenuation:1,
-                dbm_tx_power:1,
-                antenna:1,
-                db_signal:1,
-                db_noise:1,
-                rx_flags:1,
-                tx_flags:1,
-
-                reserved1:1,
-                data_retries:1,
-                channel_plus:1,
-                mcs:1,
-                reserved2:4,
-
-                reserved3:7,
-                ext:1;
-        } TINS_END_PACK;
-    #else
-        struct flags_type {
-            uint32_t
-                lock_quality:1,
-                dbm_noise:1,
-                dbm_signal:1,
-                fhss:1,
-                channel:1,
-                rate:1,
-                flags:1,
-                tsft:1,
-
-                tx_flags:1,
-                rx_flags:1,
-                db_noise:1,
-                db_signal:1,
-                antenna:1,
-                dbm_tx_power:1,
-                db_tx_attenuation:1,
-                tx_attenuation:1,
-
-                reserved2:4,
-                mcs:1,
-                channel_plus:1,
-                data_retries:1,
-                reserved1:1,
-
-                ext:1,
-                reserved3:7;
-        } TINS_END_PACK;
-    #endif
-
-    TINS_BEGIN_PACK
-    struct radiotap_hdr {
+    struct radiotap_header {
     #if TINS_IS_LITTLE_ENDIAN
         uint8_t it_version;	
         uint8_t it_pad;
@@ -484,48 +431,13 @@ private:
         uint8_t it_version;
     #endif // TINS_IS_LITTLE_ENDIAN 
         uint16_t it_len;
-        union {
-            flags_type flags;
-            uint32_t flags_32;
-        };
     } TINS_END_PACK;
     
-    void init();
     void write_serialization(uint8_t* buffer, uint32_t total_sz);
-    uint32_t find_extra_flag_fields_size(const uint8_t* buffer, uint32_t total_sz);
+    option do_find_option(PresentFlags type) const;
 
-    template <size_t n>
-    void align_buffer(const uint8_t* buffer_start, const uint8_t*& buffer, uint32_t& size) {
-        uint32_t offset = ((buffer - buffer_start) % n);
-        if (offset) {
-            offset = n - offset;
-            if (offset > size) {
-                throw malformed_packet();
-            }
-            buffer += offset;
-            size -= offset;
-        }
-    }
-    
-    
-    radiotap_hdr radio_;
-    // present fields...
-    uint64_t tsft_;
-    uint16_t channel_type_;
-    uint16_t channel_freq_;
-    uint16_t rx_flags_;
-    uint16_t signal_quality_;
-    uint16_t tx_flags_;
-    mcs_type mcs_;
-    uint8_t antenna_;
-    uint8_t flags_;
-    uint8_t rate_;
-    uint8_t channel_;
-    uint8_t max_power_;
-    uint8_t db_signal_;
-    uint8_t data_retries_;
-    int8_t dbm_signal_;
-    int8_t dbm_noise_;
+    radiotap_header header_;
+    std::vector<uint8_t> options_payload_;
 };
 }
 
diff --git a/include/tins/utils/radiotap_parser.h b/include/tins/utils/radiotap_parser.h
index 9a08b85..b297a7b 100644
--- a/include/tins/utils/radiotap_parser.h
+++ b/include/tins/utils/radiotap_parser.h
@@ -58,8 +58,6 @@ public:
         UNKNOWN_NS
     };
 
-    typedef PDUOption<RadioTap::PresentFlags, RadioTap> option;
-
     /**
      * Represents the size and alignment of each RadioTap field
      */
@@ -111,7 +109,7 @@ public:
     /**
      * Gets the option the parsed is currently pointing at
      */
-    option current_option();
+    RadioTap::option current_option();
 
     /**
      * Gets the pointer at which the current option is located
@@ -123,11 +121,24 @@ public:
      *
      * If there's a namespace change, this will handle that as well.
      *
-     * \returns true iff advancing was successfull (e.g. false if we reached
+     * \return true iff advancing was successfull (e.g. false if we reached
      * the end of the header)
      */
     bool advance_field();
 
+    /**
+     * \brief Advances to the next namespace
+     *
+     * \return true iff advancing was successfull (e.g. false if we're currently
+     * in the last namespace)
+     */
+    bool advance_namespace();
+
+    /**
+     * Gets the current namespace's flags
+     */
+    RadioTap::PresentFlags namespace_flags() const;
+
     /**
      * \brief Skips all fields until the provided one is found
      *
diff --git a/include/tins/utils/radiotap_writer.h b/include/tins/utils/radiotap_writer.h
index e729a23..eb1efd3 100644
--- a/include/tins/utils/radiotap_writer.h
+++ b/include/tins/utils/radiotap_writer.h
@@ -32,11 +32,13 @@
 
 #include <vector>
 #include <stdint.h>
-#include "radiotap_parser.h"
+#include "radiotap.h"
 
 namespace Tins {
 namespace Utils {
 
+class RadioTapParser;
+
 /**
  * \brief Writes RadioTap options into a buffer
  *
@@ -65,7 +67,7 @@ public:
      *
      * \param option The option to be written
      */
-    bool write_option(const RadioTapParser::option& option);
+    void write_option(const RadioTap::option& option);
 private:
     std::vector<uint8_t> build_padding_vector(const uint8_t* last_ptr, RadioTapParser& parser);
     void update_paddings(const std::vector<uint8_t>& paddings, uint32_t offset);
diff --git a/src/radiotap.cpp b/src/radiotap.cpp
index 8902c0f..5842c2b 100644
--- a/src/radiotap.cpp
+++ b/src/radiotap.cpp
@@ -48,144 +48,29 @@
 #include "memory_helpers.h"
 #include "utils/checksum_utils.h"
 #include "utils/frequency_utils.h"
+#include "utils/radiotap_parser.h"
+#include "utils/radiotap_writer.h"
 
 using std::memcpy;
 
+using Tins::Memory::InputMemoryStream;
 using Tins::Memory::OutputMemoryStream;
 
+using Tins::Utils::RadioTapParser;
+using Tins::Utils::RadioTapWriter;
+
 namespace Tins {
 
-void check_size(uint32_t total_sz, size_t field_size) {
-    if (total_sz < field_size) {
-        throw malformed_packet();
-    }
+template <typename T>
+void add_integral_option(RadioTap& radio, RadioTap::PresentFlags type, T value) {
+    uint8_t buffer[sizeof(value)];
+    value = Endian::host_to_le(value);
+    std::memcpy(buffer, &value, sizeof(value));
+    radio.add_option(RadioTap::option(type, sizeof(buffer), buffer));
 }
 
-template<typename T>
-void read_field(const uint8_t* &buffer, uint32_t& total_sz, T& field) {
-    check_size(total_sz, sizeof(field));
-    memcpy(&field, buffer, sizeof(field));
-    buffer += sizeof(field);
-    total_sz -= sizeof(field);
-}
-
-RadioTap::RadioTap() : radio_() {
-    init();
-}
-
-RadioTap::RadioTap(const uint8_t* buffer, uint32_t total_sz) {
-    check_size(total_sz, sizeof(radio_));
-    const uint8_t* buffer_start = buffer;
-    memcpy(&radio_, buffer, sizeof(radio_));
-    uint32_t radiotap_hdr_size = length();
-    check_size(total_sz, radiotap_hdr_size);
-    // We start on the first flags field, skipping version, pad and length.
-    const flags_type* current_flags = (const flags_type*)(buffer + sizeof(uint32_t));
-    const uint32_t extra_flags_size = find_extra_flag_fields_size(
-        buffer + sizeof(uint32_t), total_sz);
-    // Find and skip the extra flag fields.
-    buffer += extra_flags_size;
-    radiotap_hdr_size -= extra_flags_size;
-    // Also skip the header
-    buffer += sizeof(radio_);
-    radiotap_hdr_size -= sizeof(radio_);
-
-    while (true) {
-        radio_.flags_32 |= *(const uint32_t*)current_flags;
-        if (current_flags->tsft) {
-            align_buffer<8>(buffer_start, buffer, radiotap_hdr_size);
-            read_field(buffer, radiotap_hdr_size, tsft_);
-        }
-
-        if (current_flags->flags) {
-            read_field(buffer, radiotap_hdr_size, flags_);
-        }
-
-        if (current_flags->rate) {
-            read_field(buffer, radiotap_hdr_size, rate_);
-        }
-
-        if (current_flags->channel) {
-            align_buffer<2>(buffer_start, buffer, radiotap_hdr_size);
-            read_field(buffer, radiotap_hdr_size, channel_freq_);
-            read_field(buffer, radiotap_hdr_size, channel_type_);
-        }
-
-        if (current_flags->dbm_signal) {
-            read_field(buffer, radiotap_hdr_size, dbm_signal_);
-        }
-
-        if (current_flags->dbm_noise) {
-            read_field(buffer, radiotap_hdr_size, dbm_noise_);
-        }
-
-        if (current_flags->lock_quality) {
-            read_field(buffer, radiotap_hdr_size, signal_quality_);
-        }
-
-        if (current_flags->antenna) {
-            read_field(buffer, radiotap_hdr_size, antenna_);
-        }
-
-        if (current_flags->db_signal) {
-            read_field(buffer, radiotap_hdr_size, db_signal_);
-        }
-
-        if (current_flags->rx_flags) {
-            align_buffer<2>(buffer_start, buffer, radiotap_hdr_size);
-            read_field(buffer, radiotap_hdr_size, rx_flags_);
-        }
-
-        if (current_flags->tx_flags) {
-            align_buffer<2>(buffer_start, buffer, radiotap_hdr_size);
-            read_field(buffer, radiotap_hdr_size, tx_flags_);
-        }
-
-        if (current_flags->data_retries) {
-            read_field(buffer, radiotap_hdr_size, data_retries_);
-        }
-
-        if (current_flags->channel_plus) {
-            align_buffer<4>(buffer_start, buffer, radiotap_hdr_size);
-            uint32_t dummy;
-            read_field(buffer, radiotap_hdr_size, dummy);
-            // nasty Big Endian fix
-            channel_type_ = Endian::le_to_host<uint16_t>(Endian::host_to_le<uint32_t>(dummy));
-            read_field(buffer, radiotap_hdr_size, channel_freq_);
-            read_field(buffer, radiotap_hdr_size, channel_);
-            read_field(buffer, radiotap_hdr_size, max_power_);
-        }
-        if (current_flags->mcs) {
-            read_field(buffer, radiotap_hdr_size, mcs_.known);
-            read_field(buffer, radiotap_hdr_size, mcs_.flags);
-            read_field(buffer, radiotap_hdr_size, mcs_.mcs);
-        } 
-        // We can do this safely because we checked the size on find_extra_flags...
-        if (current_flags->ext == 1) {
-            current_flags++;
-        }
-        else {
-            break;
-        }
-    }
-
-    total_sz -= length();
-    buffer += radiotap_hdr_size;
-
-    if (radio_.flags.flags && (flags() & FCS) != 0) {
-        check_size(total_sz, sizeof(uint32_t));
-        total_sz -= sizeof(uint32_t);
-        if ((flags() & FAILED_FCS) !=0) {
-            throw malformed_packet();
-        }
-    }
-
-    if (total_sz) {
-        inner_pdu(Dot11::from_bytes(buffer, total_sz));
-    }
-}
-
-void RadioTap::init() {
+RadioTap::RadioTap()
+: header_(), options_payload_(4) {
     channel(Utils::channel_to_mhz(1), 0xa0);
     flags(FCS);
     tsft(0);
@@ -194,275 +79,229 @@ void RadioTap::init() {
     antenna(0);
 }
 
-// This method finds the extra flags field size, taking into account other
-// set of flags that may appear if the "ext" bit is on/.
-uint32_t RadioTap::find_extra_flag_fields_size(const uint8_t* buffer, uint32_t total_sz) {
-    const flags_type* ptr = (const flags_type*)buffer;
-    while (ptr->ext == 1) {
-        if (total_sz < sizeof(flags_type)) {
-            throw malformed_packet();
-        }
-        ++ptr;
+RadioTap::RadioTap(const uint8_t* buffer, uint32_t total_sz) {
+    InputMemoryStream input(buffer, total_sz);
+    input.read(header_);
+    uint32_t radiotap_size = length();
+    if (TINS_UNLIKELY(radiotap_size < sizeof(header_) + sizeof(uint32_t))) {
+        throw malformed_packet();
     }
 
-    return static_cast<uint32_t>((const uint8_t*)ptr - buffer);
+    radiotap_size -= sizeof(header_);
+    if (TINS_UNLIKELY(radiotap_size + sizeof(uint32_t) > input.size())) {
+        throw malformed_packet();
+    }
+
+    options_payload_.assign(input.pointer(), input.pointer() + radiotap_size);
+    input.skip(radiotap_size);
+
+    total_sz = input.size();
+    RadioTapParser parser(options_payload_);
+    if (parser.skip_to_field(FLAGS)) {
+        const uint8_t flags_value = parser.current_option().to<uint8_t>();
+        if ((flags_value & FCS) != 0) {
+            if (total_sz < sizeof(uint32_t)) {
+                throw malformed_packet();
+            }
+            total_sz -= sizeof(uint32_t);
+            if ((flags_value & FAILED_FCS) !=0) {
+                throw malformed_packet();
+            }
+        }
+    }
+
+    if (total_sz) {
+        inner_pdu(Dot11::from_bytes(input.pointer(), total_sz));
+    }
 }
 
 // Setter for RadioTap fields
 void RadioTap::version(uint8_t new_version) {
-    radio_.it_version = new_version;
+    header_.it_version = new_version;
 }
 
 void RadioTap::padding(uint8_t new_padding) {
-    radio_.it_pad = new_padding;
+    header_.it_pad = new_padding;
 }
 
 void RadioTap::length(uint16_t new_length) {
-    radio_.it_len = Endian::host_to_le(new_length);
+    header_.it_len = Endian::host_to_le(new_length);
 }
 
 void RadioTap::tsft(uint64_t new_tsft) {
-    tsft_ = Endian::host_to_le(new_tsft);
-    radio_.flags.tsft = 1;
+    add_integral_option(*this, TSFT, new_tsft);
 }
 
 void RadioTap::flags(FrameFlags new_flags) {
-    flags_ = (uint8_t)new_flags;
-    radio_.flags.flags = 1;
+    add_integral_option(*this, FLAGS, (uint8_t)new_flags);
 }
 
 void RadioTap::rate(uint8_t new_rate) {
-    rate_ = new_rate;
-    radio_.flags.rate = 1;
+    add_integral_option(*this, RATE, new_rate);
 }
 
 void RadioTap::channel(uint16_t new_freq, uint16_t new_type) {
-    channel_freq_ = Endian::host_to_le(new_freq);
-    channel_type_ = Endian::host_to_le(new_type);
-    radio_.flags.channel = 1;
+    uint8_t buffer[sizeof(uint16_t) * 2];
+    new_freq = Endian::host_to_le(new_freq);
+    new_type = Endian::host_to_le(new_type);
+    memcpy(buffer, &new_freq, sizeof(new_freq));
+    memcpy(buffer + sizeof(new_freq), &new_type, sizeof(new_type));
+    add_option(RadioTap::option(CHANNEL, sizeof(buffer), buffer));
 }
 void RadioTap::dbm_signal(int8_t new_dbm_signal) {
-    dbm_signal_ = new_dbm_signal;
-    radio_.flags.dbm_signal = 1;
+    add_integral_option(*this, DBM_SIGNAL, new_dbm_signal);
 }
 
 void RadioTap::dbm_noise(int8_t new_dbm_noise) {
-    dbm_noise_ = new_dbm_noise;
-    radio_.flags.dbm_noise = 1;
+    add_integral_option(*this, DBM_NOISE, new_dbm_noise);
 }
 
 void RadioTap::signal_quality(uint8_t new_signal_quality) {
-    signal_quality_ = new_signal_quality;
-    radio_.flags.lock_quality = 1;
+    add_integral_option(*this, LOCK_QUALITY, new_signal_quality);
 }
 
 void RadioTap::data_retries(uint8_t new_data_retries) {
-    data_retries_ = new_data_retries;
-    radio_.flags.data_retries = 1;
+    add_integral_option(*this, DATA_RETRIES, new_data_retries);
 }
 
 void RadioTap::antenna(uint8_t new_antenna) {
-    antenna_ = new_antenna;
-    radio_.flags.antenna = 1;
+    add_integral_option(*this, ANTENNA, new_antenna);
 }
 
 void RadioTap::db_signal(uint8_t new_db_signal) {
-    db_signal_ = new_db_signal;
-    radio_.flags.db_signal = 1;
+    add_integral_option(*this, DB_SIGNAL, new_db_signal);
 }
 
-void RadioTap::rx_flags(uint16_t new_rx_flag) {
-    rx_flags_ = Endian::host_to_le(new_rx_flag);
-    radio_.flags.rx_flags = 1;
+void RadioTap::rx_flags(uint16_t new_rx_flags) {
+    add_integral_option(*this, RX_FLAGS, new_rx_flags);
 }
 
-void RadioTap::tx_flags(uint16_t new_tx_flag) {
-    tx_flags_ = Endian::host_to_le(new_tx_flag);
-    radio_.flags.tx_flags = 1;
+void RadioTap::tx_flags(uint16_t new_tx_flags) {
+    add_integral_option(*this, TX_FLAGS, new_tx_flags);
 }
 
 void RadioTap::mcs(const mcs_type& new_mcs) {
-    mcs_ = new_mcs;
-    radio_.flags.mcs = 1;   
+    uint8_t buffer[sizeof(new_mcs)];
+    memcpy(buffer, &new_mcs, sizeof(new_mcs));
+    add_option(RadioTap::option(MCS, sizeof(buffer), buffer));
+}
+
+RadioTap::PresentFlags RadioTap::present() const {
+    uint32_t output = 0;
+    RadioTapParser parser(options_payload_);
+    do {
+        output |= parser.namespace_flags();
+    }
+    while (parser.advance_namespace());
+    return static_cast<PresentFlags>(output);
 }
 
 uint32_t RadioTap::header_size() const {
-    uint32_t total_bytes = 0;
-    if (radio_.flags.tsft) {
-        total_bytes += sizeof(tsft_);
-    }
-    if (radio_.flags.flags) {
-        total_bytes += sizeof(flags_);
-    }
-    if (radio_.flags.rate) {
-        total_bytes += sizeof(rate_);
-    }
-    if (radio_.flags.channel) {
-        total_bytes += (total_bytes & 1);
-        total_bytes += sizeof(uint16_t) * 2;
-    }
-    if (radio_.flags.dbm_signal) {
-        total_bytes += sizeof(dbm_signal_);
-    }
-    if (radio_.flags.dbm_noise) {
-        total_bytes += sizeof(dbm_noise_);
-    }
-    if (radio_.flags.lock_quality) {
-        total_bytes += (total_bytes & 1);
-        total_bytes += sizeof(signal_quality_);
-    }
-    if (radio_.flags.antenna) {
-        total_bytes += sizeof(antenna_);
-    }
-    if (radio_.flags.db_signal) {
-        total_bytes += sizeof(db_signal_);
-    }
-    if (radio_.flags.rx_flags) {
-        total_bytes += (total_bytes & 1);
-        total_bytes += sizeof(rx_flags_);
-    }
-    if (radio_.flags.tx_flags) {
-        total_bytes += (total_bytes & 1);
-        total_bytes += sizeof(tx_flags_);
-    }
-    if (radio_.flags.data_retries) {
-        total_bytes += sizeof(data_retries_);
-    }
-    if (radio_.flags.channel_plus) {
-        uint32_t offset = total_bytes % 4;
-        if (offset) {
-            total_bytes += 4 - offset;
-        }
-        total_bytes += 8;
-    }
-    if (radio_.flags.mcs) {
-        total_bytes += sizeof(mcs_);
-    }
-
-    return sizeof(radio_) + total_bytes;
+    return sizeof(header_) + options_payload_.size();
 }
 
 uint32_t RadioTap::trailer_size() const {
-    // will be sizeof(uint32_t) if the FCS-at-the-end bit is on.
-    return ((flags_ & 0x10) != 0) ? sizeof(uint32_t) : 0;
+    RadioTapParser parser(options_payload_);
+    if (parser.skip_to_field(FLAGS)) {
+        const uint8_t flags_value = parser.current_option().to<uint8_t>();
+        // If there's FCS at the end, then return its size
+        if ((flags_value & FCS) != 0) {
+            return sizeof(uint32_t);
+        }
+    }
+    return 0;
+}
+
+void RadioTap::add_option(const option& opt) {
+    Utils::RadioTapWriter writer(options_payload_);
+    writer.write_option(opt);
 }
 
 // Getter for RadioTap fields
 uint8_t RadioTap::version() const {
-    return radio_.it_version;
+    return header_.it_version;
 }
 
 uint8_t RadioTap::padding() const {
-    return radio_.it_pad;
+    return header_.it_pad;
 }
 
 uint16_t RadioTap::length() const {
-    return Endian::le_to_host(radio_.it_len);
+    return Endian::le_to_host(header_.it_len);
 }
 
 uint64_t RadioTap::tsft() const {
-   if (!radio_.flags.tsft) {
-        throw field_not_present();
-   }
-    return Endian::le_to_host(tsft_);
+    return do_find_option(TSFT).to<uint64_t>();
 }
 
 RadioTap::FrameFlags RadioTap::flags() const {
-    if (!radio_.flags.flags) {
-        throw field_not_present();
-    }
-    return (FrameFlags)flags_;
+    return static_cast<FrameFlags>(do_find_option(FLAGS).to<uint8_t>());
 }
 
 uint8_t RadioTap::rate() const {
-    if (!radio_.flags.rate) {
-        throw field_not_present();
-    }
-    return rate_;
+    return do_find_option(RATE).to<uint8_t>();
 }
 
 uint16_t RadioTap::channel_freq() const {
-    if (!radio_.flags.channel) {
-        throw field_not_present();
-    }
-    return Endian::le_to_host(channel_freq_);
+    const option opt = do_find_option(CHANNEL);
+    uint16_t output;
+    memcpy(&output, opt.data_ptr(), sizeof(uint16_t));
+    return Endian::le_to_host(output);
 }
 
 uint16_t RadioTap::channel_type() const {
-    if (!radio_.flags.channel) {
-        throw field_not_present();
-    }
-    return Endian::le_to_host(channel_type_);
+    const option opt = do_find_option(CHANNEL);
+    uint16_t output;
+    memcpy(&output, opt.data_ptr() + sizeof(uint16_t), sizeof(uint16_t));
+    return Endian::le_to_host(output);
 }
 
 int8_t RadioTap::dbm_signal() const {
-    if (!radio_.flags.dbm_signal) {
-        throw field_not_present();
-    }
-    return dbm_signal_;
+    return do_find_option(DBM_SIGNAL).to<int8_t>();
 }
 
 int8_t RadioTap::dbm_noise() const {
-    if (!radio_.flags.dbm_noise) {
-        throw field_not_present();
-    }
-    return dbm_noise_;
+    return do_find_option(DBM_NOISE).to<int8_t>();
 }
 
 uint16_t RadioTap::signal_quality() const {
-    if (!radio_.flags.lock_quality) {
-        throw field_not_present();
-    }
-    return signal_quality_;
+    return do_find_option(DBM_SIGNAL).to<uint16_t>();
 }
 
 uint8_t RadioTap::antenna() const {
-    if (!radio_.flags.antenna) {
-        throw field_not_present();
-    }
-    return antenna_;
+    return do_find_option(ANTENNA).to<uint8_t>();
 }
 
 RadioTap::mcs_type RadioTap::mcs() const {
-    if (!radio_.flags.mcs) {
-        throw field_not_present();
-    }
-    return mcs_;
+    const option opt = do_find_option(MCS);
+    mcs_type output;
+    memcpy(&output, opt.data_ptr(), sizeof(mcs_type));
+    return output;
 }
 
 uint8_t RadioTap::db_signal() const {
-    if (!radio_.flags.db_signal) {
-        throw field_not_present();
-    }
-    return db_signal_;
+    return do_find_option(DB_SIGNAL).to<uint8_t>();
 }
 
 uint32_t RadioTap::channel_plus() const {
-    if (!radio_.flags.channel_plus) {
+    /*if (!header_.flags.channel_plus) {
         throw field_not_present();
     }
-    return Endian::le_to_host<uint32_t>(channel_type_);
+    return Endian::le_to_host<uint32_t>(channel_type_);*/
+    // TODO: wat
+    return 0xdadedade;
 }
 
 uint16_t RadioTap::rx_flags() const {
-    if (!radio_.flags.rx_flags) {
-        throw field_not_present();
-    }
-    return Endian::le_to_host(rx_flags_);
+    return do_find_option(RX_FLAGS).to<uint16_t>();
 }
 
 uint16_t RadioTap::tx_flags() const {
-    if (!radio_.flags.tx_flags) {
-        throw field_not_present();
-    }
-    return Endian::le_to_host(tx_flags_);
+    return do_find_option(TX_FLAGS).to<uint16_t>();
 }
 
 uint8_t RadioTap::data_retries() const {
-    if (!radio_.flags.data_retries) {
-        throw field_not_present();
-    }
-    return data_retries_;
+    return do_find_option(DATA_RETRIES).to<uint8_t>();
 }
 
 #ifndef _WIN32
@@ -495,10 +334,10 @@ void RadioTap::send(PacketSender& sender, const NetworkInterface& iface) {
 #endif
 
 bool RadioTap::matches_response(const uint8_t* ptr, uint32_t total_sz) const {
-    if (sizeof(radio_) < total_sz) {
+    if (sizeof(header_) < total_sz) {
         return false;
     }
-    const radiotap_hdr* radio_ptr = (const radiotap_hdr*)ptr;
+    const radiotap_header* radio_ptr = (const radiotap_header*)ptr;
     if (radio_ptr->it_len <= total_sz) {
         ptr += radio_ptr->it_len;
         total_sz -= radio_ptr->it_len;
@@ -509,50 +348,10 @@ bool RadioTap::matches_response(const uint8_t* ptr, uint32_t total_sz) const {
 
 void RadioTap::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     OutputMemoryStream stream(buffer, total_sz);
-    uint8_t* buffer_start = buffer;
-    radio_.it_len = Endian::host_to_le<uint16_t>(header_size());
-    stream.write(radio_);
-    if (radio_.flags.tsft) {
-        stream.write(tsft_);
-    }
-    if (radio_.flags.flags) {
-        stream.write(flags_);
-    }
-    if (radio_.flags.rate) {
-        stream.write(rate_);
-    }
-    if (radio_.flags.channel) {
-        if (((stream.pointer() - buffer_start) & 1) == 1) {
-            stream.write<uint8_t>(0);
-        }
-        stream.write(channel_freq_);
-        stream.write(channel_type_);
-    }
-    if (radio_.flags.dbm_signal) {
-        stream.write(dbm_signal_);
-    }
-    if (radio_.flags.dbm_noise) {
-        stream.write(dbm_noise_);
-    }
-    if (radio_.flags.lock_quality) {
-        if (((stream.pointer() - buffer_start) & 1) == 1) {
-            stream.write<uint8_t>(0);
-        }
-        stream.write(signal_quality_);
-    }
-    if (radio_.flags.antenna) {
-        stream.write(antenna_);
-    }
-    if (radio_.flags.db_signal) {
-        stream.write(db_signal_);
-    }
-    if (radio_.flags.rx_flags) {
-        if (((stream.pointer() - buffer_start) & 1) == 1) {
-            stream.write<uint8_t>(0);
-        }
-        stream.write(rx_flags_);
-    }
-    if (radio_.flags.channel_plus) {
+    header_.it_len = Endian::host_to_le<uint16_t>(header_size());
+    stream.write(header_);
+    stream.write(options_payload_.begin(), options_payload_.end());
+    /*if (header_.flags.channel_plus) {
         const uint32_t padding = ((stream.pointer() - buffer_start) % 4);
         if (padding != 0) {
             stream.fill(4 - padding, 0);
@@ -564,8 +363,10 @@ void RadioTap::write_serialization(uint8_t* buffer, uint32_t total_sz) {
         stream.write(channel_freq_);
         stream.write(channel_);
         stream.write(max_power_);
-    }
-    if ((flags_ & 0x10) != 0 && inner_pdu()) {
+    }*/
+
+    // If we have a trailer size, then we have the FCS flag on
+    if (trailer_size() > 0 && inner_pdu()) {
     	uint32_t crc32 = Endian::host_to_le(
             Utils::crc32(stream.pointer(), inner_pdu()->size())
         );
@@ -574,6 +375,14 @@ void RadioTap::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     }
 }
 
+RadioTap::option RadioTap::do_find_option(PresentFlags type) const {
+    RadioTapParser parser(options_payload_);
+    if (!parser.skip_to_field(type)) {
+        throw field_not_present();
+    }
+    return parser.current_option();
+}
+
 } // Tins
 
 #endif // TINS_HAVE_DOT11
diff --git a/src/utils/radiotap_parser.cpp b/src/utils/radiotap_parser.cpp
index 058655a..69d3dea 100644
--- a/src/utils/radiotap_parser.cpp
+++ b/src/utils/radiotap_parser.cpp
@@ -54,7 +54,7 @@ const RadioTapParser::FieldMetadata RadioTapParser::RADIOTAP_METADATA[] = {
     { 2, 2 }, // TX_FLAGS
     { 1, 1 }, // RTS_RETRIES
     { 1, 1 }, // DATA_RETRIES
-    { 4, 4 }, // CHANNEL_PLUS
+    { 8, 4 }, // CHANNEL_PLUS
     { 3, 1 }, // MCS
 };
 
@@ -129,7 +129,7 @@ void align_buffer(const uint8_t* buffer_start, const uint8_t*& buffer, uint32_t
     uint32_t offset = ((buffer - buffer_start) % n);
     if (offset) {
         offset = n - offset;
-        if (offset > size) {
+        if (TINS_UNLIKELY(offset > size)) {
             throw malformed_packet();
         }
         buffer += offset;
@@ -164,12 +164,12 @@ RadioTap::PresentFlags RadioTapParser::current_field() const {
     return static_cast<RadioTap::PresentFlags>(1 << current_bit_);
 }
 
-RadioTapParser::option RadioTapParser::current_option() {
+RadioTap::option RadioTapParser::current_option() {
     const uint32_t size = RADIOTAP_METADATA[current_bit_].size;
     if (TINS_UNLIKELY(current_ptr_ + size > end_)) {
         throw malformed_packet();
     }
-    return option(current_field(), size, current_ptr_);
+    return RadioTap::option(current_field(), size, current_ptr_);
 }
 
 const uint8_t* RadioTapParser::current_option_ptr() const {
@@ -195,6 +195,19 @@ bool RadioTapParser::advance_field() {
     return advance_to_next_field(true /* start from 0*/);
 }
 
+bool RadioTapParser::advance_namespace() {
+    if (static_cast<size_t>(end_ - start_) < sizeof(uint32_t)) {
+        return false;
+    }
+    return advance_to_next_namespace();
+}
+
+RadioTap::PresentFlags RadioTapParser::namespace_flags() const {
+    uint32_t output = 0;
+    memcpy(&output, get_flags_ptr(), sizeof(output));
+    return static_cast<RadioTap::PresentFlags>(Endian::le_to_host(output));
+}
+
 bool RadioTapParser::skip_to_field(RadioTap::PresentFlags flag) {
     while (has_fields() && current_field() != flag) {
         advance_field();
diff --git a/src/utils/radiotap_writer.cpp b/src/utils/radiotap_writer.cpp
index 7d76b47..6bd030e 100644
--- a/src/utils/radiotap_writer.cpp
+++ b/src/utils/radiotap_writer.cpp
@@ -29,6 +29,7 @@
 
 #include <cmath>
 #include "utils/radiotap_writer.h"
+#include "utils/radiotap_parser.h"
 #include "exceptions.h"
 
 using std::vector;
@@ -48,7 +49,7 @@ RadioTapWriter::RadioTapWriter(vector<uint8_t>& buffer)
 : buffer_(buffer) {
 }
 
-bool RadioTapWriter::write_option(const RadioTapParser::option& option) {
+void RadioTapWriter::write_option(const RadioTap::option& option) {
     const uint32_t bit = get_bit(option.option());
     if (bit > RadioTapParser::MAX_RADIOTAP_FIELD) {
         throw malformed_option();
@@ -62,8 +63,9 @@ bool RadioTapWriter::write_option(const RadioTapParser::option& option) {
             break;
         }
         else if (parser.current_field() == option.option()) {
-            // We can't add the same option twice
-            return false;
+            memcpy(const_cast<uint8_t*>(parser.current_option_ptr()),
+                   option.data_ptr(), option.data_size());
+            return;
         }
         else {
             const uint32_t bit = get_bit(parser.current_field());
@@ -97,7 +99,6 @@ bool RadioTapWriter::write_option(const RadioTapParser::option& option) {
     }
     flags |= Endian::host_to_le<uint32_t>(option.option());
     memcpy(&*buffer_.begin(), &flags, sizeof(flags));
-    return true;
 }
 
 // Builds a vector that will contain the padding required for every position.
diff --git a/tests/src/radiotap_test.cpp b/tests/src/radiotap_test.cpp
index be7a37d..f915f44 100644
--- a/tests/src/radiotap_test.cpp
+++ b/tests/src/radiotap_test.cpp
@@ -199,7 +199,14 @@ const uint8_t RadioTapTest::expected_packet4[] = {
 };
 
 const uint8_t RadioTapTest::expected_packet5[] = {
-    0, 0, 14, 0, 0, 128, 10, 0, 0, 0, 0, 7, 0, 5, 136, 65, 0, 0, 76, 158, 255, 127, 13, 247, 144, 162, 218, 245, 28, 56, 84, 4, 166, 180, 209, 35, 208, 207, 0, 0, 105, 29, 0, 32, 1, 0, 0, 0, 170, 170, 3, 0, 0, 0, 8, 0, 69, 16, 0, 100, 217, 93, 64, 0, 64, 6, 220, 39, 192, 168, 1, 245, 192, 168, 1, 185, 0, 22, 132, 209, 139, 84, 229, 243, 73, 225, 122, 44, 128, 24, 14, 36, 163, 203, 0, 0, 1, 1, 8, 10, 0, 95, 217, 190, 0, 30, 133, 52, 220, 143, 231, 158, 151, 126, 243, 67, 163, 172, 214, 109, 192, 190, 238, 160, 95, 63, 206, 71, 230, 59, 143, 105, 105, 172, 142, 15, 17, 139, 55, 70, 232, 71, 84, 12, 235, 224, 159, 132, 178, 117, 5, 43, 177, 190, 152, 170
+    0, 0, 14, 0, 0, 128, 10, 0, 0, 0, 0, 7, 0, 5, 136, 65, 0, 0, 76, 158, 255, 127, 13,
+    247, 144, 162, 218, 245, 28, 56, 84, 4, 166, 180, 209, 35, 208, 207, 0, 0, 105, 29,
+    0, 32, 1, 0, 0, 0, 170, 170, 3, 0, 0, 0, 8, 0, 69, 16, 0, 100, 217, 93, 64, 0, 64,
+    6, 220, 39, 192, 168, 1, 245, 192, 168, 1, 185, 0, 22, 132, 209, 139, 84, 229, 243,
+    73, 225, 122, 44, 128, 24, 14, 36, 163, 203, 0, 0, 1, 1, 8, 10, 0, 95, 217, 190, 0,
+    30, 133, 52, 220, 143, 231, 158, 151, 126, 243, 67, 163, 172, 214, 109, 192, 190,
+    238, 160, 95, 63, 206, 71, 230, 59, 143, 105, 105, 172, 142, 15, 17, 139, 55, 70,
+    232, 71, 84, 12, 235, 224, 159, 132, 178, 117, 5, 43, 177, 190, 152, 170
 };
 
 TEST_F(RadioTapTest, DefaultConstructor) {
@@ -220,7 +227,7 @@ TEST_F(RadioTapTest, ConstructorFromBuffer) {
     EXPECT_EQ(radio.rate(), 0xc);
     EXPECT_EQ(radio.flags(), 0x10);
     
-    EXPECT_TRUE((radio.present() & RadioTap::TSTF) != 0);
+    EXPECT_TRUE((radio.present() & RadioTap::TSFT) != 0);
     EXPECT_TRUE((radio.present() & RadioTap::RATE) != 0);
     EXPECT_TRUE((radio.present() & RadioTap::DBM_SIGNAL) != 0);
     EXPECT_TRUE((radio.present() & RadioTap::ANTENNA) != 0);
@@ -282,7 +289,7 @@ TEST_F(RadioTapTest, ConstructorFromBuffer3) {
 
 TEST_F(RadioTapTest, ConstructorFromBuffer4) {
     RadioTap radio(expected_packet4, sizeof(expected_packet4));
-    EXPECT_TRUE((radio.present() & RadioTap::TSTF) != 0);
+    EXPECT_TRUE((radio.present() & RadioTap::TSFT) != 0);
     EXPECT_TRUE((radio.present() & RadioTap::DBM_SIGNAL) != 0);
     EXPECT_TRUE((radio.present() & RadioTap::CHANNEL) != 0);
     EXPECT_TRUE((radio.present() & RadioTap::ANTENNA) != 0);
@@ -409,7 +416,7 @@ TEST_F(RadioTapTest, SerializationWorksFine) {
 TEST_F(RadioTapTest, RadioTapParsing) {
     vector<uint8_t> buffer(expected_packet+4, expected_packet + sizeof(expected_packet)-4);
     RadioTapParser parser(buffer);
-    EXPECT_EQ(RadioTap::TSTF, parser.current_field());
+    EXPECT_EQ(RadioTap::TSFT, parser.current_field());
     EXPECT_EQ(616089172U, parser.current_option().to<uint64_t>());
     EXPECT_TRUE(parser.advance_field());
     
@@ -434,7 +441,7 @@ TEST_F(RadioTapTest, RadioTapParsing) {
     EXPECT_TRUE(parser.advance_field());
     
     EXPECT_EQ(RadioTap::CHANNEL_PLUS,parser.current_field());
-    EXPECT_EQ(0x140U, parser.current_option().to<uint32_t>());
+    EXPECT_EQ(0x1124143c00000140ULL, parser.current_option().to<uint64_t>());
 
     EXPECT_FALSE(parser.advance_field());
 }
@@ -484,44 +491,41 @@ TEST_F(RadioTapTest, RadioTapWritingEmptyBuffer) {
     RadioTapWriter writer(buffer);
     {
         const uint8_t value = 0xca;
-        writer.write_option(RadioTapParser::option(RadioTap::ANTENNA, sizeof(value), &value));
+        writer.write_option(RadioTap::option(RadioTap::ANTENNA, sizeof(value), &value));
     }
     {
         const uint8_t value = (uint8_t)RadioTap::FCS;
-        writer.write_option(RadioTapParser::option(RadioTap::FLAGS, sizeof(value), &value));
+        writer.write_option(RadioTap::option(RadioTap::FLAGS, sizeof(value), &value));
     }
     {
         const uint64_t value = Endian::host_to_le<uint64_t>(616089172U);
         uint8_t buffer[sizeof(value)];
         memcpy(buffer, &value, sizeof(value));
-        writer.write_option(RadioTapParser::option(RadioTap::TSTF, sizeof(buffer), buffer));
+        writer.write_option(RadioTap::option(RadioTap::TSFT, sizeof(buffer), buffer));
     }
     {
         const uint16_t value = Endian::host_to_le<uint16_t>(0x1234);
         uint8_t buffer[sizeof(value)];
         memcpy(buffer, &value, sizeof(value));
-        writer.write_option(RadioTapParser::option(RadioTap::FHSS, sizeof(buffer), buffer));
+        writer.write_option(RadioTap::option(RadioTap::FHSS, sizeof(buffer), buffer));
     }
     {
         const uint8_t value = 0xab;
-        writer.write_option(RadioTapParser::option(RadioTap::RATE, sizeof(value), &value));
-        // We can't add the same option twice
-        EXPECT_FALSE(writer.write_option(RadioTapParser::option(RadioTap::RATE, sizeof(value),
-                                                                &value)));
+        writer.write_option(RadioTap::option(RadioTap::RATE, sizeof(value), &value));
     }
     {
         const uint8_t value = 0xf7;
-        writer.write_option(RadioTapParser::option(RadioTap::DBM_SIGNAL, sizeof(value), &value));
+        writer.write_option(RadioTap::option(RadioTap::DBM_SIGNAL, sizeof(value), &value));
     }
     {
         const uint16_t value = Endian::host_to_le<uint16_t>(0x4321);
         uint8_t buffer[sizeof(value)];
         memcpy(buffer, &value, sizeof(value));
-        writer.write_option(RadioTapParser::option(RadioTap::RX_FLAGS, sizeof(buffer), buffer));
+        writer.write_option(RadioTap::option(RadioTap::RX_FLAGS, sizeof(buffer), buffer));
     }
 
     RadioTapParser parser(buffer);
-    EXPECT_EQ(RadioTap::TSTF, parser.current_field());
+    EXPECT_EQ(RadioTap::TSFT, parser.current_field());
     EXPECT_EQ(616089172U, parser.current_option().to<uint64_t>());
     EXPECT_TRUE(parser.advance_field());
 

From aa64e348801f6de1074eed1db7c8512eaa1c3507 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Mon, 29 May 2017 20:48:05 -0700
Subject: [PATCH 65/73] Keep current flags as member in RadioTapParser

---
 include/tins/utils/radiotap_parser.h | 10 ++--
 src/radiotap.cpp                     |  8 ++--
 src/utils/radiotap_parser.cpp        | 72 +++++++++++++++++-----------
 3 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/include/tins/utils/radiotap_parser.h b/include/tins/utils/radiotap_parser.h
index b297a7b..44e2744 100644
--- a/include/tins/utils/radiotap_parser.h
+++ b/include/tins/utils/radiotap_parser.h
@@ -162,17 +162,21 @@ public:
     bool has_field(RadioTap::PresentFlags flag) const;
 private:
     const uint8_t* find_options_start() const;
-    bool advance_to_next_field(bool start_from_zero);
+    bool advance_to_first_field();
+    bool advance_to_next_field();
+    bool skip_current_field();
     bool advance_to_next_namespace();
     const RadioTapFlags* get_flags_ptr() const;
+    void load_current_flags();
     bool is_field_set(uint32_t bit, const RadioTapFlags* flags) const;
 
     const uint8_t* start_;
     const uint8_t* end_; 
     const uint8_t* current_ptr_;
-    NamespaceType current_namespace_;
-    uint32_t current_bit_;
+    uint64_t current_bit_;
+    uint32_t current_flags_;
     uint32_t namespace_index_;
+    NamespaceType current_namespace_;
 };
 
 } // Utils
diff --git a/src/radiotap.cpp b/src/radiotap.cpp
index 5842c2b..a71bc8c 100644
--- a/src/radiotap.cpp
+++ b/src/radiotap.cpp
@@ -98,19 +98,19 @@ RadioTap::RadioTap(const uint8_t* buffer, uint32_t total_sz) {
     total_sz = input.size();
     RadioTapParser parser(options_payload_);
     if (parser.skip_to_field(FLAGS)) {
-        const uint8_t flags_value = parser.current_option().to<uint8_t>();
+        const uint8_t flags_value = *parser.current_option_ptr();
         if ((flags_value & FCS) != 0) {
-            if (total_sz < sizeof(uint32_t)) {
+            if (TINS_UNLIKELY(total_sz < sizeof(uint32_t))) {
                 throw malformed_packet();
             }
             total_sz -= sizeof(uint32_t);
-            if ((flags_value & FAILED_FCS) !=0) {
+            if (TINS_UNLIKELY((flags_value & FAILED_FCS) != 0)) {
                 throw malformed_packet();
             }
         }
     }
 
-    if (total_sz) {
+    if (TINS_LIKELY(total_sz)) {
         inner_pdu(Dot11::from_bytes(input.pointer(), total_sz));
     }
 }
diff --git a/src/utils/radiotap_parser.cpp b/src/utils/radiotap_parser.cpp
index 69d3dea..c3babbf 100644
--- a/src/utils/radiotap_parser.cpp
+++ b/src/utils/radiotap_parser.cpp
@@ -27,6 +27,7 @@
  *
  */
 
+#include <iostream>
 #include "utils/radiotap_parser.h"
 #include "exceptions.h"
 
@@ -126,7 +127,7 @@ struct RadioTapFlags {
 #endif
 
 void align_buffer(const uint8_t* buffer_start, const uint8_t*& buffer, uint32_t size, size_t n) {
-    uint32_t offset = ((buffer - buffer_start) % n);
+    uint32_t offset = (buffer - buffer_start) & (n - 1);
     if (offset) {
         offset = n - offset;
         if (TINS_UNLIKELY(offset > size)) {
@@ -137,18 +138,22 @@ void align_buffer(const uint8_t* buffer_start, const uint8_t*& buffer, uint32_t
 }
 
 RadioTapParser::RadioTapParser(const vector<uint8_t>& buffer)
-: current_namespace_(RADIOTAP_NS), current_bit_(MAX_RADIOTAP_FIELD), namespace_index_(0) {
+: current_bit_(MAX_RADIOTAP_FIELD), current_flags_(0), namespace_index_(0),
+  current_namespace_(RADIOTAP_NS) {
     if (buffer.empty()) {
         start_ = 0;
         end_ = 0;
         current_ptr_ = start_;
+        current_flags_ = 0;
     }
     else {
         start_ = &*buffer.begin();
         end_ = start_ + buffer.size();
+        load_current_flags();
+        current_bit_ = 0;
         current_ptr_ = find_options_start();
         // Skip all fields and make this point to the first flags one
-        advance_to_next_field(true /* start from bit zero */);
+        advance_to_first_field();
     }
 }
 
@@ -182,17 +187,21 @@ bool RadioTapParser::advance_field() {
         return false;
     }
     // If we manage to advance the field, return true
-    if (advance_to_next_field(false /* keep going from current */)) {
+    if (skip_current_field()) {
         return true;
     }
-    // We finished iterating the current namespace (if any). Reset our bit
-    current_bit_ = MAX_RADIOTAP_FIELD;
-    // Otherwise, let's try advancing the namespace. If we fail, then we failed
+    // Try to find the next namespace, as we've exhausted the current one
     if (!advance_to_next_namespace()) {
+        current_bit_ = MAX_RADIOTAP_FIELD;
         return false;
     }
+    current_bit_ = 0;
     // Try to find the first field in this new namespace
-    return advance_to_next_field(true /* start from 0*/);
+    if (!advance_to_first_field()) {
+        current_bit_ = MAX_RADIOTAP_FIELD;
+        return false;
+    }
+    return true;
 }
 
 bool RadioTapParser::advance_namespace() {
@@ -203,7 +212,7 @@ bool RadioTapParser::advance_namespace() {
 }
 
 RadioTap::PresentFlags RadioTapParser::namespace_flags() const {
-    uint32_t output = 0;
+    uint32_t output;
     memcpy(&output, get_flags_ptr(), sizeof(output));
     return static_cast<RadioTap::PresentFlags>(Endian::le_to_host(output));
 }
@@ -252,35 +261,38 @@ const uint8_t* RadioTapParser::find_options_start() const {
     return reinterpret_cast<const uint8_t*>(flags) + sizeof(RadioTapFlags);
 }
 
-bool RadioTapParser::advance_to_next_field(bool start_from_zero) {
-    const RadioTapFlags* flags = get_flags_ptr();
-    uint32_t bit;
-    if (start_from_zero) {
-        bit = 0;
+bool RadioTapParser::advance_to_first_field() {
+    return advance_to_next_field();
+}
+
+bool RadioTapParser::advance_to_next_field() {
+    while ((current_flags_ & 1) == 0 && current_bit_ < MAX_RADIOTAP_FIELD) {
+        current_bit_++;
+        current_flags_ >>= 1;
     }
-    else {
-        // Skip the payload
-        current_ptr_ += RADIOTAP_METADATA[current_bit_].size;
-        bit = current_bit_ + 1;
-    }
-    while (!is_field_set(1 << bit, flags) && bit < MAX_RADIOTAP_FIELD) {
-        bit++; 
-    }
-    if (bit < MAX_RADIOTAP_FIELD) {
+    if (current_bit_ < MAX_RADIOTAP_FIELD) {
         const uint8_t* radiotap_start = start_ - sizeof(uint32_t);
         // Skip and align the buffer
         align_buffer(radiotap_start, current_ptr_, end_ - radiotap_start,
-                     RADIOTAP_METADATA[bit].alignment);
-        current_bit_ = bit;
+                     RADIOTAP_METADATA[current_bit_].alignment);
         return true;
     }
     return false;
 }
 
+bool RadioTapParser::skip_current_field() {
+    // Skip the payload
+    current_ptr_ += RADIOTAP_METADATA[current_bit_].size;
+    current_flags_ >>= 1;
+    current_bit_++;
+    return advance_to_next_field();
+}
+
 bool RadioTapParser::advance_to_next_namespace() {
     const uint32_t initial_index = namespace_index_;
-    while (get_flags_ptr()->ext == 1) {
-        const RadioTapFlags* flags = get_flags_ptr();
+    load_current_flags();
+    const RadioTapFlags* flags = (const RadioTapFlags*)&current_flags_;
+    while (flags->ext == 1) {
         if (is_field_set(29, flags)) {
             current_namespace_ = RADIOTAP_NS;
         }
@@ -291,6 +303,8 @@ bool RadioTapParser::advance_to_next_namespace() {
             current_namespace_ = UNKNOWN_NS;
         }
         namespace_index_++;
+        load_current_flags();
+        flags = (const RadioTapFlags*)&current_flags_;
     }
     return initial_index != namespace_index_;
 }
@@ -309,5 +323,9 @@ const RadioTapFlags* RadioTapParser::get_flags_ptr() const {
     return (const RadioTapFlags*)(start_ + sizeof(uint32_t) * namespace_index_);
 }
 
+void RadioTapParser::load_current_flags() {
+    memcpy(&current_flags_, get_flags_ptr(), sizeof(current_flags_));
+}
+
 } // Utils
 } // Tins

From 2f528876ad0cd5a9373e1f6b1b2ce6cafea478db Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Mon, 29 May 2017 20:50:45 -0700
Subject: [PATCH 66/73] Add back RadioTap::TSTF

---
 include/tins/radiotap.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/tins/radiotap.h b/include/tins/radiotap.h
index 22b322f..98a8c7f 100644
--- a/include/tins/radiotap.h
+++ b/include/tins/radiotap.h
@@ -84,6 +84,7 @@ public:
      */
     enum PresentFlags {
         TSFT                = 1 << 0,
+        TSTF                = 1 << 0, // Deprecated (typo in the name...)
         FLAGS               = 1 << 1,
         RATE                = 1 << 2,
         CHANNEL             = 1 << 3,

From edd289c64521396b52efbdc31b92d2216ab5aa24 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Tue, 30 May 2017 19:45:20 -0700
Subject: [PATCH 67/73] Don't dereference vector if empty on RadioTapWriter

---
 src/utils/radiotap_writer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/radiotap_writer.cpp b/src/utils/radiotap_writer.cpp
index 6bd030e..0608db8 100644
--- a/src/utils/radiotap_writer.cpp
+++ b/src/utils/radiotap_writer.cpp
@@ -74,7 +74,7 @@ void RadioTapWriter::write_option(const RadioTap::option& option) {
         }
         parser.advance_field();
     }
-    size_t offset = candidate_ptr - &*buffer_.begin();
+    size_t offset = is_empty ? 0 : candidate_ptr - &*buffer_.begin();
     const RadioTapParser::FieldMetadata& meta = RadioTapParser::RADIOTAP_METADATA[bit];
 
     vector<uint8_t> paddings = build_padding_vector(candidate_ptr, parser);

From 77d965784ec26689302622754c4e9517fe3b6c57 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Tue, 30 May 2017 21:17:55 -0700
Subject: [PATCH 68/73] Add support for DLT_RAW on BaseSniffer

Fixes #210
---
 src/sniffer.cpp | 100 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 68 insertions(+), 32 deletions(-)

diff --git a/src/sniffer.cpp b/src/sniffer.cpp
index 105b2e1..87a1141 100644
--- a/src/sniffer.cpp
+++ b/src/sniffer.cpp
@@ -43,6 +43,8 @@
 #include "pktap.h"
 #include "sll.h"
 #include "ppi.h"
+#include "ip.h"
+#include "ipv6.h"
 #include "detail/pdu_helpers.h"
 
 using std::string;
@@ -118,6 +120,32 @@ void sniff_loop_eth_handler(u_char* user, const struct pcap_pkthdr* h, const u_c
     }
 }
 
+void sniff_loop_raw_handler(u_char* user, const struct pcap_pkthdr* h, const u_char* bytes) {
+    TINS_BEGIN_PACK
+    struct base_ip_header {
+    #if TINS_IS_LITTLE_ENDIAN
+        uint8_t ihl:4,
+                version:4;
+    #else
+        uint8_t version:4,
+                ihl:4;
+    #endif
+    } TINS_END_PACK;
+
+    sniff_data* data = (sniff_data*)user;
+    const base_ip_header* header = (const base_ip_header*)bytes;
+    data->packet_processed = true;
+    data->tv = h->ts;
+    switch (header->version) {
+        case 4:
+            data->pdu = safe_alloc<IP>((const uint8_t*)bytes, h->caplen);
+            break;
+        case 6:
+            data->pdu = safe_alloc<IPv6>((const uint8_t*)bytes, h->caplen);
+            break;
+    };
+}
+
 #ifdef TINS_HAVE_DOT11
 void sniff_loop_dot11_handler(u_char* user, const struct pcap_pkthdr* h, const u_char* bytes) {
     sniff_data* data = (sniff_data*)user;
@@ -139,39 +167,47 @@ PtrPacket BaseSniffer::next_packet() {
     if (extract_raw_) {
         handler = &sniff_loop_handler<RawPDU>;
     }
-    else if (iface_type == DLT_EN10MB) {
-        handler = sniff_loop_eth_handler;
-    }
-    else if (iface_type == DLT_IEEE802_11_RADIO) {
-        #ifdef TINS_HAVE_DOT11
-            handler = &sniff_loop_handler<RadioTap>;
-        #else
-            throw protocol_disabled();
-        #endif
-    }
-    else if (iface_type == DLT_IEEE802_11) {
-        #ifdef TINS_HAVE_DOT11
-            handler = sniff_loop_dot11_handler;
-        #else
-            throw protocol_disabled();
-        #endif
-    }
-    #ifdef DLT_PKTAP
-    else if (iface_type == DLT_PKTAP) {
-        handler = &sniff_loop_handler<PKTAP>;
-    }
-    #endif // DLT_PKTAP
-    else if (iface_type == DLT_NULL) {
-        handler = &sniff_loop_handler<Tins::Loopback>;
-    }
-    else if (iface_type == DLT_LINUX_SLL) {
-        handler = &sniff_loop_handler<SLL>;
-    }
-    else if (iface_type == DLT_PPI) {
-        handler = &sniff_loop_handler<PPI>;
-    }
     else {
-        throw unknown_link_type();
+        switch (iface_type) {
+            case DLT_EN10MB:
+                handler = &sniff_loop_eth_handler;
+                break;
+            case DLT_NULL:
+                handler = &sniff_loop_handler<Tins::Loopback>;
+                break;
+            case DLT_LINUX_SLL:
+                handler = &sniff_loop_handler<SLL>;
+                break; 
+            case DLT_PPI:
+                handler = &sniff_loop_handler<PPI>;
+                break;
+            case DLT_RAW:
+                handler = &sniff_loop_raw_handler;
+                break;
+
+            // Dot11 related protocols
+            #ifdef TINS_HAVE_DOT11
+            case DLT_IEEE802_11_RADIO:
+                handler = &sniff_loop_handler<RadioTap>;
+                break;
+            case DLT_IEEE802_11:
+                handler = &sniff_loop_dot11_handler;
+                break;
+            #else
+            case DLT_IEEE802_11_RADIO:
+            case DLT_IEEE802_11:
+                throw protocol_disabled();
+            #endif // TINS_HAVE_DOT11
+
+            #ifdef DLT_PKTAP
+            case DLT_PKTAP:
+                handler = &sniff_loop_handler<PKTAP>;
+                break;
+            #endif // DLT_PKTAP
+
+            default:
+                throw unknown_link_type();
+        }
     }
     // keep calling pcap_loop until a well-formed packet is found.
     while (data.pdu == 0 && data.packet_processed) {

From ca3127ffbc3cd1d5946a6f0b4f22eb87659b7d3b Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Wed, 31 May 2017 19:42:22 -0700
Subject: [PATCH 69/73] Fix some big endian issues

---
 src/utils/radiotap_parser.cpp | 8 ++++----
 tests/src/ipv6_test.cpp       | 4 ----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/utils/radiotap_parser.cpp b/src/utils/radiotap_parser.cpp
index c3babbf..7655de2 100644
--- a/src/utils/radiotap_parser.cpp
+++ b/src/utils/radiotap_parser.cpp
@@ -290,8 +290,7 @@ bool RadioTapParser::skip_current_field() {
 
 bool RadioTapParser::advance_to_next_namespace() {
     const uint32_t initial_index = namespace_index_;
-    load_current_flags();
-    const RadioTapFlags* flags = (const RadioTapFlags*)&current_flags_;
+    const RadioTapFlags* flags = get_flags_ptr();
     while (flags->ext == 1) {
         if (is_field_set(29, flags)) {
             current_namespace_ = RADIOTAP_NS;
@@ -303,9 +302,9 @@ bool RadioTapParser::advance_to_next_namespace() {
             current_namespace_ = UNKNOWN_NS;
         }
         namespace_index_++;
-        load_current_flags();
-        flags = (const RadioTapFlags*)&current_flags_;
+        flags++;
     }
+    load_current_flags();
     return initial_index != namespace_index_;
 }
 
@@ -325,6 +324,7 @@ const RadioTapFlags* RadioTapParser::get_flags_ptr() const {
 
 void RadioTapParser::load_current_flags() {
     memcpy(&current_flags_, get_flags_ptr(), sizeof(current_flags_));
+    current_flags_ = Endian::le_to_host(current_flags_);
 }
 
 } // Utils
diff --git a/tests/src/ipv6_test.cpp b/tests/src/ipv6_test.cpp
index e8017cd..d8aecff 100644
--- a/tests/src/ipv6_test.cpp
+++ b/tests/src/ipv6_test.cpp
@@ -192,10 +192,6 @@ TEST_F(IPv6Test, Serialize) {
 
 TEST_F(IPv6Test, Broken1) {
     EthernetII pkt(broken1, sizeof(broken1));
-    for (auto c : pkt.serialize()) {
-        printf("%2d, ", (int)c);
-    }
-    printf("\n");
     EXPECT_EQ(
         PDU::serialization_type(broken1, broken1 + sizeof(broken1)),
         pkt.serialize()

From 77ca5c2701ba61adc02e828a4970ad53ede4299e Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sat, 3 Jun 2017 08:55:08 -0700
Subject: [PATCH 70/73] Add missing radiotap parsing fields

---
 include/tins/radiotap.h              |  16 +++-
 include/tins/utils.h                 |   2 +
 include/tins/utils/radiotap_writer.h |   2 +-
 src/radiotap.cpp                     |   4 +
 src/utils/radiotap_parser.cpp        |   2 +
 tests/src/radiotap_test.cpp          | 126 ++++++++++++++++++++++++++-
 6 files changed, 149 insertions(+), 3 deletions(-)

diff --git a/include/tins/radiotap.h b/include/tins/radiotap.h
index 98a8c7f..520456b 100644
--- a/include/tins/radiotap.h
+++ b/include/tins/radiotap.h
@@ -134,6 +134,11 @@ public:
      */
     typedef PDUOption<RadioTap::PresentFlags, RadioTap> option;
 
+    /**
+     * The type used to store the options payload
+     */
+    typedef std::vector<uint8_t> options_payload_type;
+
     /**
      * \brief Default constructor.
      */
@@ -407,6 +412,15 @@ public:
      */
     void add_option(const option& opt);
 
+    /**
+     * \brief Gets the options payload
+     *
+     * Use Utils::RadioTapParser to iterate these options and extract fields manually,
+     * in case you want to have deeper access into the option types/values stored in 
+     * a RadioTap frame.
+     */
+    const options_payload_type& options_payload() const;
+
     /**
      * \sa PDU::clone
      */
@@ -438,7 +452,7 @@ private:
     option do_find_option(PresentFlags type) const;
 
     radiotap_header header_;
-    std::vector<uint8_t> options_payload_;
+    options_payload_type options_payload_;
 };
 }
 
diff --git a/include/tins/utils.h b/include/tins/utils.h
index ea13730..a680966 100644
--- a/include/tins/utils.h
+++ b/include/tins/utils.h
@@ -35,6 +35,8 @@
 #include "utils/routing_utils.h"
 #include "utils/resolve_utils.h"
 #include "utils/pdu_utils.h"
+#include "utils/radiotap_parser.h"
+#include "utils/radiotap_writer.h"
  
 namespace Tins {
 
diff --git a/include/tins/utils/radiotap_writer.h b/include/tins/utils/radiotap_writer.h
index eb1efd3..7d08326 100644
--- a/include/tins/utils/radiotap_writer.h
+++ b/include/tins/utils/radiotap_writer.h
@@ -32,7 +32,7 @@
 
 #include <vector>
 #include <stdint.h>
-#include "radiotap.h"
+#include "../radiotap.h"
 
 namespace Tins {
 namespace Utils {
diff --git a/src/radiotap.cpp b/src/radiotap.cpp
index a71bc8c..8d60266 100644
--- a/src/radiotap.cpp
+++ b/src/radiotap.cpp
@@ -217,6 +217,10 @@ void RadioTap::add_option(const option& opt) {
     writer.write_option(opt);
 }
 
+const RadioTap::options_payload_type& RadioTap::options_payload() const {
+    return options_payload_;
+}
+
 // Getter for RadioTap fields
 uint8_t RadioTap::version() const {
     return header_.it_version;
diff --git a/src/utils/radiotap_parser.cpp b/src/utils/radiotap_parser.cpp
index 7655de2..0caa0ab 100644
--- a/src/utils/radiotap_parser.cpp
+++ b/src/utils/radiotap_parser.cpp
@@ -57,6 +57,8 @@ const RadioTapParser::FieldMetadata RadioTapParser::RADIOTAP_METADATA[] = {
     { 1, 1 }, // DATA_RETRIES
     { 8, 4 }, // CHANNEL_PLUS
     { 3, 1 }, // MCS
+    { 8, 4 }, // A-MPDU status
+    { 12, 2 } // VHT
 };
 
 const uint32_t RadioTapParser::MAX_RADIOTAP_FIELD = sizeof(RADIOTAP_METADATA) /
diff --git a/tests/src/radiotap_test.cpp b/tests/src/radiotap_test.cpp
index f915f44..c5c0893 100644
--- a/tests/src/radiotap_test.cpp
+++ b/tests/src/radiotap_test.cpp
@@ -24,7 +24,8 @@ class RadioTapTest : public testing::Test {
 public:
     static const uint8_t expected_packet[], expected_packet1[],
                         expected_packet2[], expected_packet3[],
-                        expected_packet4[], expected_packet5[];
+                        expected_packet4[], expected_packet5[],
+                        expected_packet6[];
 };
 
 const uint8_t RadioTapTest::expected_packet[] = {
@@ -209,6 +210,120 @@ const uint8_t RadioTapTest::expected_packet5[] = {
     232, 71, 84, 12, 235, 224, 159, 132, 178, 117, 5, 43, 177, 190, 152, 170
 };
 
+const uint8_t RadioTapTest::expected_packet6[] = {
+    0, 0, 32, 0, 42, 72, 24, 0, 0, 0, 158, 9, 128, 4, 183, 3, 0, 0, 
+    15, 0, 3, 0, 0, 0, 74, 26, 76, 0, 0, 0, 0, 0, 136, 66, 44, 0, 68,
+    101, 13, 96, 131, 48, 232, 51, 129, 72, 93, 240, 232, 51, 129, 
+    72, 93, 240, 240, 5, 0, 0, 227, 36, 0, 32, 5, 0, 0, 0, 67, 145, 
+    79, 185, 3, 42, 82, 220, 135, 236, 253, 12, 46, 218, 76, 245, 52,
+    70, 20, 63, 57, 19, 30, 95, 42, 2, 48, 16, 7, 57, 155, 82, 168, 
+    108, 24, 197, 107, 149, 155, 155, 175, 137, 188, 75, 174, 135, 
+    231, 101, 16, 79, 230, 97, 208, 237, 30, 15, 251, 194, 164, 60, 
+    38, 6, 168, 77, 26, 62, 129, 91, 58, 24, 195, 123, 137, 248, 141,
+    234, 102, 171, 250, 106, 205, 210, 175, 203, 126, 245, 137, 127,
+    13, 33, 55, 240, 49, 165, 14, 93, 112, 107, 165, 91, 94, 127, 
+    157, 81, 241, 9, 165, 165, 184, 127, 142, 209, 20, 208, 170, 105,
+    102, 58, 225, 74, 196, 73, 193, 162, 169, 99, 4, 4, 53, 214, 224
+    , 199, 183, 214, 207, 181, 191, 53, 64, 51, 20, 7, 245, 225, 249,
+    227, 233, 76, 12, 55, 154, 210, 175, 89, 155, 0, 75, 41, 167, 
+    138, 23, 10, 66, 103, 133, 113, 238, 154, 255, 121, 210, 114, 57,
+    101, 29, 4, 127, 62, 127, 138, 239, 213, 254, 128, 182, 193, 175
+    , 26, 187, 52, 55, 134, 144, 46, 86, 84, 198, 65, 219, 115, 57, 
+    255, 231, 6, 167, 10, 159, 85, 70, 203, 139, 88, 94, 176, 211, 
+    245, 214, 47, 153, 8, 204, 17, 97, 121, 166, 137, 155, 171, 212, 
+    141, 160, 20, 63, 197, 201, 0, 165, 126, 161, 68, 64, 153, 255, 
+    53, 254, 1, 99, 152, 177, 12, 132, 212, 30, 170, 14, 190, 66, 215
+    , 51, 155, 142, 65, 109, 177, 236, 104, 87, 150, 137, 72, 220, 67
+    , 117, 136, 9, 234, 194, 50, 5, 2, 28, 15, 156, 159, 72, 20, 167,
+    228, 6, 81, 207, 162, 200, 65, 32, 46, 10, 153, 191, 178, 5, 136
+    , 20, 211, 198, 150, 12, 248, 217, 76, 74, 168, 95, 85, 129, 84, 
+    25, 92, 124, 160, 49, 223, 152, 169, 10, 231, 213, 1, 184, 240, 
+    19, 177, 3, 219, 222, 238, 223, 45, 229, 79, 125, 37, 112, 54, 39
+    , 150, 70, 137, 174, 122, 34, 184, 176, 141, 30, 208, 66, 85, 63,
+    2, 251, 19, 249, 148, 29, 41, 245, 239, 106, 222, 229, 55, 209, 
+    112, 157, 19, 126, 237, 94, 71, 215, 197, 117, 132, 248, 19, 0, 
+    134, 199, 41, 176, 38, 114, 18, 30, 228, 122, 105, 193, 171, 128,
+    74, 212, 114, 21, 4, 109, 226, 11, 86, 109, 185, 0, 177, 1, 208,
+    64, 41, 149, 106, 49, 2, 47, 165, 223, 220, 163, 35, 26, 100, 88
+    , 63, 54, 115, 94, 60, 244, 170, 166, 237, 227, 30, 7, 254, 91, 
+    203, 132, 75, 135, 65, 79, 9, 60, 231, 38, 5, 183, 72, 92, 174, 
+    250, 192, 205, 96, 185, 65, 227, 217, 181, 228, 209, 218, 4, 184,
+    163, 191, 122, 149, 127, 242, 232, 44, 223, 156, 25, 105, 141, 
+    240, 88, 236, 203, 169, 254, 41, 0, 247, 200, 12, 177, 97, 126, 5
+    , 72, 227, 147, 98, 244, 221, 109, 204, 141, 57, 148, 9, 53, 66, 
+    175, 240, 168, 190, 84, 143, 120, 169, 234, 133, 37, 253, 164, 
+    202, 196, 235, 22, 12, 1, 35, 168, 255, 208, 244, 47, 99, 85, 98,
+    221, 185, 253, 74, 137, 129, 81, 199, 51, 21, 85, 144, 44, 153, 
+    64, 254, 165, 86, 184, 176, 236, 2, 172, 54, 42, 26, 117, 10, 36,
+    74, 158, 11, 57, 191, 221, 161, 151, 87, 186, 88, 135, 198, 168,
+    152, 145, 129, 255, 110, 22, 16, 241, 64, 107, 216, 111, 159, 
+    133, 69, 189, 166, 45, 151, 120, 64, 221, 44, 68, 64, 189, 49, 
+    187, 106, 83, 99, 250, 138, 218, 21, 172, 73, 89, 155, 230, 223, 
+    242, 114, 13, 130, 110, 130, 144, 244, 165, 99, 201, 179, 205, 48
+    , 250, 245, 181, 71, 95, 73, 78, 52, 42, 117, 189, 224, 242, 242,
+    164, 66, 129, 78, 246, 219, 50, 148, 171, 93, 25, 229, 102, 13, 
+    102, 116, 234, 227, 211, 246, 31, 247, 41, 56, 47, 90, 155, 216, 
+    207, 58, 67, 163, 211, 48, 64, 155, 108, 151, 181, 109, 51, 11, 
+    213, 91, 74, 102, 158, 23, 248, 57, 203, 5, 229, 13, 117, 18, 186
+    , 24, 89, 76, 143, 207, 173, 176, 158, 116, 85, 178, 148, 194, 
+    239, 206, 92, 23, 148, 16, 93, 80, 95, 25, 218, 69, 175, 227, 23,
+    225, 52, 231, 52, 192, 50, 243, 110, 233, 248, 125, 45, 67, 20, 
+    198, 14, 235, 216, 91, 111, 37, 153, 198, 198, 30, 4, 28, 248, 
+    253, 174, 69, 14, 10, 171, 255, 146, 14, 61, 40, 81, 39, 191, 124
+    , 130, 108, 183, 40, 111, 84, 253, 217, 91, 115, 250, 27, 91, 141
+    , 35, 92, 20, 145, 114, 82, 43, 177, 137, 227, 234, 164, 125, 152
+    , 23, 55, 155, 136, 200, 51, 81, 170, 181, 78, 191, 129, 70, 199,
+    123, 117, 188, 91, 153, 96, 145, 114, 48, 172, 227, 4, 71, 192, 
+    30, 52, 25, 98, 201, 169, 28, 148, 35, 136, 6, 128, 24, 189, 153,
+    219, 215, 21, 98, 209, 135, 118, 173, 16, 225, 79, 43, 158, 39, 
+    249, 142, 68, 233, 83, 225, 250, 40, 208, 131, 250, 191, 71, 110,
+    26, 51, 7, 44, 113, 189, 250, 155, 109, 74, 39, 227, 208, 226, 
+    221, 136, 42, 244, 160, 104, 59, 228, 130, 57, 192, 194, 147, 199
+    , 127, 161, 85, 102, 25, 176, 83, 222, 222, 139, 88, 217, 77, 89,
+    223, 113, 38, 162, 233, 92, 199, 224, 209, 108, 90, 133, 81, 211
+    , 103, 4, 50, 111, 241, 133, 97, 147, 194, 177, 160, 207, 200, 13
+    , 13, 102, 57, 198, 61, 247, 117, 26, 89, 160, 94, 246, 232, 193,
+    162, 69, 128, 250, 75, 125, 163, 27, 17, 169, 125, 79, 142, 15, 
+    20, 181, 58, 166, 191, 225, 30, 211, 237, 232, 24, 150, 169, 76, 
+    135, 67, 49, 44, 46, 183, 55, 201, 38, 151, 137, 26, 16, 243, 251
+    , 54, 194, 114, 18, 122, 85, 103, 28, 204, 240, 29, 217, 42, 95, 
+    31, 95, 83, 233, 206, 13, 91, 8, 130, 87, 135, 47, 168, 42, 27, 
+    78, 187, 25, 213, 253, 129, 132, 253, 189, 199, 177, 83, 124, 184
+    , 10, 130, 117, 98, 102, 242, 91, 196, 3, 17, 96, 35, 92, 57, 27,
+    62, 177, 176, 188, 135, 202, 195, 145, 206, 196, 57, 27, 191, 27
+    , 120, 1, 166, 216, 219, 3, 218, 238, 212, 197, 247, 6, 236, 196,
+    34, 232, 157, 207, 241, 15, 175, 126, 77, 157, 43, 223, 0, 115, 
+    239, 142, 249, 10, 30, 0, 59, 134, 79, 41, 116, 195, 36, 41, 223,
+    72, 245, 113, 136, 12, 51, 3, 164, 46, 59, 177, 101, 184, 161, 
+    133, 161, 138, 197, 52, 146, 106, 161, 124, 197, 83, 190, 79, 35,
+    139, 233, 72, 178, 247, 181, 102, 12, 176, 199, 238, 229, 27, 
+    158, 169, 146, 143, 98, 57, 61, 83, 176, 127, 101, 197, 29, 15, 
+    86, 131, 13, 182, 103, 87, 245, 41, 148, 116, 188, 172, 5, 94, 
+    133, 45, 33, 125, 194, 44, 211, 157, 172, 44, 103, 198, 77, 93, 
+    169, 31, 200, 61, 101, 229, 228, 121, 129, 18, 238, 192, 222, 61,
+    7, 247, 88, 70, 31, 206, 141, 252, 61, 252, 209, 40, 233, 151, 
+    183, 84, 140, 249, 67, 55, 207, 164, 168, 102, 165, 196, 132, 167
+    , 40, 58, 119, 254, 126, 234, 57, 163, 189, 155, 9, 247, 71, 132,
+    221, 51, 107, 230, 95, 57, 189, 36, 28, 102, 161, 39, 230, 168, 
+    72, 86, 99, 3, 11, 125, 49, 171, 199, 144, 231, 222, 170, 23, 164
+    , 233, 33, 227, 212, 150, 227, 162, 192, 120, 4, 167, 189, 123, 
+    154, 229, 35, 142, 121, 247, 222, 123, 19, 20, 135, 13, 138, 135,
+    3, 97, 43, 59, 133, 33, 9, 111, 236, 246, 41, 181, 162, 140, 254
+    , 95, 177, 180, 8, 14, 124, 90, 171, 114, 74, 52, 149, 203, 74, 
+    254, 189, 219, 0, 239, 188, 185, 183, 136, 187, 78, 142, 54, 218,
+    250, 217, 165, 101, 75, 67, 94, 204, 66, 12, 40, 159, 90, 158, 
+    50, 45, 144, 176, 127, 43, 62, 126, 102, 66, 99, 31, 142, 61, 33,
+    202, 239, 243, 136, 173, 66, 14, 106, 189, 13, 231, 105, 208, 90
+    , 192, 88, 191, 190, 8, 28, 207, 137, 100, 100, 253, 205, 187, 33
+    , 201, 175, 14, 76, 27, 141, 80, 229, 142, 85, 143, 9, 224, 221, 
+    69, 64, 2, 217, 80, 234, 23, 226, 250, 152, 38, 177, 235, 110, 
+    121, 77, 47, 189, 97, 244, 37, 134, 124, 144, 81, 226, 219, 137, 
+    254, 164, 176, 78, 70, 118, 221, 197, 62, 137, 182, 83, 253, 91, 
+    181, 108, 244, 119, 133, 13, 154, 235, 123, 110, 127, 184, 123, 
+    150, 59, 105, 4, 187, 223, 16, 154, 244, 241, 253, 24, 35, 160, 
+    164, 143, 87, 89, 97, 79, 145, 16, 48, 248, 198, 140, 48
+};
+
 TEST_F(RadioTapTest, DefaultConstructor) {
     RadioTap radio;
     EXPECT_TRUE((radio.flags() & RadioTap::FCS) != 0);
@@ -446,6 +561,15 @@ TEST_F(RadioTapTest, RadioTapParsing) {
     EXPECT_FALSE(parser.advance_field());
 }
 
+TEST_F(RadioTapTest, RadioTapParsingBroken1) {
+    vector<uint8_t> buffer(expected_packet6+4, expected_packet6 + sizeof(expected_packet6)-4);
+    RadioTapParser parser(buffer);
+    while (parser.has_fields()) {
+        parser.advance_field();
+    }
+    EXPECT_FALSE(parser.has_fields());
+}
+
 TEST_F(RadioTapTest, RadioTapParsingMultipleNamespaces) {
     vector<uint8_t> buffer(expected_packet4+4, expected_packet4 + sizeof(expected_packet4)-4);
     RadioTapParser parser(buffer);

From 3e6e25d0aa68e07837b85a357c192a2890f35103 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sat, 3 Jun 2017 09:17:29 -0700
Subject: [PATCH 71/73] Add support for XChannel field on RadioTap

---
 include/tins/radiotap.h     | 26 ++++++++++++++++++++++----
 src/radiotap.cpp            | 37 ++++++++++++++++---------------------
 tests/src/radiotap_test.cpp | 20 ++++++++++++++++++--
 3 files changed, 56 insertions(+), 27 deletions(-)

diff --git a/include/tins/radiotap.h b/include/tins/radiotap.h
index 520456b..17dac80 100644
--- a/include/tins/radiotap.h
+++ b/include/tins/radiotap.h
@@ -84,7 +84,7 @@ public:
      */
     enum PresentFlags {
         TSFT                = 1 << 0,
-        TSTF                = 1 << 0, // Deprecated (typo in the name...)
+        TSTF                = 1 << 0, ///< Deprecated (typo), use TSFT
         FLAGS               = 1 << 1,
         RATE                = 1 << 2,
         CHANNEL             = 1 << 3,
@@ -101,6 +101,7 @@ public:
         RX_FLAGS            = 1 << 14,
         TX_FLAGS            = 1 << 15,
         DATA_RETRIES        = 1 << 17,
+        XCHANNEL            = 1 << 18,
         CHANNEL_PLUS        = 1 << 18,
         MCS                 = 1 << 19
     };
@@ -128,6 +129,17 @@ public:
         uint8_t flags;
         uint8_t mcs;
     } TINS_END_PACK;
+
+    /**
+     * \brief The type used to represent the XChannel field
+     */
+    TINS_BEGIN_PACK
+    struct xchannel_type {
+        uint32_t flags;
+        uint16_t frequency;
+        uint8_t channel;
+        uint8_t max_power;
+    } TINS_END_PACK;
     
     /**
      * The type used to store RadioTap options
@@ -250,6 +262,12 @@ public:
      */
     void tx_flags(uint16_t new_tx_flag);
 
+    /**
+     * \brief Setter for the xchannel field.
+     * \param new_xchannel The xchannel field
+     */
+    void xchannel(xchannel_type new_xchannel);
+
     /**
      * \brief Setter for the data retries field.
      * \param new_rx_flag The data retries.
@@ -343,10 +361,10 @@ public:
     uint8_t db_signal() const;
     
     /**
-     * \brief Getter for the channel+ field.
-     * \return The channel+ field.
+     * \brief Getter for the XChannel field.
+     * \return The XChannel field.
      */
-    uint32_t channel_plus() const;
+    xchannel_type xchannel() const;
     
     /**
      * \brief Getter for the data retries field
diff --git a/src/radiotap.cpp b/src/radiotap.cpp
index 8d60266..777e99f 100644
--- a/src/radiotap.cpp
+++ b/src/radiotap.cpp
@@ -180,6 +180,14 @@ void RadioTap::tx_flags(uint16_t new_tx_flags) {
     add_integral_option(*this, TX_FLAGS, new_tx_flags);
 }
 
+void RadioTap::xchannel(xchannel_type new_xchannel) {
+    uint8_t buffer[sizeof(new_xchannel)];
+    new_xchannel.flags = Endian::host_to_le(new_xchannel.flags);
+    new_xchannel.frequency = Endian::host_to_le(new_xchannel.frequency);
+    memcpy(buffer, &new_xchannel, sizeof(new_xchannel));
+    add_option(RadioTap::option(XCHANNEL, sizeof(buffer), buffer));
+}
+
 void RadioTap::mcs(const mcs_type& new_mcs) {
     uint8_t buffer[sizeof(new_mcs)];
     memcpy(buffer, &new_mcs, sizeof(new_mcs));
@@ -279,7 +287,7 @@ uint8_t RadioTap::antenna() const {
 RadioTap::mcs_type RadioTap::mcs() const {
     const option opt = do_find_option(MCS);
     mcs_type output;
-    memcpy(&output, opt.data_ptr(), sizeof(mcs_type));
+    memcpy(&output, opt.data_ptr(), sizeof(output));
     return output;
 }
 
@@ -287,13 +295,13 @@ uint8_t RadioTap::db_signal() const {
     return do_find_option(DB_SIGNAL).to<uint8_t>();
 }
 
-uint32_t RadioTap::channel_plus() const {
-    /*if (!header_.flags.channel_plus) {
-        throw field_not_present();
-    }
-    return Endian::le_to_host<uint32_t>(channel_type_);*/
-    // TODO: wat
-    return 0xdadedade;
+RadioTap::xchannel_type RadioTap::xchannel() const {
+    const option opt = do_find_option(XCHANNEL);
+    xchannel_type output;
+    memcpy(&output, opt.data_ptr(), sizeof(output));
+    output.flags = Endian::le_to_host(output.flags);
+    output.frequency = Endian::le_to_host(output.frequency);
+    return output;
 }
 
 uint16_t RadioTap::rx_flags() const {
@@ -355,19 +363,6 @@ void RadioTap::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     header_.it_len = Endian::host_to_le<uint16_t>(header_size());
     stream.write(header_);
     stream.write(options_payload_.begin(), options_payload_.end());
-    /*if (header_.flags.channel_plus) {
-        const uint32_t padding = ((stream.pointer() - buffer_start) % 4);
-        if (padding != 0) {
-            stream.fill(4 - padding, 0);
-        }
-        uint32_t dummy = channel_type_;
-        // nasty Big Endian fix
-        dummy = Endian::le_to_host<uint32_t>(Endian::host_to_le<uint16_t>(dummy));
-        stream.write(dummy);
-        stream.write(channel_freq_);
-        stream.write(channel_);
-        stream.write(max_power_);
-    }*/
 
     // If we have a trailer size, then we have the FCS flag on
     if (trailer_size() > 0 && inner_pdu()) {
diff --git a/tests/src/radiotap_test.cpp b/tests/src/radiotap_test.cpp
index c5c0893..f4dbc8f 100644
--- a/tests/src/radiotap_test.cpp
+++ b/tests/src/radiotap_test.cpp
@@ -346,7 +346,7 @@ TEST_F(RadioTapTest, ConstructorFromBuffer) {
     EXPECT_TRUE((radio.present() & RadioTap::RATE) != 0);
     EXPECT_TRUE((radio.present() & RadioTap::DBM_SIGNAL) != 0);
     EXPECT_TRUE((radio.present() & RadioTap::ANTENNA) != 0);
-    EXPECT_TRUE((radio.present() & RadioTap::CHANNEL_PLUS) != 0);
+    EXPECT_TRUE((radio.present() & RadioTap::XCHANNEL) != 0);
     
     EXPECT_TRUE((radio.flags() & RadioTap::FCS) != 0);
     EXPECT_THROW(radio.channel_type(), field_not_present);
@@ -507,6 +507,22 @@ TEST_F(RadioTapTest, TSFT) {
     EXPECT_EQ(radio.tsft(), 0x7afb9a8dU);
 }
 
+TEST_F(RadioTapTest, XChannel) {
+    RadioTap radio;
+    RadioTap::xchannel_type xchannel;
+    xchannel.flags = 0xabcd1234;
+    xchannel.frequency = 0xda21;
+    xchannel.max_power = 0x19;
+    xchannel.channel = 0x99;
+    radio.xchannel(xchannel);
+
+    RadioTap::xchannel_type found_xchannel = radio.xchannel();
+    EXPECT_EQ(xchannel.flags, found_xchannel.flags);
+    EXPECT_EQ(xchannel.frequency, found_xchannel.frequency);
+    EXPECT_EQ(xchannel.max_power, found_xchannel.max_power);
+    EXPECT_EQ(xchannel.channel, found_xchannel.channel);
+}
+
 TEST_F(RadioTapTest, SerializationWorksFine) {
     const uint8_t expected[] = {
         0, 0, 26, 0, 43, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 108,
@@ -555,7 +571,7 @@ TEST_F(RadioTapTest, RadioTapParsing) {
     EXPECT_EQ(2, parser.current_option().to<uint8_t>());
     EXPECT_TRUE(parser.advance_field());
     
-    EXPECT_EQ(RadioTap::CHANNEL_PLUS,parser.current_field());
+    EXPECT_EQ(RadioTap::XCHANNEL,parser.current_field());
     EXPECT_EQ(0x1124143c00000140ULL, parser.current_option().to<uint64_t>());
 
     EXPECT_FALSE(parser.advance_field());

From cfb9b646cc89b0a1300bc863610264f7237bf6b4 Mon Sep 17 00:00:00 2001
From: Jeff Puckett <jeff@jeffpuckett.com>
Date: Sat, 27 May 2017 14:33:40 +0000
Subject: [PATCH 72/73] doc fix typo

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index de4d017..745d145 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ _build/lib_ directory.
 
 ### C++11 support
 
-libtins is noticeable faster if you enable _C++11_ support. Therefore, 
+libtins is noticeably faster if you enable _C++11_ support. Therefore, 
 if your compiler supports this standard, then you should enable it. 
 In order to do so, use the _LIBTINS_ENABLE_CXX11_ switch:
 
@@ -144,4 +144,4 @@ http://libtins.github.io/examples/
 ## Contributing ##
 
 If you want to report a bug or make a pull request, please have a look at 
-the [contributing](CONTRIBUTING.md) file before doing so.
\ No newline at end of file
+the [contributing](CONTRIBUTING.md) file before doing so.

From 87c0e3a337e17c5bfcfee44419623c49a4995505 Mon Sep 17 00:00:00 2001
From: Andrea Barberio <insomniac@slackware.it>
Date: Thu, 20 Jul 2017 23:40:14 +0100
Subject: [PATCH 73/73] Add set_pcap_sniffing_method to specify either
 pcap_loop or pcap_dispatch

---
 include/tins/sniffer.h | 43 +++++++++++++++++++++++++++++++++++++++++-
 src/sniffer.cpp        | 20 +++++++++++++++++---
 2 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/include/tins/sniffer.h b/include/tins/sniffer.h
index 942cd71..cf9cae6 100644
--- a/include/tins/sniffer.h
+++ b/include/tins/sniffer.h
@@ -45,6 +45,7 @@
 
 #include <pcap.h>
 
+
 namespace Tins {
 class SnifferIterator;
 class SnifferConfiguration;
@@ -72,7 +73,8 @@ public:
          * This constructor is available only in C++11.
          */
         BaseSniffer(BaseSniffer &&rhs) TINS_NOEXCEPT
-        : handle_(0), mask_(), extract_raw_(false) {
+        : handle_(0), mask_(), extract_raw_(false),
+          pcap_sniffing_method_(pcap_loop) {
             *this = std::move(rhs);
         }
 
@@ -85,6 +87,7 @@ public:
             swap(handle_, rhs.handle_);
             swap(mask_, rhs.mask_);
             swap(extract_raw_, rhs.extract_raw_);
+            swap(pcap_sniffing_method_, rhs.pcap_sniffing_method_);
             return* this;
         }
     #endif
@@ -237,6 +240,35 @@ public:
      */
     void set_extract_raw_pdus(bool value);
 
+    /**
+     * \brief function pointer for the sniffing method
+     *
+     * By default, libtins uses `pcap_loop` to sniff packets. With
+     * `set_pcap_sniffing_method` it is possible to specify an alternative
+     * sniffing method, for example `pcap_dispatch`, or a custom function.
+     * This function pointer has the same interface as `pcap_loop` and
+     * `pcap_dispatch`.
+     *
+     * \sa set_pcap_sniffing_method
+     */
+    typedef int(*PcapSniffingMethod)(pcap_t*, int, pcap_handler, u_char*);
+
+    /**
+     * \brief set sniffing method to either pcap_loop or pcap_dispatch.
+     *
+     * By default, packets are sniffed with `pcap_loop`, which only returns if
+     * a packet is received, thus ignoring timeout expiration, if any is set.
+     * With this method it is possible to pass an alternative sniffer function,
+     * e.g. `pcap_dispatch`, that honors timeouts, or a custom function with
+     * the same signature.
+     *
+     * See the relevant manual pages for pcap_loop and pcap_dispatch for more
+     * information on their behavior
+     *
+     * \sa PcapSniffingMethod
+     */
+    void set_pcap_sniffing_method(PcapSniffingMethod method);
+
     /**
      * \brief Retrieves this sniffer's link type.
      *
@@ -282,6 +314,7 @@ private:
     pcap_t* handle_;
     bpf_u_int32 mask_;
     bool extract_raw_;
+    PcapSniffingMethod pcap_sniffing_method_;
 };
 
 /**
@@ -567,6 +600,12 @@ public:
      */
     void set_filter(const std::string& filter);
 
+    /**
+     * Sets the pcap sniffing method to use.
+     * \param method The sniffing method to be used.
+     */
+    void set_pcap_sniffing_method(BaseSniffer::PcapSniffingMethod method);
+
     /**
      * Sets the rfmon option.
      * \param enabled The rfmon option value.
@@ -608,6 +647,7 @@ protected:
         IMMEDIATE_MODE = 16,
         DIRECTION = 32,
         TIMESTAMP_PRECISION = 64,
+        PCAP_SNIFFING_METHOD = 128,
     };
 
     void configure_sniffer_pre_activation(Sniffer& sniffer) const;
@@ -619,6 +659,7 @@ protected:
     unsigned snap_len_;
     unsigned buffer_size_;
     std::string filter_;
+    BaseSniffer::PcapSniffingMethod pcap_sniffing_method_;
     unsigned timeout_;
     bool promisc_;
     bool rfmon_;
diff --git a/src/sniffer.cpp b/src/sniffer.cpp
index 87a1141..dc97feb 100644
--- a/src/sniffer.cpp
+++ b/src/sniffer.cpp
@@ -212,7 +212,7 @@ PtrPacket BaseSniffer::next_packet() {
     // keep calling pcap_loop until a well-formed packet is found.
     while (data.pdu == 0 && data.packet_processed) {
         data.packet_processed = false;
-        if (pcap_loop(handle_, 1, handler, (u_char*)&data) < 0) {
+        if (pcap_sniffing_method_(handle_, 1, handler, (u_char*)&data) < 0) {
             return PtrPacket(0, Timestamp());
         }
     }
@@ -223,6 +223,13 @@ void BaseSniffer::set_extract_raw_pdus(bool value) {
     extract_raw_ = value;
 }
 
+void BaseSniffer::set_pcap_sniffing_method(PcapSniffingMethod method) {
+    if (method == nullptr) {
+        throw std::runtime_error("Sniffing method cannot be null");
+    }
+    pcap_sniffing_method_ = method;
+}
+
 void BaseSniffer::stop_sniff() {
     pcap_breakloop(handle_);
 }
@@ -419,8 +426,9 @@ const unsigned SnifferConfiguration::DEFAULT_SNAP_LEN = 65535;
 const unsigned SnifferConfiguration::DEFAULT_TIMEOUT = 1000;
 
 SnifferConfiguration::SnifferConfiguration()
-: flags_(0), snap_len_(DEFAULT_SNAP_LEN), buffer_size_(0), timeout_(DEFAULT_TIMEOUT),
-  promisc_(false), rfmon_(false), immediate_mode_(false), direction_(PCAP_D_INOUT),
+: flags_(0), snap_len_(DEFAULT_SNAP_LEN), buffer_size_(0),
+  pcap_sniffing_method_(pcap_loop), timeout_(DEFAULT_TIMEOUT), promisc_(false),
+  rfmon_(false), immediate_mode_(false), direction_(PCAP_D_INOUT),
   timestamp_precision_(0) {
 
 }
@@ -428,6 +436,7 @@ SnifferConfiguration::SnifferConfiguration()
 void SnifferConfiguration::configure_sniffer_pre_activation(Sniffer& sniffer) const {
     sniffer.set_snap_len(snap_len_);
     sniffer.set_timeout(timeout_);
+    sniffer.set_pcap_sniffing_method(pcap_sniffing_method_);
     if ((flags_ & BUFFER_SIZE) != 0) {
         sniffer.set_buffer_size(buffer_size_);
     }
@@ -488,6 +497,11 @@ void SnifferConfiguration::set_filter(const string& filter) {
     filter_ = filter;
 }
 
+void SnifferConfiguration::set_pcap_sniffing_method(BaseSniffer::PcapSniffingMethod method) {
+    flags_ |= PCAP_SNIFFING_METHOD;
+    pcap_sniffing_method_ = method;
+}
+
 void SnifferConfiguration::set_rfmon(bool enabled) {
     flags_ |= RFMON;
     rfmon_ = enabled;