aboutsummaryrefslogtreecommitdiffstats
path: root/packet-ipv6.c
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>2000-04-13 18:18:56 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>2000-04-13 18:18:56 +0000
commitdb187f965c6ca47932a009f3cb011770a687e289 (patch)
tree1d58b40531c9ca503d57229b9cc8c9bf394a2052 /packet-ipv6.c
parent2fa56170d39e86f703ee0a6c5d3ddc1d14afa905 (diff)
Change the sub-dissector handoff registration routines so that the
sub-dissector table is not stored in the header_field_info struct, but in a separate namespace. Dissector tables are now registered by name and not by field ID. For example: udp_dissector_table = register_dissector_table("udp.port"); Because of this different namespace, dissector tables can have names that are not field names. This is useful for ethertype, since multiple fields are "ethertypes". packet-ethertype.c replaces ethertype.c (the name was changed so that it would be named in the same fashion as all the filenames passed to make-reg-dotc) Although it registers no protocol or field, it registers one dissector table: ethertype_dissector_table = register_dissector_table("ethertype"); All protocols that can be called because of an ethertype field now register that fact with dissector_add() calls. In this way, one dissector_table services all ethertype fields (hf_eth_type, hf_llc_type, hf_null_etype, hf_vlan_etype) Furthermore, the code allows for names of protocols to exist in the etype_vals, yet a dissector for that protocol doesn't exist. The name of the dissector is printed in COL_INFO. You're welcome, Richard. :-) svn path=/trunk/; revision=1848
Diffstat (limited to 'packet-ipv6.c')
-rw-r--r--packet-ipv6.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/packet-ipv6.c b/packet-ipv6.c
index b93f3cc2bc..7a58a5426e 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.31 2000/03/21 04:15:04 guy Exp $
+ * $Id: packet-ipv6.c,v 1.32 2000/04/13 18:18:46 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -42,6 +42,7 @@
#include <string.h>
#include <stdio.h>
#include <glib.h>
+#include "etypes.h"
#include "packet.h"
#include "packet-icmpv6.h"
#include "packet-ip.h"
@@ -470,3 +471,9 @@ proto_register_ipv6(void)
proto_register_field_array(proto_ipv6, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_ipv6(void)
+{
+ dissector_add("ethertype", ETHERTYPE_IPv6, dissect_ipv6);
+}