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

1 files changed, 2 insertions, 2 deletions

diff --git a/packet-rtcp.c b/packet-rtcp.c
index 90a1d9d76a..40d8927cab 100644
--- a/packet-rtcp.c
+++ b/packet-rtcp.c
@@ -196,7 +196,7 @@ void rtcp_add_address( const unsigned char* ip_addr, int prt )
 	 * know that we're interested in traffic
 	 */
 	if ( ! heur_init ) {
-		heur_dissector_add( "udp", dissect_rtcp_heur );
+		heur_dissector_add( "udp", dissect_rtcp_heur, proto_rtcp );
 		heur_init = TRUE;
 	}
 
@@ -1226,5 +1226,5 @@ proto_reg_handoff_rtcp(void)
 	 * Register this dissector as one that can be assigned to a
 	 * UDP conversation.
 	 */
-	conv_dissector_add("udp", dissect_rtcp);
+	conv_dissector_add("udp", dissect_rtcp, proto_rtcp);
 }