commit 051db00f350f363e978026c207f476153fd088a8
author Davide Pesavento <davide.pesavento@lip6.fr> Sun Jul 22 18:56:16 2018 -0400
committer Davide Pesavento <davide.pesavento@lip6.fr> Sun Jul 22 18:56:16 2018 -0400
tree b5ffc122728a58af7a8fe06c1e967d6bb8d60c26
parent 302941eec2b978ca04ca3dd163bdaa2266013d2f

dump: stop using tcpdump headers

Change-Id: Ied249b29a3e5bc41facc7228af618e44f2c286a8

tools/dump/ndndump.cpp

diff --git a/tools/dump/ndndump.cpp b/tools/dump/ndndump.cpp
index 9e0d5d4..e9a6912 100644
--- a/tools/dump/ndndump.cpp
+++ b/tools/dump/ndndump.cpp
@@ -36,19 +36,10 @@
 
 #include "ndndump.hpp"
 
-#include "tcpdump/tcpdump-stdinc.h"
-
-namespace ndn {
-namespace dump {
-// namespace is necessary to prevent clashing with system includes
-
-#include "tcpdump/ether.h"
-#include "tcpdump/ip.h"
-#include "tcpdump/udp.h"
-#include "tcpdump/tcp.h"
-
-} // namespace dump
-} // namespace ndn
+#include <net/ethernet.h>
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+#include <netinet/udp.h>
 
 #include <pcap/sll.h>
 
@@ -269,8 +260,8 @@
       }
 
       frameType = ntohs(etherHeader->ether_type);
-      payloadSize -= ETHER_HDRLEN;
-      payload += ETHER_HDRLEN;
+      payloadSize -= ETHER_HDR_LEN;
+      payload += ETHER_HDR_LEN;
 
       break;
     }
@@ -320,7 +311,7 @@
     case 0x0800: // ETHERTYPE_IP
     case DLT_EN10MB: { // pcap encapsulation
       const ip* ipHeader = reinterpret_cast<const ip*>(payload);
-      size_t ipHeaderSize = IP_HL(ipHeader) * 4;
+      size_t ipHeaderSize = ipHeader->ip_hl * 4;
       if (ipHeaderSize < 20) {
         std::cerr << "invalid IP header len " << ipHeaderSize << " bytes" << std::endl;
         return -1;
@@ -358,7 +349,7 @@
           //   return -1;
 
           const tcphdr* tcpHeader = reinterpret_cast<const tcphdr*>(payload);
-          size_t tcpHeaderSize = TH_OFF(tcpHeader) * 4;
+          size_t tcpHeaderSize = tcpHeader->th_off * 4;
 
           if (tcpHeaderSize < 20) {
             std::cerr << "Invalid TCP Header len: " << tcpHeaderSize <<" bytes" << std::endl;