diff options
author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-04-13 18:18:56 +0000 |
---|---|---|
committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-04-13 18:18:56 +0000 |
commit | db187f965c6ca47932a009f3cb011770a687e289 (patch) | |
tree | 1d58b40531c9ca503d57229b9cc8c9bf394a2052 /packet-atalk.c | |
parent | 2fa56170d39e86f703ee0a6c5d3ddc1d14afa905 (diff) | |
download | wireshark-db187f965c6ca47932a009f3cb011770a687e289.tar.gz wireshark-db187f965c6ca47932a009f3cb011770a687e289.tar.bz2 wireshark-db187f965c6ca47932a009f3cb011770a687e289.zip |
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-atalk.c')
-rw-r--r-- | packet-atalk.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/packet-atalk.c b/packet-atalk.c index 824d5f68e9..e07046630d 100644 --- a/packet-atalk.c +++ b/packet-atalk.c @@ -1,7 +1,7 @@ /* packet-atalk.c * Routines for Appletalk packet disassembly (DDP, currently). * - * $Id: packet-atalk.c,v 1.31 2000/03/12 04:47:35 gram Exp $ + * $Id: packet-atalk.c,v 1.32 2000/04/13 18:18:44 gram Exp $ * * Simon Wilkinson <sxw@dcs.ed.ac.uk> * @@ -35,6 +35,7 @@ #include <glib.h> #include "packet.h" #include "packet-atalk.h" +#include "etypes.h" static int proto_ddp = -1; static int hf_ddp_hopcount = -1; @@ -555,3 +556,9 @@ proto_register_atalk(void) proto_register_subtree_array(ett, array_length(ett)); } + +void +proto_reg_handoff_atalk(void) +{ + dissector_add("ethertype", ETHERTYPE_ATALK, dissect_ddp); +} |