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....)


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2849 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 9 insertions, 2 deletions

diff --git a/packet-x25.c b/packet-x25.c
index d39578e0bf..adc83cdf95 100644
--- a/packet-x25.c
+++ b/packet-x25.c
@@ -2,7 +2,7 @@
  * Routines for x25 packet disassembly
  * Olivier Abad <oabad@cybercable.fr>
  *
- * $Id: packet-x25.c,v 1.44 2001/01/05 19:07:38 guy Exp $
+ * $Id: packet-x25.c,v 1.45 2001/01/09 06:31:45 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -2069,5 +2069,12 @@ proto_reg_handoff_x25(void)
     ip_handle = find_dissector("ip");
     ositp_handle = find_dissector("ositp");
 
-    dissector_add("llc.dsap", SAP_X25, dissect_x25);
+    /*
+     * XXX - we can't associate this with both "proto_x25" and
+     * "proto_ex25"; we really should have only one X.25 protocol,
+     * but to do that right, we need to arrange that, for example,
+     * we can have two field definitions with the name "x.25.p_r",
+     * one for modulo-8 operation and one for modulo-128 operation.
+     */
+    dissector_add("llc.dsap", SAP_X25, dissect_x25, -1);
 }