Default to first interface from pcap_findalldevs()

[tcpdump] / print-ip6.c

diff --git a/print-ip6.c b/print-ip6.c
index dd6b7f5105adb6037059988ca943547d566d14bf..45508ced6cbf11a0ea5eb537f540488c0a3d1d97 100644 (file)
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -19,21 +19,18 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
-#ifdef INET6
-
 #include "ip6.h"
 #include "ipproto.h"
 
@@ -223,8 +220,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
                    }
 
                case IPPROTO_PIM:
-                       pim_print(ndo, cp, len, nextproto6_cksum(ip6, cp, len, len,
-                                                           IPPROTO_PIM));
+                       pim_print(ndo, cp, len, (const u_char *)ip6);
                        return;
 
                case IPPROTO_OSPF:
@@ -265,13 +261,3 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
 trunc:
        ND_PRINT((ndo, "[|ip6]"));
 }
-
-#else /* INET6 */
-
-void
-ip6_print(netdissect_options *ndo, const u_char *bp _U_, u_int length)
-{
-       ND_PRINT((ndo, "IP6, length: %u (printing not supported)", length));
-}
-
-#endif /* INET6 */