diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-12-03 04:00:26 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-12-03 04:00:26 +0000 |
| commit | bced8711f67b5dba76e9d6cdfd1a0246b235df27 (patch) | |
| tree | 6303e298a7b136a1e1da306950398c99e3e71432 /packet-ipv6.c | |
| parent | 8d0ea8bc932de5cf57183a593be160515af064d9 (diff) | |
| download | wireshark-bced8711f67b5dba76e9d6cdfd1a0246b235df27.tar.gz wireshark-bced8711f67b5dba76e9d6cdfd1a0246b235df27.tar.bz2 wireshark-bced8711f67b5dba76e9d6cdfd1a0246b235df27.zip | |
Make "dissector_add()", "dissector_delete()", and "dissector_change()"
take a dissector handle as an argument, rather than a pointer to a
dissector function and a protocol ID. Associate dissector handles with
dissector table entries.
svn path=/trunk/; revision=4308
Diffstat (limited to 'packet-ipv6.c')
| -rw-r--r-- | packet-ipv6.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/packet-ipv6.c b/packet-ipv6.c index aee65bf2c2..a95f9e0839 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.69 2001/12/02 00:07:46 guy Exp $ + * $Id: packet-ipv6.c,v 1.70 2001/12/03 03:59:35 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1153,16 +1153,20 @@ proto_register_ipv6(void) void proto_reg_handoff_ipv6(void) { + dissector_handle_t ipv6_handle, ipv6_none_handle; + data_handle = find_dissector("data"); - dissector_add("ethertype", ETHERTYPE_IPv6, dissect_ipv6, proto_ipv6); - dissector_add("ppp.protocol", PPP_IPV6, dissect_ipv6, proto_ipv6); - dissector_add("ppp.protocol", ETHERTYPE_IPv6, dissect_ipv6, proto_ipv6); - dissector_add("gre.proto", ETHERTYPE_IPv6, dissect_ipv6, proto_ipv6); - dissector_add("ip.proto", IP_PROTO_IPV6, dissect_ipv6, proto_ipv6); - dissector_add("ip.proto", IP_PROTO_NONE, dissect_ipv6_none, proto_ipv6); - dissector_add("null.type", BSD_AF_INET6_BSD, dissect_ipv6, proto_ipv6); - dissector_add("null.type", BSD_AF_INET6_FREEBSD, dissect_ipv6, proto_ipv6); - dissector_add("chdlctype", ETHERTYPE_IPv6, dissect_ipv6, proto_ipv6); - dissector_add("fr.ietf", NLPID_IP6, dissect_ipv6, proto_ipv6); - dissector_add("x.25.spi", NLPID_IP6, dissect_ipv6, proto_ipv6); + ipv6_handle = find_dissector("ipv6"); + dissector_add("ethertype", ETHERTYPE_IPv6, ipv6_handle); + dissector_add("ppp.protocol", PPP_IPV6, ipv6_handle); + dissector_add("ppp.protocol", ETHERTYPE_IPv6, ipv6_handle); + dissector_add("gre.proto", ETHERTYPE_IPv6, ipv6_handle); + dissector_add("ip.proto", IP_PROTO_IPV6, ipv6_handle); + ipv6_none_handle = create_dissector_handle(dissect_ipv6_none, proto_ipv6); + dissector_add("ip.proto", IP_PROTO_NONE, ipv6_none_handle); + dissector_add("null.type", BSD_AF_INET6_BSD, ipv6_handle); + dissector_add("null.type", BSD_AF_INET6_FREEBSD, ipv6_handle); + dissector_add("chdlctype", ETHERTYPE_IPv6, ipv6_handle); + dissector_add("fr.ietf", NLPID_IP6, ipv6_handle); + dissector_add("x.25.spi", NLPID_IP6, ipv6_handle); } |