Move PDU utils into their own file

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>

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
 

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"
-
+#include "utils/pdu_utils.h"
-// Fix for Windows interface define on combaseapi.h
+ 
-#undef interface
-
 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
 

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

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

src/utils/pdu_utils.cpp

@@ -27,58 +27,13 @@
  *
  */
 
-#include <stdexcept>
+#include "utils/pdu_utils.h"
-#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"
 
 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){