aboutsummaryrefslogtreecommitdiffstats
path: root/packet-icmpv6.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2000-04-20 07:05:58 +0000
committerGuy Harris <guy@alum.mit.edu>2000-04-20 07:05:58 +0000
commitedd1f261709079cbe0ebe7f9bb8b447a250271c5 (patch)
treec53d7501daab4f29fddb7a458d040b7799b4eea9 /packet-icmpv6.c
parentc2a68f6b86c75772f44e15b5d926ea25966e9241 (diff)
Have the IPv6 dissector use the same dissector table as the IPv4
dissector. Don't dissect the payload of any fragmented IPv6 packet unless it's the initial fragment (that's what we do for IPv4). svn path=/trunk/; revision=1882
Diffstat (limited to 'packet-icmpv6.c')
-rw-r--r--packet-icmpv6.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/packet-icmpv6.c b/packet-icmpv6.c
index 9d39912efa..6f6125e28f 100644
--- a/packet-icmpv6.c
+++ b/packet-icmpv6.c
@@ -1,7 +1,7 @@
/* packet-icmpv6.c
* Routines for ICMPv6 packet disassembly
*
- * $Id: packet-icmpv6.c,v 1.14 2000/03/12 04:47:38 gram Exp $
+ * $Id: packet-icmpv6.c,v 1.15 2000/04/20 07:05:53 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -56,6 +56,7 @@
#include <glib.h>
#include "packet.h"
#include "packet-ipv6.h"
+#include "packet-ip.h"
#include "resolv.h"
#ifndef offsetof
@@ -198,7 +199,7 @@ again:
goto again;
}
-void
+static void
dissect_icmpv6(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_tree *icmp6_tree, *field_tree;
@@ -600,3 +601,10 @@ proto_register_icmpv6(void)
proto_register_field_array(proto_icmpv6, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_icmpv6(void)
+{
+ dissector_add("ip.proto", IP_PROTO_ICMPV6, dissect_icmpv6);
+}
+