Allow either old-style (pre-tvbuff) or new-style (tvbuffified)

dissectors to be registered as dissectors for particular ports,
registered as heuristic dissectors, and registered as dissectors for
conversations, and have routines to be used both by old-style and
new-style dissectors to call registered dissectors.

Have the code that calls those dissectors translate the arguments as
necessary.  (For conversation dissectors, replace
"find_conversation_dissector()", which just returns a pointer to the
dissector, with "old_try_conversation_dissector()" and
"try_conversation_dissector()", which actually call the dissector, so
that there's a single place at which we can do that translation.  Also
make "dissector_lookup()" static and, instead of calling it and, if it
returns a non-null pointer, calling that dissector, just use
"old_dissector_try_port()" or "dissector_try_port()", for the same
reason.)

This allows some dissectors that took old-style arguments and
immediately translated them to new-style arguments to just take
new-style arguments; make them do so.  It also allows some new-style
dissectors not to have to translate arguments before calling routines to
look up and call dissectors; make them not do so.

Get rid of checks for too-short frames in new-style dissectors - the
tvbuff code does those checks for you.

Give the routines to register old-style dissectors, and to call
dissectors from old-style dissectors, names beginning with "old_", with
the routines for new-style dissectors not having the "old_".  Update the
dissectors that use those routines appropriately.

Rename "dissect_data()" to "old_dissect_data()", and
"dissect_data_tvb()" to "dissect_data()".

svn path=/trunk/; revision=2218

1 files changed, 9 insertions, 9 deletions

diff --git a/packet-diameter.c b/packet-diameter.c
index 3af11f8262..49937fa026 100644
--- a/packet-diameter.c
+++ b/packet-diameter.c
@@ -1,7 +1,7 @@
 /* packet-diameter.c
  * Routines for DIAMETER packet disassembly
  *
- * $Id: packet-diameter.c,v 1.3 2000/08/03 09:30:32 gram Exp $
+ * $Id: packet-diameter.c,v 1.4 2000/08/07 03:20:28 guy Exp $
  *
  * Copyright (c) 2000 by David Frascone <chaos@mindspring.com>
  *
@@ -725,11 +725,11 @@ proto_reg_handoff_diameter(void)
 	static int SctpPort=0;
 #endif
 	if (Initialized) {
-		dissector_delete("udp.port", UdpPort, dissect_diameter);
-		dissector_delete("tcp.port", TcpPort, dissect_diameter);
+		old_dissector_delete("udp.port", UdpPort, dissect_diameter);
+		old_dissector_delete("tcp.port", TcpPort, dissect_diameter);
 #ifdef SCTP_DISSECTORS_ENABLED
-		dissector_delete("sctp.srcport", SctpPort, dissect_diameter);
-		dissector_delete("sctp.destport", SctpPort, dissect_diameter);
+		old_dissector_delete("sctp.srcport", SctpPort, dissect_diameter);
+		old_dissector_delete("sctp.destport", SctpPort, dissect_diameter);
 #endif
 	} else {
 		Initialized=TRUE;
@@ -744,10 +744,10 @@ proto_reg_handoff_diameter(void)
 
 	strcpy(gbl_diameterString, "Diameter Protocol");
 
-	dissector_add("udp.port", gbl_diameterUdpPort, dissect_diameter);
-	dissector_add("tcp.port", gbl_diameterTcpPort, dissect_diameter);
+	old_dissector_add("udp.port", gbl_diameterUdpPort, dissect_diameter);
+	old_dissector_add("tcp.port", gbl_diameterTcpPort, dissect_diameter);
 #ifdef SCTP_DISSECTORS_ENABLED
-	dissector_add("sctp.srcport", gbl_diameterSctpPort, dissect_diameter);
-	dissector_add("sctp.destport", gbl_diameterSctpPort, dissect_diameter);
+	old_dissector_add("sctp.srcport", gbl_diameterSctpPort, dissect_diameter);
+	old_dissector_add("sctp.destport", gbl_diameterSctpPort, dissect_diameter);
 #endif
 }