Added an overload of add_option that takes an rvalue-ref in IP, TCP, DHCP, ICMPv6 and Dot11.

include/dhcp.h

@@ -35,6 +35,7 @@
 #include <string>
 #include "bootp.h"
 #include "pdu_option.h"
+#include "cxxstd.h"
 
 namespace Tins {
     /** 
@@ -172,6 +173,17 @@ namespace Tins {
          */
         void add_option(const dhcp_option &option);
         
+        #if TINS_IS_CXX11
+            /** 
+             * \brief Adds a new option to this DHCP PDU.
+             * 
+             * The option is move-constructed.
+             * 
+             * \param option The option to be added.
+             */
+            void add_option(dhcp_option &&option);
+        #endif 
+    
         /**
          * \brief Searchs for an option that matchs the given flag.
          * \param opt_flag The flag to be searched.
@@ -409,6 +421,7 @@ namespace Tins {
                 throw option_not_found();
         }
         
+        void internal_add_option(const dhcp_option &option);
         std::list<ipaddress_type> generic_search(Options opt, type2type<std::list<ipaddress_type> >) const;
         std::string generic_search(Options opt, type2type<std::string>) const;
         ipaddress_type generic_search(Options opt, type2type<ipaddress_type>) const;

include/dot11.h

@@ -42,6 +42,7 @@
 #include "small_uint.h"
 #include "pdu_option.h"
 #include "network_interface.h"
+#include "cxxstd.h"
 
 namespace Tins {
     class RSNInformation;
@@ -396,6 +397,17 @@ namespace Tins {
          */
         void add_tagged_option(const dot11_option &opt);
         
+        #if TINS_IS_CXX11
+            /**
+             * \brief Adds a new option to this Dot11 PDU.
+             * 
+             * The option is move-constructed
+             * 
+             * \param opt The option to be added.
+             */
+            void add_tagged_option(dot11_option &&opt);
+        #endif
+
         /**
          * \brief Looks up a tagged option in the option list.
          * 
@@ -484,10 +496,10 @@ namespace Tins {
             uint8_t addr1[address_type::address_size];
 
         } TINS_END_PACK;
-        private:
-
+    private:
         Dot11(const ieee80211_header *header_ptr);
         
+        void internal_add_option(const dot11_option &opt);
         void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
 
 

include/icmpv6.h

@@ -40,6 +40,7 @@
 #include "small_uint.h"
 #include "hw_address.h"
 #include "small_uint.h"
+#include "cxxstd.h"
 
 namespace Tins {
 /**
@@ -738,6 +739,17 @@ public:
      */
     void add_option(const icmpv6_option &option);
     
+    #if TINS_IS_CXX11
+        /**
+         * \brief Adds an ICMPv6 option.
+         * 
+         * The option is move-constructed.
+         * 
+         * \param option The option to be added.
+         */
+        void add_option(icmpv6_option &&option);
+    #endif
+
     /**
      * \brief Returns the header size.
      *
@@ -1181,6 +1193,7 @@ private:
         };
     } TINS_END_PACK;
     
+    void internal_add_option(const icmpv6_option &option);
     void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
     bool has_options() const;
     uint8_t *write_option(const icmpv6_option &opt, uint8_t *buffer);

include/ip.h

@@ -37,6 +37,7 @@
 #include "ip_address.h"
 #include "pdu_option.h"
 #include "macros.h"
+#include "cxxstd.h"
 
 namespace Tins {
 
@@ -418,6 +419,17 @@ namespace Tins {
          */
         void add_option(const ip_option &option);
         
+        #if TINS_IS_CXX11
+            /**
+             * \brief Adds an IP option.
+             * 
+             * The option is move-constructed.
+             * 
+             * \param option The option to be added.
+             */
+            void add_option(ip_option &&option);
+        #endif
+
         /**
          * \brief Searchs for an option that matchs the given flag.
          * 
@@ -620,6 +632,7 @@ namespace Tins {
             /*The options start here. */
         } TINS_END_PACK;
 
+        void internal_add_option(const ip_option &option);
         void init_ip_fields();
         void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
         uint8_t* write_option(const ip_option &opt, uint8_t* buffer);

include/macros.h

@@ -39,10 +39,12 @@
     #define TINS_BEGIN_PACK __pragma( pack(push, 1) )
     #define TINS_END_PACK __pragma( pack(pop) )
     #define TINS_PACKED(DECLARATION) __pragma( pack(push, 1) ) DECLARATION __pragma( pack(pop) )
+    #define TINS_DEPRECATED(func) __declspec(deprecated) func
 #else
     #define TINS_BEGIN_PACK 
     #define TINS_END_PACK __attribute__((packed))
     #define TINS_PACKED(DECLARATION) DECLARATION __attribute__((packed))
+    #define TINS_DEPRECATED(func) func __attribute__ ((deprecated))
 #endif
 
 #endif

include/tcp.h

@@ -41,6 +41,7 @@
 #include "endianness.h"
 #include "small_uint.h"
 #include "pdu_option.h"
+#include "cxxstd.h"
 
 namespace Tins {
     /**
@@ -355,11 +356,32 @@ namespace Tins {
         /**
          * \brief Adds a TCP option.
          *
+         * \deprecated This function is deprecated. The overloads taking
+         * tcp_option should be used.
+         * 
          * \param option The option type flag to be set.
          * \param length The length of this option(optional).
          * \param data Pointer to this option's data(optional).
          */
-        void add_option(Option option, uint8_t length = 0, const uint8_t *data = 0);
+        TINS_DEPRECATED(void add_option(Option option, uint8_t length = 0, const uint8_t *data = 0));
+        
+        /**
+         * \brief Adds a TCP option.
+         *
+         * \param option The option to be added.
+         */
+        void add_option(const tcp_option &option);
+        
+        #if TINS_IS_CXX11
+            /**
+             * \brief Adds a TCP option.
+             *
+             * This move-constructs the option.
+             * 
+             * \param option The option to be added.
+             */
+            void add_option(tcp_option &&option);
+        #endif
 
         /**
          * \brief Returns the header size.
@@ -438,6 +460,7 @@ namespace Tins {
             throw option_not_found();
         }
         
+        void internal_add_option(const tcp_option &option);
         void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
         
         uint8_t *write_option(const tcp_option &opt, uint8_t *buffer);

src/dhcp.cpp

@@ -75,7 +75,18 @@ DHCP::DHCP(const uint8_t *buffer, uint32_t total_sz)
 }
 
 void DHCP::add_option(const dhcp_option &option) {
+    internal_add_option(option);
     _options.push_back(option);
+}
+
+#if TINS_IS_CXX11
+void DHCP::add_option(dhcp_option &&option) {
+    internal_add_option(option);
+    _options.push_back(std::move(option));
+}
+#endif
+
+void DHCP::internal_add_option(const dhcp_option &option) {
     _size += option.data_size() + (sizeof(uint8_t) << 1);
 }
 

src/dot11.cpp

@@ -103,11 +103,22 @@ void Dot11::add_tagged_option(TaggedOption opt, uint8_t len, const uint8_t *val)
     _options_size += opt_size;
 }
 
-void Dot11::add_tagged_option(const dot11_option &opt) {
-    _options.push_back(opt);
+#if TINS_IS_CXX11
+void Dot11::add_tagged_option(dot11_option &&opt) {
+    internal_add_option(opt);
+    _options.push_back(std::move(opt));
+}
+#endif
+
+void Dot11::internal_add_option(const dot11_option &opt) {
     _options_size += opt.data_size() + sizeof(uint8_t) * 2;
 }
 
+void Dot11::add_tagged_option(const dot11_option &opt) {
+    internal_add_option(opt);
+    _options.push_back(opt);
+}
+
 const Dot11::dot11_option *Dot11::search_option(TaggedOption opt) const {
     for(std::list<dot11_option>::const_iterator it = _options.begin(); it != _options.end(); ++it)
         if(it->option() == (uint8_t)opt)

src/icmpv6.cpp

@@ -227,7 +227,18 @@ bool ICMPv6::has_options() const {
 }
 
 void ICMPv6::add_option(const icmpv6_option &option) {
+    internal_add_option(option);
     _options.push_back(option);
+}
+
+#if TINS_IS_CXX11
+void ICMPv6::add_option(icmpv6_option &&option) {
+    internal_add_option(option);
+    _options.push_back(std::move(option));
+}
+#endif
+
+void ICMPv6::internal_add_option(const icmpv6_option &option) {
     _options_size += option.data_size() + sizeof(uint8_t) * 2;
 }
 

src/ip.cpp

@@ -309,8 +309,19 @@ uint16_t IP::stream_identifier() const {
     return Endian::be_to_host(*(const uint16_t*)option->data_ptr());
 }
 
+#if TINS_IS_CXX11
+void IP::add_option(ip_option &&option) {
+    internal_add_option(option);
+    _ip_options.push_back(std::move(option));
+}
+#endif
+
 void IP::add_option(const ip_option &option) {
+    internal_add_option(option);
     _ip_options.push_back(option);
+}
+
+void IP::internal_add_option(const ip_option &option) {
     _options_size += 1 + option.data_size();
     uint8_t padding = _options_size % 4;
     _padded_options_size = padding ? (_options_size - padding + 4) : _options_size;

src/tcp.cpp

@@ -80,13 +80,13 @@ TCP::TCP(const uint8_t *buffer, uint32_t total_sz)
                 if(header_end - index < args[1])
                     throw std::runtime_error("Not enough size for a TCP header in the buffer.");                        
                 if(args[1])
-                    add_option((Option)args[0], args[1], buffer + index);
+                    add_option(tcp_option((Option)args[0], buffer + index, buffer + index + args[1]));
                 else
-                    add_option((Option)args[0], args[1], 0);
+                    add_option(tcp_option((Option)args[0], args[1], 0));
                 index += args[1];
             }
             else
-                add_option((Option)args[0], 0, 0);
+                add_option(tcp_option((Option)args[0], 0));
         }
         buffer += index;
         total_sz -= index;
@@ -129,7 +129,7 @@ void TCP::data_offset(small_uint<4> new_doff) {
 
 void TCP::mss(uint16_t value) {
     value = Endian::host_to_be(value);
-    add_option(MSS, 2, (uint8_t*)&value);
+    add_option(tcp_option(MSS, 2, (uint8_t*)&value));
 }
 
 uint16_t TCP::mss() const {
@@ -137,7 +137,7 @@ uint16_t TCP::mss() const {
 }
 
 void TCP::winscale(uint8_t value) {
-    add_option(WSCALE, 1, &value);
+    add_option(tcp_option(WSCALE, 1, &value));
 }
 
 uint8_t TCP::winscale() const {
@@ -145,7 +145,7 @@ uint8_t TCP::winscale() const {
 }
 
 void TCP::sack_permitted() {
-    add_option(SACK_OK, 0, 0);
+    add_option(tcp_option(SACK_OK, 0));
 }
 
 bool TCP::has_sack_permitted() const {
@@ -160,7 +160,13 @@ void TCP::sack(const sack_type &edges) {
         for(sack_type::const_iterator it = edges.begin(); it != edges.end(); ++it)
             *(ptr++) = Endian::host_to_be(*it);
     }
-    add_option(SACK, (uint8_t)(sizeof(uint32_t) * edges.size()), (const uint8_t*)value);
+    add_option(
+        tcp_option(
+            SACK, 
+            (uint8_t)(sizeof(uint32_t) * edges.size()), 
+            (const uint8_t*)value
+        )
+    );
     delete[] value;
 }
 
@@ -180,7 +186,7 @@ TCP::sack_type TCP::sack() const {
 void TCP::timestamp(uint32_t value, uint32_t reply) {
     uint64_t buffer = (uint64_t(value) << 32) | reply;
     buffer = Endian::host_to_be(buffer);
-    add_option(TSOPT, 8, (uint8_t*)&buffer);
+    add_option(tcp_option(TSOPT, 8, (uint8_t*)&buffer));
 }
 
 std::pair<uint32_t, uint32_t> TCP::timestamp() const {
@@ -194,7 +200,7 @@ std::pair<uint32_t, uint32_t> TCP::timestamp() const {
 
 void TCP::altchecksum(AltChecksums value) {
     uint8_t int_value = value;
-    add_option(ALTCHK, 1, &int_value);
+    add_option(tcp_option(ALTCHK, 1, &int_value));
 }
 
 TCP::AltChecksums TCP::altchecksum() const {
@@ -263,20 +269,12 @@ void TCP::set_flag(Flags tcp_flag, small_uint<1> value) {
 }
 
 void TCP::add_option(Option option, uint8_t length, const uint8_t *data) {
-    uint8_t padding;
-    //_options.push_back(tcp_option(option, length, data));
-    _options.push_back(tcp_option(option, data, data + length));
+    add_option(tcp_option(option, data, data + length));
+}
 
-    _options_size += sizeof(uint8_t);
-    // SACK_OK contains length but not data....
-    if(length || option == SACK_OK)
-        _options_size += sizeof(uint8_t);
-        
-    if(data)
-        _options_size += length;
-    
-    padding = _options_size & 3;
-    _total_options_size = (padding) ? _options_size - padding + 4 : _options_size;
+void TCP::add_option(const tcp_option &option) {
+    _options.push_back(option);
+    internal_add_option(option);
 }
 
 uint32_t TCP::header_size() const {
@@ -355,4 +353,26 @@ uint8_t *TCP::write_option(const tcp_option &opt, uint8_t *buffer) {
     }
 }
 
+#if TINS_IS_CXX11
+void TCP::add_option(tcp_option &&option) {
+    internal_add_option(option);
+    _options.push_back(std::move(option));
 }
+#endif
+
+void TCP::internal_add_option(const tcp_option &option) {
+    uint8_t padding;
+    
+    _options_size += sizeof(uint8_t);
+    // SACK_OK contains length but not data....
+    if(option.data_size() || option.option() == SACK_OK)
+        _options_size += sizeof(uint8_t);
+        
+    _options_size += option.data_size();
+    
+    padding = _options_size & 3;
+    _total_options_size = (padding) ? _options_size - padding + 4 : _options_size;
+}
+
+}
+

tests/depends.d

@@ -1,7 +1,7 @@
 ../src/arp.o: ../src/arp.cpp ../include/arp.h ../include/macros.h \
  ../include/pdu.h ../include/endianness.h ../include/hw_address.h \
  ../include/ip_address.h ../include/ip.h ../include/small_uint.h \
- ../include/pdu_option.h ../include/ethernetII.h \
+ ../include/pdu_option.h ../include/cxxstd.h ../include/ethernetII.h \
  ../include/network_interface.h ../include/rawpdu.h \
  ../include/constants.h ../include/network_interface.h
 
@@ -23,6 +23,8 @@
 
 ../include/pdu_option.h:
 
+../include/cxxstd.h:
+
 ../include/ethernetII.h:
 
 ../include/network_interface.h:
@@ -51,8 +53,9 @@
  ../include/macros.h ../include/pdu.h ../include/endianness.h \
  ../include/hw_address.h ../include/small_uint.h ../include/pdu_option.h \
  ../include/network_interface.h ../include/ip_address.h \
- ../include/utils.h ../include/ipv6_address.h ../include/internals.h \
- ../include/constants.h ../include/snap.h ../include/rawpdu.h
+ ../include/cxxstd.h ../include/utils.h ../include/ipv6_address.h \
+ ../include/internals.h ../include/constants.h ../include/snap.h \
+ ../include/rawpdu.h
 
 ../include/crypto.h:
 
@@ -74,6 +77,8 @@
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 ../include/utils.h:
 
 ../include/ipv6_address.h:
@@ -88,8 +93,8 @@
 ../src/dhcp.o: ../src/dhcp.cpp ../include/endianness.h \
  ../include/macros.h ../include/dhcp.h ../include/bootp.h \
  ../include/pdu.h ../include/endianness.h ../include/ip_address.h \
- ../include/hw_address.h ../include/pdu_option.h ../include/ethernetII.h \
- ../include/network_interface.h
+ ../include/hw_address.h ../include/pdu_option.h ../include/cxxstd.h \
+ ../include/ethernetII.h ../include/network_interface.h
 
 ../include/endianness.h:
 
@@ -109,6 +114,8 @@
 
 ../include/pdu_option.h:
 
+../include/cxxstd.h:
+
 ../include/ethernetII.h:
 
 ../include/network_interface.h:
@@ -162,7 +169,7 @@
  ../include/macros.h ../include/pdu.h ../include/endianness.h \
  ../include/hw_address.h ../include/small_uint.h ../include/pdu_option.h \
  ../include/network_interface.h ../include/ip_address.h \
- ../include/rawpdu.h ../include/rsn_information.h \
+ ../include/cxxstd.h ../include/rawpdu.h ../include/rsn_information.h \
  ../include/packet_sender.h ../include/snap.h
 
 ../include/macros.h:
@@ -185,6 +192,8 @@
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 ../include/rawpdu.h:
 
 ../include/rsn_information.h:
@@ -213,7 +222,7 @@
  ../include/macros.h ../include/small_uint.h ../include/endianness.h \
  ../include/dot11.h ../include/hw_address.h ../include/pdu_option.h \
  ../include/network_interface.h ../include/ip_address.h \
- ../include/rsn_information.h
+ ../include/cxxstd.h ../include/rsn_information.h
 
 ../include/eapol.h:
 
@@ -235,15 +244,17 @@
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 ../include/rsn_information.h:
 ../src/ethernetII.o: ../src/ethernetII.cpp ../include/macros.h \
  ../include/ethernetII.h ../include/macros.h ../include/pdu.h \
  ../include/endianness.h ../include/hw_address.h \
  ../include/network_interface.h ../include/ip_address.h \
  ../include/packet_sender.h ../include/rawpdu.h ../include/ip.h \
- ../include/small_uint.h ../include/pdu_option.h ../include/ipv6.h \
- ../include/ipv6_address.h ../include/arp.h ../include/constants.h \
- ../include/internals.h ../include/constants.h
+ ../include/small_uint.h ../include/pdu_option.h ../include/cxxstd.h \
+ ../include/ipv6.h ../include/ipv6_address.h ../include/arp.h \
+ ../include/constants.h ../include/internals.h ../include/constants.h
 
 ../include/macros.h:
 
@@ -271,6 +282,8 @@
 
 ../include/pdu_option.h:
 
+../include/cxxstd.h:
+
 ../include/ipv6.h:
 
 ../include/ipv6_address.h:
@@ -311,9 +324,9 @@
 ../src/icmpv6.o: ../src/icmpv6.cpp ../include/icmpv6.h \
  ../include/macros.h ../include/pdu.h ../include/ipv6_address.h \
  ../include/pdu_option.h ../include/endianness.h ../include/small_uint.h \
- ../include/hw_address.h ../include/ipv6.h ../include/rawpdu.h \
- ../include/utils.h ../include/ip_address.h ../include/internals.h \
- ../include/constants.h ../include/constants.h
+ ../include/hw_address.h ../include/cxxstd.h ../include/ipv6.h \
+ ../include/rawpdu.h ../include/utils.h ../include/ip_address.h \
+ ../include/internals.h ../include/constants.h ../include/constants.h
 
 ../include/icmpv6.h:
 
@@ -331,6 +344,8 @@
 
 ../include/hw_address.h:
 
+../include/cxxstd.h:
+
 ../include/ipv6.h:
 
 ../include/rawpdu.h:
@@ -372,9 +387,10 @@
 ../src/internals.o: ../src/internals.cpp ../include/internals.h \
  ../include/constants.h ../include/pdu.h ../include/ip.h \
  ../include/small_uint.h ../include/endianness.h ../include/macros.h \
- ../include/ip_address.h ../include/pdu_option.h ../include/ipv6.h \
- ../include/ipv6_address.h ../include/arp.h ../include/hw_address.h \
- ../include/eapol.h ../include/rawpdu.h
+ ../include/ip_address.h ../include/pdu_option.h ../include/cxxstd.h \
+ ../include/ipv6.h ../include/ipv6_address.h ../include/arp.h \
+ ../include/hw_address.h ../include/eapol.h ../include/rawpdu.h \
+ ../include/dot1q.h
 
 ../include/internals.h:
 
@@ -394,6 +410,8 @@
 
 ../include/pdu_option.h:
 
+../include/cxxstd.h:
+
 ../include/ipv6.h:
 
 ../include/ipv6_address.h:
@@ -405,14 +423,16 @@
 ../include/eapol.h:
 
 ../include/rawpdu.h:
+
+../include/dot1q.h:
 ../src/ip.o: ../src/ip.cpp ../include/ip.h ../include/pdu.h \
  ../include/small_uint.h ../include/endianness.h ../include/macros.h \
- ../include/ip_address.h ../include/pdu_option.h ../include/ipv6.h \
- ../include/ipv6_address.h ../include/tcp.h ../include/udp.h \
- ../include/icmp.h ../include/rawpdu.h ../include/utils.h \
- ../include/hw_address.h ../include/internals.h ../include/constants.h \
- ../include/packet_sender.h ../include/network_interface.h \
- ../include/constants.h
+ ../include/ip_address.h ../include/pdu_option.h ../include/cxxstd.h \
+ ../include/ipv6.h ../include/ipv6_address.h ../include/tcp.h \
+ ../include/udp.h ../include/icmp.h ../include/rawpdu.h \
+ ../include/utils.h ../include/hw_address.h ../include/internals.h \
+ ../include/constants.h ../include/packet_sender.h \
+ ../include/network_interface.h ../include/constants.h
 
 ../include/ip.h:
 
@@ -428,6 +448,8 @@
 
 ../include/pdu_option.h:
 
+../include/cxxstd.h:
+
 ../include/ipv6.h:
 
 ../include/ipv6_address.h:
@@ -466,8 +488,8 @@
  ../include/pdu_option.h ../include/ipv6_address.h ../include/constants.h \
  ../include/packet_sender.h ../include/network_interface.h \
  ../include/hw_address.h ../include/ip_address.h ../include/ip.h \
- ../include/tcp.h ../include/udp.h ../include/icmp.h ../include/icmpv6.h \
- ../include/rawpdu.h
+ ../include/cxxstd.h ../include/tcp.h ../include/udp.h ../include/icmp.h \
+ ../include/icmpv6.h ../include/rawpdu.h
 
 ../include/ipv6.h:
 
@@ -495,6 +517,8 @@
 
 ../include/ip.h:
 
+../include/cxxstd.h:
+
 ../include/tcp.h:
 
 ../include/udp.h:
@@ -529,8 +553,8 @@
  ../include/pdu.h ../include/macros.h ../include/network_interface.h \
  ../include/hw_address.h ../include/ip_address.h \
  ../include/packet_sender.h ../include/ip.h ../include/small_uint.h \
- ../include/endianness.h ../include/pdu_option.h ../include/llc.h \
- ../include/rawpdu.h
+ ../include/endianness.h ../include/pdu_option.h ../include/cxxstd.h \
+ ../include/llc.h ../include/rawpdu.h
 
 ../include/loopback.h:
 
@@ -554,6 +578,8 @@
 
 ../include/pdu_option.h:
 
+../include/cxxstd.h:
+
 ../include/llc.h:
 
 ../include/rawpdu.h:
@@ -587,7 +613,10 @@
 ../src/packet_sender.o: ../src/packet_sender.cpp \
  ../include/packet_sender.h ../include/network_interface.h \
  ../include/hw_address.h ../include/ip_address.h ../include/macros.h \
- ../include/pdu.h ../include/macros.h ../include/network_interface.h
+ ../include/pdu.h ../include/macros.h ../include/network_interface.h \
+ ../include/ethernetII.h ../include/pdu.h ../include/endianness.h \
+ ../include/radiotap.h ../include/dot11.h ../include/small_uint.h \
+ ../include/pdu_option.h ../include/cxxstd.h ../include/ieee802_3.h
 
 ../include/packet_sender.h:
 
@@ -604,6 +633,24 @@
 ../include/macros.h:
 
 ../include/network_interface.h:
+
+../include/ethernetII.h:
+
+../include/pdu.h:
+
+../include/endianness.h:
+
+../include/radiotap.h:
+
+../include/dot11.h:
+
+../include/small_uint.h:
+
+../include/pdu_option.h:
+
+../include/cxxstd.h:
+
+../include/ieee802_3.h:
 ../src/packet_writer.o: ../src/packet_writer.cpp \
  ../include/packet_writer.h ../include/utils.h ../include/macros.h \
  ../include/ip_address.h ../include/ipv6_address.h \
@@ -655,9 +702,9 @@
  ../include/radiotap.h ../include/macros.h ../include/pdu.h \
  ../include/endianness.h ../include/network_interface.h \
  ../include/hw_address.h ../include/ip_address.h ../include/dot11.h \
- ../include/small_uint.h ../include/pdu_option.h ../include/utils.h \
- ../include/ipv6_address.h ../include/internals.h ../include/constants.h \
- ../include/packet_sender.h
+ ../include/small_uint.h ../include/pdu_option.h ../include/cxxstd.h \
+ ../include/utils.h ../include/ipv6_address.h ../include/internals.h \
+ ../include/constants.h ../include/packet_sender.h
 
 ../include/macros.h:
 
@@ -681,6 +728,8 @@
 
 ../include/pdu_option.h:
 
+../include/cxxstd.h:
+
 ../include/utils.h:
 
 ../include/ipv6_address.h:
@@ -724,7 +773,8 @@
  ../include/macros.h ../include/endianness.h ../include/small_uint.h \
  ../include/constants.h ../include/arp.h ../include/hw_address.h \
  ../include/ip_address.h ../include/ip.h ../include/pdu_option.h \
- ../include/eapol.h ../include/internals.h ../include/constants.h
+ ../include/cxxstd.h ../include/eapol.h ../include/internals.h \
+ ../include/constants.h
 
 ../include/snap.h:
 
@@ -748,6 +798,8 @@
 
 ../include/pdu_option.h:
 
+../include/cxxstd.h:
+
 ../include/eapol.h:
 
 ../include/internals.h:
@@ -796,10 +848,10 @@
 ../include/sll.h:
 ../src/tcp.o: ../src/tcp.cpp ../include/tcp.h ../include/pdu.h \
  ../include/macros.h ../include/endianness.h ../include/small_uint.h \
- ../include/pdu_option.h ../include/ip.h ../include/ip_address.h \
- ../include/ipv6.h ../include/ipv6_address.h ../include/constants.h \
- ../include/rawpdu.h ../include/utils.h ../include/hw_address.h \
- ../include/internals.h ../include/constants.h
+ ../include/pdu_option.h ../include/cxxstd.h ../include/ip.h \
+ ../include/ip_address.h ../include/ipv6.h ../include/ipv6_address.h \
+ ../include/constants.h ../include/rawpdu.h ../include/utils.h \
+ ../include/hw_address.h ../include/internals.h ../include/constants.h
 
 ../include/tcp.h:
 
@@ -813,6 +865,8 @@
 
 ../include/pdu_option.h:
 
+../include/cxxstd.h:
+
 ../include/ip.h:
 
 ../include/ip_address.h:
@@ -897,7 +951,7 @@
  ../include/utils.h ../include/ip_address.h ../include/ipv6_address.h \
  ../include/hw_address.h ../include/internals.h ../include/constants.h \
  ../include/ip.h ../include/small_uint.h ../include/pdu_option.h \
- ../include/rawpdu.h
+ ../include/cxxstd.h ../include/rawpdu.h
 
 ../include/udp.h:
 
@@ -927,6 +981,8 @@
 
 ../include/pdu_option.h:
 
+../include/cxxstd.h:
+
 ../include/rawpdu.h:
 ../src/utils.o: ../src/utils.cpp ../include/utils.h ../include/macros.h \
  ../include/ip_address.h ../include/ipv6_address.h \
@@ -999,8 +1055,8 @@ src/arp.o: src/arp.cpp ../include/arp.h ../include/macros.h \
 src/dhcp.o: src/dhcp.cpp ../include/dhcp.h ../include/bootp.h \
  ../include/pdu.h ../include/macros.h ../include/endianness.h \
  ../include/ip_address.h ../include/hw_address.h ../include/pdu_option.h \
- ../include/utils.h ../include/ipv6_address.h ../include/internals.h \
- ../include/constants.h ../include/ethernetII.h \
+ ../include/cxxstd.h ../include/utils.h ../include/ipv6_address.h \
+ ../include/internals.h ../include/constants.h ../include/ethernetII.h \
  ../include/network_interface.h ../include/hw_address.h \
  ../include/ip_address.h
 
@@ -1020,6 +1076,8 @@ src/dhcp.o: src/dhcp.cpp ../include/dhcp.h ../include/bootp.h \
 
 ../include/pdu_option.h:
 
+../include/cxxstd.h:
+
 ../include/utils.h:
 
 ../include/ipv6_address.h:
@@ -1087,7 +1145,7 @@ src/dot11/ack.o: src/dot11/ack.cpp ../include/dot11.h ../include/macros.h \
  ../include/pdu.h ../include/endianness.h ../include/hw_address.h \
  ../include/small_uint.h ../include/pdu_option.h \
  ../include/network_interface.h ../include/ip_address.h \
- include/tests/dot11.h include/tests/dot11.h
+ ../include/cxxstd.h include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -1107,6 +1165,8 @@ src/dot11/ack.o: src/dot11/ack.cpp ../include/dot11.h ../include/macros.h \
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 include/tests/dot11.h:
 
 include/tests/dot11.h:
@@ -1114,7 +1174,7 @@ src/dot11/assoc_request.o: src/dot11/assoc_request.cpp ../include/dot11.h \
  ../include/macros.h ../include/pdu.h ../include/endianness.h \
  ../include/hw_address.h ../include/small_uint.h ../include/pdu_option.h \
  ../include/network_interface.h ../include/ip_address.h \
- include/tests/dot11.h include/tests/dot11.h
+ ../include/cxxstd.h include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -1134,6 +1194,8 @@ src/dot11/assoc_request.o: src/dot11/assoc_request.cpp ../include/dot11.h \
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 include/tests/dot11.h:
 
 include/tests/dot11.h:
@@ -1141,7 +1203,8 @@ src/dot11/assoc_response.o: src/dot11/assoc_response.cpp \
  ../include/dot11.h ../include/macros.h ../include/pdu.h \
  ../include/endianness.h ../include/hw_address.h ../include/small_uint.h \
  ../include/pdu_option.h ../include/network_interface.h \
- ../include/ip_address.h include/tests/dot11.h include/tests/dot11.h
+ ../include/ip_address.h ../include/cxxstd.h include/tests/dot11.h \
+ include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -1161,6 +1224,8 @@ src/dot11/assoc_response.o: src/dot11/assoc_response.cpp \
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 include/tests/dot11.h:
 
 include/tests/dot11.h:
@@ -1168,7 +1233,8 @@ src/dot11/authentication.o: src/dot11/authentication.cpp \
  ../include/dot11.h ../include/macros.h ../include/pdu.h \
  ../include/endianness.h ../include/hw_address.h ../include/small_uint.h \
  ../include/pdu_option.h ../include/network_interface.h \
- ../include/ip_address.h include/tests/dot11.h include/tests/dot11.h
+ ../include/ip_address.h ../include/cxxstd.h include/tests/dot11.h \
+ include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -1188,6 +1254,8 @@ src/dot11/authentication.o: src/dot11/authentication.cpp \
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 include/tests/dot11.h:
 
 include/tests/dot11.h:
@@ -1195,7 +1263,8 @@ src/dot11/beacon.o: src/dot11/beacon.cpp ../include/dot11.h \
  ../include/macros.h ../include/pdu.h ../include/endianness.h \
  ../include/hw_address.h ../include/small_uint.h ../include/pdu_option.h \
  ../include/network_interface.h ../include/ip_address.h \
- ../include/rsn_information.h include/tests/dot11.h include/tests/dot11.h
+ ../include/cxxstd.h ../include/rsn_information.h include/tests/dot11.h \
+ include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -1215,6 +1284,8 @@ src/dot11/beacon.o: src/dot11/beacon.cpp ../include/dot11.h \
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 ../include/rsn_information.h:
 
 include/tests/dot11.h:
@@ -1224,7 +1295,8 @@ src/dot11/block_ack_request.o: src/dot11/block_ack_request.cpp \
  ../include/dot11.h ../include/macros.h ../include/pdu.h \
  ../include/endianness.h ../include/hw_address.h ../include/small_uint.h \
  ../include/pdu_option.h ../include/network_interface.h \
- ../include/ip_address.h include/tests/dot11.h include/tests/dot11.h
+ ../include/ip_address.h ../include/cxxstd.h include/tests/dot11.h \
+ include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -1244,6 +1316,8 @@ src/dot11/block_ack_request.o: src/dot11/block_ack_request.cpp \
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 include/tests/dot11.h:
 
 include/tests/dot11.h:
@@ -1251,7 +1325,7 @@ src/dot11/cfend.o: src/dot11/cfend.cpp ../include/dot11.h \
  ../include/macros.h ../include/pdu.h ../include/endianness.h \
  ../include/hw_address.h ../include/small_uint.h ../include/pdu_option.h \
  ../include/network_interface.h ../include/ip_address.h \
- include/tests/dot11.h include/tests/dot11.h
+ ../include/cxxstd.h include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -1271,6 +1345,8 @@ src/dot11/cfend.o: src/dot11/cfend.cpp ../include/dot11.h \
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 include/tests/dot11.h:
 
 include/tests/dot11.h:
@@ -1278,7 +1354,7 @@ src/dot11/cfendack.o: src/dot11/cfendack.cpp ../include/dot11.h \
  ../include/macros.h ../include/pdu.h ../include/endianness.h \
  ../include/hw_address.h ../include/small_uint.h ../include/pdu_option.h \
  ../include/network_interface.h ../include/ip_address.h \
- include/tests/dot11.h include/tests/dot11.h
+ ../include/cxxstd.h include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -1298,6 +1374,8 @@ src/dot11/cfendack.o: src/dot11/cfendack.cpp ../include/dot11.h \
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 include/tests/dot11.h:
 
 include/tests/dot11.h:
@@ -1305,7 +1383,7 @@ src/dot11/data.o: src/dot11/data.cpp ../include/dot11.h \
  ../include/macros.h ../include/pdu.h ../include/endianness.h \
  ../include/hw_address.h ../include/small_uint.h ../include/pdu_option.h \
  ../include/network_interface.h ../include/ip_address.h \
- include/tests/dot11.h include/tests/dot11.h
+ ../include/cxxstd.h include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -1325,6 +1403,8 @@ src/dot11/data.o: src/dot11/data.cpp ../include/dot11.h \
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 include/tests/dot11.h:
 
 include/tests/dot11.h:
@@ -1332,7 +1412,8 @@ src/dot11/deauthentication.o: src/dot11/deauthentication.cpp \
  ../include/dot11.h ../include/macros.h ../include/pdu.h \
  ../include/endianness.h ../include/hw_address.h ../include/small_uint.h \
  ../include/pdu_option.h ../include/network_interface.h \
- ../include/ip_address.h include/tests/dot11.h include/tests/dot11.h
+ ../include/ip_address.h ../include/cxxstd.h include/tests/dot11.h \
+ include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -1352,6 +1433,8 @@ src/dot11/deauthentication.o: src/dot11/deauthentication.cpp \
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 include/tests/dot11.h:
 
 include/tests/dot11.h:
@@ -1359,7 +1442,7 @@ src/dot11/disassoc.o: src/dot11/disassoc.cpp ../include/dot11.h \
  ../include/macros.h ../include/pdu.h ../include/endianness.h \
  ../include/hw_address.h ../include/small_uint.h ../include/pdu_option.h \
  ../include/network_interface.h ../include/ip_address.h \
- include/tests/dot11.h include/tests/dot11.h
+ ../include/cxxstd.h include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -1379,6 +1462,8 @@ src/dot11/disassoc.o: src/dot11/disassoc.cpp ../include/dot11.h \
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 include/tests/dot11.h:
 
 include/tests/dot11.h:
@@ -1386,8 +1471,9 @@ src/dot11/dot11.o: src/dot11/dot11.cpp ../include/dot11.h \
  ../include/macros.h ../include/pdu.h ../include/endianness.h \
  ../include/hw_address.h ../include/small_uint.h ../include/pdu_option.h \
  ../include/network_interface.h ../include/ip_address.h \
- include/tests/dot11.h include/tests/dot11.h ../include/utils.h \
- ../include/ipv6_address.h ../include/internals.h ../include/constants.h
+ ../include/cxxstd.h include/tests/dot11.h include/tests/dot11.h \
+ ../include/utils.h ../include/ipv6_address.h ../include/internals.h \
+ ../include/constants.h
 
 ../include/dot11.h:
 
@@ -1407,6 +1493,8 @@ src/dot11/dot11.o: src/dot11/dot11.cpp ../include/dot11.h \
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 include/tests/dot11.h:
 
 include/tests/dot11.h:
@@ -1422,7 +1510,7 @@ src/dot11/probe_request.o: src/dot11/probe_request.cpp ../include/dot11.h \
  ../include/macros.h ../include/pdu.h ../include/endianness.h \
  ../include/hw_address.h ../include/small_uint.h ../include/pdu_option.h \
  ../include/network_interface.h ../include/ip_address.h \
- include/tests/dot11.h include/tests/dot11.h
+ ../include/cxxstd.h include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -1442,6 +1530,8 @@ src/dot11/probe_request.o: src/dot11/probe_request.cpp ../include/dot11.h \
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 include/tests/dot11.h:
 
 include/tests/dot11.h:
@@ -1449,7 +1539,8 @@ src/dot11/probe_response.o: src/dot11/probe_response.cpp \
  ../include/dot11.h ../include/macros.h ../include/pdu.h \
  ../include/endianness.h ../include/hw_address.h ../include/small_uint.h \
  ../include/pdu_option.h ../include/network_interface.h \
- ../include/ip_address.h include/tests/dot11.h include/tests/dot11.h
+ ../include/ip_address.h ../include/cxxstd.h include/tests/dot11.h \
+ include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -1469,6 +1560,8 @@ src/dot11/probe_response.o: src/dot11/probe_response.cpp \
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 include/tests/dot11.h:
 
 include/tests/dot11.h:
@@ -1476,7 +1569,7 @@ src/dot11/pspoll.o: src/dot11/pspoll.cpp ../include/dot11.h \
  ../include/macros.h ../include/pdu.h ../include/endianness.h \
  ../include/hw_address.h ../include/small_uint.h ../include/pdu_option.h \
  ../include/network_interface.h ../include/ip_address.h \
- include/tests/dot11.h include/tests/dot11.h
+ ../include/cxxstd.h include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -1496,6 +1589,8 @@ src/dot11/pspoll.o: src/dot11/pspoll.cpp ../include/dot11.h \
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 include/tests/dot11.h:
 
 include/tests/dot11.h:
@@ -1503,7 +1598,8 @@ src/dot11/reassoc_request.o: src/dot11/reassoc_request.cpp \
  ../include/dot11.h ../include/macros.h ../include/pdu.h \
  ../include/endianness.h ../include/hw_address.h ../include/small_uint.h \
  ../include/pdu_option.h ../include/network_interface.h \
- ../include/ip_address.h include/tests/dot11.h include/tests/dot11.h
+ ../include/ip_address.h ../include/cxxstd.h include/tests/dot11.h \
+ include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -1523,6 +1619,8 @@ src/dot11/reassoc_request.o: src/dot11/reassoc_request.cpp \
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 include/tests/dot11.h:
 
 include/tests/dot11.h:
@@ -1530,7 +1628,8 @@ src/dot11/reassoc_response.o: src/dot11/reassoc_response.cpp \
  ../include/dot11.h ../include/macros.h ../include/pdu.h \
  ../include/endianness.h ../include/hw_address.h ../include/small_uint.h \
  ../include/pdu_option.h ../include/network_interface.h \
- ../include/ip_address.h include/tests/dot11.h include/tests/dot11.h
+ ../include/ip_address.h ../include/cxxstd.h include/tests/dot11.h \
+ include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -1550,6 +1649,8 @@ src/dot11/reassoc_response.o: src/dot11/reassoc_response.cpp \
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 include/tests/dot11.h:
 
 include/tests/dot11.h:
@@ -1557,7 +1658,7 @@ src/dot11/rts.o: src/dot11/rts.cpp ../include/dot11.h ../include/macros.h \
  ../include/pdu.h ../include/endianness.h ../include/hw_address.h \
  ../include/small_uint.h ../include/pdu_option.h \
  ../include/network_interface.h ../include/ip_address.h \
- include/tests/dot11.h include/tests/dot11.h
+ ../include/cxxstd.h include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -1577,11 +1678,15 @@ src/dot11/rts.o: src/dot11/rts.cpp ../include/dot11.h ../include/macros.h \
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 include/tests/dot11.h:
 
 include/tests/dot11.h:
 src/dot1q.o: src/dot1q.cpp ../include/dot1q.h ../include/pdu.h \
- ../include/endianness.h ../include/macros.h ../include/small_uint.h
+ ../include/endianness.h ../include/macros.h ../include/small_uint.h \
+ ../include/arp.h ../include/hw_address.h ../include/ip_address.h \
+ ../include/ethernetII.h ../include/network_interface.h
 
 ../include/dot1q.h:
 
@@ -1592,13 +1697,23 @@ src/dot1q.o: src/dot1q.cpp ../include/dot1q.h ../include/pdu.h \
 ../include/macros.h:
 
 ../include/small_uint.h:
+
+../include/arp.h:
+
+../include/hw_address.h:
+
+../include/ip_address.h:
+
+../include/ethernetII.h:
+
+../include/network_interface.h:
 src/ethernetII.o: src/ethernetII.cpp ../include/ethernetII.h \
  ../include/macros.h ../include/pdu.h ../include/endianness.h \
  ../include/hw_address.h ../include/network_interface.h \
  ../include/ip_address.h ../include/utils.h ../include/ipv6_address.h \
  ../include/internals.h ../include/constants.h ../include/macros.h \
  ../include/ipv6.h ../include/small_uint.h ../include/pdu_option.h \
- ../include/ip.h ../include/network_interface.h
+ ../include/ip.h ../include/cxxstd.h ../include/network_interface.h
 
 ../include/ethernetII.h:
 
@@ -1632,6 +1747,8 @@ src/ethernetII.o: src/ethernetII.cpp ../include/ethernetII.h \
 
 ../include/ip.h:
 
+../include/cxxstd.h:
+
 ../include/network_interface.h:
 src/hwaddress.o: src/hwaddress.cpp ../include/hw_address.h
 
@@ -1663,9 +1780,9 @@ src/icmp.o: src/icmp.cpp ../include/icmp.h ../include/macros.h \
 src/icmpv6.o: src/icmpv6.cpp ../include/icmpv6.h ../include/macros.h \
  ../include/pdu.h ../include/ipv6_address.h ../include/pdu_option.h \
  ../include/endianness.h ../include/small_uint.h ../include/hw_address.h \
- ../include/ip.h ../include/ip_address.h ../include/tcp.h \
- ../include/utils.h ../include/internals.h ../include/constants.h \
- ../include/hw_address.h
+ ../include/cxxstd.h ../include/ip.h ../include/ip_address.h \
+ ../include/tcp.h ../include/utils.h ../include/internals.h \
+ ../include/constants.h ../include/hw_address.h
 
 ../include/icmpv6.h:
 
@@ -1683,6 +1800,8 @@ src/icmpv6.o: src/icmpv6.cpp ../include/icmpv6.h ../include/macros.h \
 
 ../include/hw_address.h:
 
+../include/cxxstd.h:
+
 ../include/ip.h:
 
 ../include/ip_address.h:
@@ -1698,10 +1817,10 @@ src/icmpv6.o: src/icmpv6.cpp ../include/icmpv6.h ../include/macros.h \
 ../include/hw_address.h:
 src/ip.o: src/ip.cpp ../include/ip.h ../include/pdu.h \
  ../include/small_uint.h ../include/endianness.h ../include/macros.h \
- ../include/ip_address.h ../include/pdu_option.h ../include/tcp.h \
- ../include/udp.h ../include/icmp.h ../include/ip_address.h \
- ../include/utils.h ../include/ipv6_address.h ../include/hw_address.h \
- ../include/internals.h ../include/constants.h
+ ../include/ip_address.h ../include/pdu_option.h ../include/cxxstd.h \
+ ../include/tcp.h ../include/udp.h ../include/icmp.h \
+ ../include/ip_address.h ../include/utils.h ../include/ipv6_address.h \
+ ../include/hw_address.h ../include/internals.h ../include/constants.h
 
 ../include/ip.h:
 
@@ -1717,6 +1836,8 @@ src/ip.o: src/ip.cpp ../include/ip.h ../include/pdu.h \
 
 ../include/pdu_option.h:
 
+../include/cxxstd.h:
+
 ../include/tcp.h:
 
 ../include/udp.h:
@@ -1759,9 +1880,10 @@ src/ipaddress.o: src/ipaddress.cpp ../include/ip_address.h \
 src/ipv6.o: src/ipv6.cpp ../include/ipv6.h ../include/macros.h \
  ../include/pdu.h ../include/endianness.h ../include/small_uint.h \
  ../include/pdu_option.h ../include/ipv6_address.h ../include/tcp.h \
- ../include/udp.h ../include/icmp.h ../include/icmpv6.h \
- ../include/hw_address.h ../include/ipv6_address.h ../include/utils.h \
- ../include/ip_address.h ../include/internals.h ../include/constants.h
+ ../include/cxxstd.h ../include/udp.h ../include/icmp.h \
+ ../include/icmpv6.h ../include/hw_address.h ../include/ipv6_address.h \
+ ../include/utils.h ../include/ip_address.h ../include/internals.h \
+ ../include/constants.h
 
 ../include/ipv6.h:
 
@@ -1779,6 +1901,8 @@ src/ipv6.o: src/ipv6.cpp ../include/ipv6.h ../include/macros.h \
 
 ../include/tcp.h:
 
+../include/cxxstd.h:
+
 ../include/udp.h:
 
 ../include/icmp.h:
@@ -1856,9 +1980,9 @@ src/network_interface.o: src/network_interface.cpp \
 ../include/macros.h:
 src/pdu.o: src/pdu.cpp ../include/ip.h ../include/pdu.h \
  ../include/small_uint.h ../include/endianness.h ../include/macros.h \
- ../include/ip_address.h ../include/pdu_option.h ../include/tcp.h \
- ../include/rawpdu.h ../include/pdu.h ../include/packet.h \
- ../include/cxxstd.h ../include/timestamp.h
+ ../include/ip_address.h ../include/pdu_option.h ../include/cxxstd.h \
+ ../include/tcp.h ../include/rawpdu.h ../include/pdu.h \
+ ../include/packet.h ../include/timestamp.h
 
 ../include/ip.h:
 
@@ -1874,6 +1998,8 @@ src/pdu.o: src/pdu.cpp ../include/ip.h ../include/pdu.h \
 
 ../include/pdu_option.h:
 
+../include/cxxstd.h:
+
 ../include/tcp.h:
 
 ../include/rawpdu.h:
@@ -1882,15 +2008,13 @@ src/pdu.o: src/pdu.cpp ../include/ip.h ../include/pdu.h \
 
 ../include/packet.h:
 
-../include/cxxstd.h:
-
 ../include/timestamp.h:
 src/radiotap.o: src/radiotap.cpp ../include/radiotap.h \
  ../include/macros.h ../include/pdu.h ../include/endianness.h \
  ../include/network_interface.h ../include/hw_address.h \
  ../include/ip_address.h ../include/dot11.h ../include/small_uint.h \
- ../include/pdu_option.h ../include/utils.h ../include/ipv6_address.h \
- ../include/internals.h ../include/constants.h
+ ../include/pdu_option.h ../include/cxxstd.h ../include/utils.h \
+ ../include/ipv6_address.h ../include/internals.h ../include/constants.h
 
 ../include/radiotap.h:
 
@@ -1912,6 +2036,8 @@ src/radiotap.o: src/radiotap.cpp ../include/radiotap.h \
 
 ../include/pdu_option.h:
 
+../include/cxxstd.h:
+
 ../include/utils.h:
 
 ../include/ipv6_address.h:
@@ -1977,7 +2103,8 @@ src/rsn_eapol.o: src/rsn_eapol.cpp ../include/eapol.h ../include/pdu.h \
 src/sll.o: src/sll.cpp ../include/sll.h ../include/pdu.h \
  ../include/endianness.h ../include/macros.h ../include/hw_address.h \
  ../include/hw_address.h ../include/constants.h ../include/ip.h \
- ../include/small_uint.h ../include/ip_address.h ../include/pdu_option.h
+ ../include/small_uint.h ../include/ip_address.h ../include/pdu_option.h \
+ ../include/cxxstd.h
 
 ../include/sll.h:
 
@@ -2000,6 +2127,8 @@ src/sll.o: src/sll.cpp ../include/sll.h ../include/pdu.h \
 ../include/ip_address.h:
 
 ../include/pdu_option.h:
+
+../include/cxxstd.h:
 src/snap.o: src/snap.cpp ../include/snap.h ../include/pdu.h \
  ../include/macros.h ../include/endianness.h ../include/small_uint.h \
  ../include/utils.h ../include/ip_address.h ../include/ipv6_address.h \
@@ -2028,9 +2157,9 @@ src/snap.o: src/snap.cpp ../include/snap.h ../include/pdu.h \
 ../include/constants.h:
 src/tcp.o: src/tcp.cpp ../include/tcp.h ../include/pdu.h \
  ../include/macros.h ../include/endianness.h ../include/small_uint.h \
- ../include/pdu_option.h ../include/utils.h ../include/ip_address.h \
- ../include/ipv6_address.h ../include/hw_address.h ../include/internals.h \
- ../include/constants.h
+ ../include/pdu_option.h ../include/cxxstd.h ../include/utils.h \
+ ../include/ip_address.h ../include/ipv6_address.h \
+ ../include/hw_address.h ../include/internals.h ../include/constants.h
 
 ../include/tcp.h:
 
@@ -2044,6 +2173,8 @@ src/tcp.o: src/tcp.cpp ../include/tcp.h ../include/pdu.h \
 
 ../include/pdu_option.h:
 
+../include/cxxstd.h:
+
 ../include/utils.h:
 
 ../include/ip_address.h:
@@ -2160,9 +2291,9 @@ src/wep_decrypt.o: src/wep_decrypt.cpp ../include/crypto.h \
  ../include/dot11.h ../include/macros.h ../include/pdu.h \
  ../include/endianness.h ../include/hw_address.h ../include/small_uint.h \
  ../include/pdu_option.h ../include/network_interface.h \
- ../include/ip_address.h ../include/utils.h ../include/ipv6_address.h \
- ../include/internals.h ../include/constants.h ../include/snap.h \
- ../include/rawpdu.h ../include/arp.h
+ ../include/ip_address.h ../include/cxxstd.h ../include/utils.h \
+ ../include/ipv6_address.h ../include/internals.h ../include/constants.h \
+ ../include/snap.h ../include/rawpdu.h ../include/arp.h
 
 ../include/crypto.h:
 
@@ -2184,6 +2315,8 @@ src/wep_decrypt.o: src/wep_decrypt.cpp ../include/crypto.h \
 
 ../include/ip_address.h:
 
+../include/cxxstd.h:
+
 ../include/utils.h:
 
 ../include/ipv6_address.h: