NDOize OpenFlow, IEEE slow and telnet decoders

[tcpdump] / print-ipnet.c

diff --git a/print-ipnet.c b/print-ipnet.c
index e8ed94d52005b531adeedb540771524496bdcda0..d777a95268f002a9a6198d023b867bb719693afe 100644 (file)
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -1,16 +1,25 @@
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include <stdio.h>
-#include <pcap.h>
-
-#include "netdissect.h"
 #include "interface.h"
-#include "addrtoname.h"
-#include "ipnet.h"
+
+typedef struct ipnet_hdr {
+       uint8_t         iph_version;
+       uint8_t         iph_family;
+       uint16_t        iph_htype;
+       uint32_t        iph_pktlen;
+       uint32_t        iph_ifindex;
+       uint32_t        iph_grifindex;
+       uint32_t        iph_zsrc;
+       uint32_t        iph_zdst;
+} ipnet_hdr_t;
+
+#define        IPH_AF_INET     2               /* Matches Solaris's AF_INET */
+#define        IPH_AF_INET6    26              /* Matches Solaris's AF_INET6 */
 
 #ifdef DLT_IPNET