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, 5 insertions, 4 deletions

diff --git a/packet-msproxy.c b/packet-msproxy.c
index 6ac41a644f..09a97a953e 100644
--- a/packet-msproxy.c
+++ b/packet-msproxy.c
@@ -2,7 +2,7 @@
  * Routines for Microsoft Proxy packet dissection
  * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
  *
- * $Id: packet-msproxy.c,v 1.6 2000/08/06 10:04:13 guy Exp $
+ * $Id: packet-msproxy.c,v 1.7 2000/08/07 03:20:52 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -282,7 +282,7 @@ static void add_msproxy_conversation( hash_entry_t *hash_info){
 /* conversation data structure with the info needed to call the TCP or 	*/
 /* UDP port decoder.							*/
 
-/* NOTE: Currently this assume that the conversataion will be created 	*/
+/* NOTE: Currently this assume that the conversation will be created 	*/
 /* 	during a packet from the server.  If that changes, the pi.src	*/
 /*	and pi.dst will not be correct and this routine will have to 	*/
 /*	change.								*/
@@ -309,7 +309,8 @@ static void add_msproxy_conversation( hash_entry_t *hash_info){
 	new_conv_info->server_int_port = hash_info->server_int_port;
 	new_conv_info->proto = hash_info->proto;
 	
-	conversation->dissector = msproxy_sub_dissector;
+	conversation->is_old_dissector = TRUE;
+	conversation->dissector.old = msproxy_sub_dissector;
 }
 
 
@@ -1354,5 +1355,5 @@ proto_reg_handoff_msproxy(void) {
 
 	/* dissector install routine */ 
  
- 	dissector_add("udp.port", UDP_PORT_MSPROXY, dissect_msproxy);
+ 	old_dissector_add("udp.port", UDP_PORT_MSPROXY, dissect_msproxy);
 }