diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-04-29 17:24:35 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-04-29 17:24:35 +0000 |
| commit | 74e3d695fcc195def1c67453f2e62444c398ca6b (patch) | |
| tree | 0c2f3ff67f160a69377a1c12a71b7b1956cbc81d /packet-ipv6.c | |
| parent | e29579a74a27a5613483882b78c0dbc836275921 (diff) | |
Don't export "ip_dissector_table" explicitly; now that we have
"find_dissector_table()", have the IPv6 and IPSEC dissectors fetch the
IP dissector table by name.
svn path=/trunk/; revision=7600
Diffstat (limited to 'packet-ipv6.c')
| -rw-r--r-- | packet-ipv6.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/packet-ipv6.c b/packet-ipv6.c index 6ef5d2ebf0..bf678741a2 100644 --- a/packet-ipv6.c +++ b/packet-ipv6.c @@ -1,7 +1,7 @@ /* packet-ipv6.c * Routines for IPv6 packet disassembly * - * $Id: packet-ipv6.c,v 1.97 2003/04/20 11:36:14 guy Exp $ + * $Id: packet-ipv6.c,v 1.98 2003/04/29 17:24:35 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -32,7 +32,6 @@ #include <stdio.h> #include <glib.h> #include <epan/packet.h> -#include "packet-ip.h" #include "packet-ipsec.h" #include "packet-ipv6.h" #include <epan/resolv.h> @@ -97,6 +96,8 @@ static const fragment_items ipv6_frag_items = { static dissector_handle_t data_handle; +static dissector_table_t ip_dissector_table; + /* Reassemble fragmented datagrams */ static gboolean ipv6_reassemble = FALSE; @@ -864,4 +865,6 @@ proto_reg_handoff_ipv6(void) dissector_add("fr.ietf", NLPID_IP6, ipv6_handle); dissector_add("x.25.spi", NLPID_IP6, ipv6_handle); dissector_add("arcnet.protocol_id", ARCNET_PROTO_IPv6, ipv6_handle); + + ip_dissector_table = find_dissector_table("ip.proto"); } |