Default to first interface from pcap_findalldevs()

[tcpdump] / print-ipnet.c

diff --git a/print-ipnet.c b/print-ipnet.c
index e1cd59e198231fa64c9bdf3199fa34106b6d14dc..7fb2e77ae5fe8481ac26cc53665471403a25cefb 100644 (file)
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -1,11 +1,10 @@
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 
 typedef struct ipnet_hdr {
        uint8_t         iph_version;
@@ -55,7 +54,7 @@ ipnet_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
 static void
 ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 {
-       ipnet_hdr_t *hdr;
+       const ipnet_hdr_t *hdr;
 
        if (caplen < sizeof(ipnet_hdr_t)) {
                ND_PRINT((ndo, "[|ipnet]"));
@@ -67,7 +66,7 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
 
        length -= sizeof(ipnet_hdr_t);
        caplen -= sizeof(ipnet_hdr_t);
-       hdr = (ipnet_hdr_t *)p;
+       hdr = (const ipnet_hdr_t *)p;
        p += sizeof(ipnet_hdr_t);
 
        switch (hdr->iph_family) {
@@ -76,15 +75,13 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
                ip_print(ndo, p, length);
                break;
 
-#ifdef INET6
        case IPH_AF_INET6:
                ip6_print(ndo, p, length);
                break;
-#endif /*INET6*/
 
        default:
                if (!ndo->ndo_eflag)
-                       ipnet_hdr_print(ndo, (u_char *)hdr,
+                       ipnet_hdr_print(ndo, (const u_char *)hdr,
                                        length + sizeof(ipnet_hdr_t));
 
                if (!ndo->ndo_suppress_default_print)