aboutsummaryrefslogtreecommitdiffstats
path: root/packet-tr.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-01-09 06:32:10 +0000
committerGuy Harris <guy@alum.mit.edu>2001-01-09 06:32:10 +0000
commit43ccfd8054ae2b3313ce16d0e96f65183a8062e6 (patch)
tree64e405774b7cf4b6cc4f247aea0c3c3651aeef53 /packet-tr.c
parent925ce160144e354b91b25f6b28f60e0df689f043 (diff)
Add an additional "protocol index" argument to "{old_}dissector_add()",
"{old_}heur_dissector_add()", "{old_}conv_dissector_add()", and "register_dissector()", so that an entry in those tables has associated with it the protocol index of the protocol the dissector handles (or -1, if there is no protocol index for it). This is for future use in a number of places. (Arguably, "proto_register_protocol()" should take a dissector pointer as an argument, but 1) it'd have to handle both regular and heuristic dissectors; 2) making it take either a "dissector_t" or a union of that and a "heur_dissector_t" introduces some painful header-file interdependencies so I'm punting on that for now. As with other Ethereal internal APIs, these APIs are subject to change in the future, at least until Ethereal 1.0 comes out....) svn path=/trunk/; revision=2849
Diffstat (limited to 'packet-tr.c')
-rw-r--r--packet-tr.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/packet-tr.c b/packet-tr.c
index 8d8698d069..69dfca9770 100644
--- a/packet-tr.c
+++ b/packet-tr.c
@@ -2,7 +2,7 @@
* Routines for Token-Ring packet disassembly
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-tr.c,v 1.54 2001/01/03 10:34:41 guy Exp $
+ * $Id: packet-tr.c,v 1.55 2001/01/09 06:31:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -682,5 +682,6 @@ proto_reg_handoff_tr(void)
trmac_handle = find_dissector("trmac");
llc_handle = find_dissector("llc");
- dissector_add("wtap_encap", WTAP_ENCAP_TOKEN_RING, dissect_tr);
+ dissector_add("wtap_encap", WTAP_ENCAP_TOKEN_RING, dissect_tr,
+ proto_tr);
}