netdisect converted icmp6_print()

diff --git a/interface.h b/interface.h
index 687870565efa864e8c7b2e1b521dff35f12f3be9..9038b433b1948ca9ebad9e14e3248cd356c1127c 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -332,7 +332,6 @@ extern int hbhopt_print(const u_char *);
 extern int dstopt_print(const u_char *);
 extern int frag6_print(const u_char *, const u_char *);
 extern int mobility_print(const u_char *, const u_char *);
-extern void icmp6_print(const u_char *, u_int, const u_char *, int);
 extern void ripng_print(const u_char *, unsigned int);
 extern int rt6_print(const u_char *, const u_char *);
 extern void ospf6_print(const u_char *, u_int);

diff --git a/netdissect.h b/netdissect.h
index 42ef245601203bd647c46c9e858fa7eae7923c93..7f6025fff71d72329f4a6db73962464345826bb5 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -329,6 +329,8 @@ extern void fddi_if_print(u_char *,const struct pcap_pkthdr *, const u_char *);
 extern void gre_print(netdissect_options *,const u_char *, u_int);
 extern void icmp_print(netdissect_options *,const u_char *, u_int,
                       const u_char *);
+extern void icmp6_print(netdissect_options *ndo, const u_char *,
+                        u_int, const u_char *, int);
 extern void hsrp_print(netdissect_options *ndo,
                       register const u_char *bp, register u_int len);
 extern void ieee802_11_if_print(u_char *,const struct pcap_pkthdr *, const u_char *);

diff --git a/print-icmp6.c b/print-icmp6.c
index 4a7aa2d9ac82704f31c4e070be802c68bfc95af3..362229fb64f614eb88772341ba5bf448af1c3f0f 100644 (file)
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -233,7 +233,8 @@ static int icmp6_cksum(const struct ip6_hdr *ip6, const struct icmp6_hdr *icp,
 }
 
 void
-icmp6_print(const u_char *bp, u_int length, const u_char *bp2, int fragmented)
+icmp6_print(netdissect_options *ndo,
+            const u_char *bp, u_int length, const u_char *bp2, int fragmented)
 {
        const struct icmp6_hdr *dp;
        const struct ip6_hdr *ip;

diff --git a/print-ip6.c b/print-ip6.c
index 7aa97a542dab930535ae854f2c930810c1fe9ce5..f7bd50eaac94cc9a1c17950b52a30e7068f3fd9b 100644 (file)
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -195,7 +195,7 @@ ip6_print(register const u_char *bp, register u_int length)
                        udp_print(cp, len, (const u_char *)ip6, fragmented);
                        return;
                case IPPROTO_ICMPV6:
-                       icmp6_print(cp, len, (const u_char *)ip6, fragmented);
+                       icmp6_print(gndo, cp, len, (const u_char *)ip6, fragmented);
                        return;
                case IPPROTO_AH:
                        advance = ah_print(cp);