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, 8 insertions, 8 deletions

diff --git a/packet-tns.c b/packet-tns.c
index 244e542b19..e90b8f3c69 100644
--- a/packet-tns.c
+++ b/packet-tns.c
@@ -1,7 +1,7 @@
 /* packet-tns.c
  * Routines for MSX tns packet dissection
  *
- * $Id: packet-tns.c,v 1.7 2000/05/31 05:07:50 guy Exp $
+ * $Id: packet-tns.c,v 1.8 2000/08/07 03:21:17 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -76,7 +76,7 @@ static const value_string tns_type_vals[] = {
 
 /* Handy macro for checking for truncated packet */
 #define TRUNC(length) if ( ! BYTES_ARE_IN_FRAME(offset, length)) { \
-			dissect_data(pd,offset,fd,tree); return; }
+			old_dissect_data(pd,offset,fd,tree); return; }
 
 static void dissect_tns_sns(const u_char *pd, int offset, frame_data *fd, 
 	proto_tree *tree, proto_tree *tns_tree)
@@ -98,7 +98,7 @@ static void dissect_tns_sns(const u_char *pd, int offset, frame_data *fd,
 
 	if ( sns_tree )
 	{
-		dissect_data(pd,offset,fd,sns_tree);
+		old_dissect_data(pd,offset,fd,sns_tree);
 	}
 }
 
@@ -124,7 +124,7 @@ static void dissect_tns_data(const u_char *pd, int offset, frame_data *fd,
 		}
 	}
 	
-	dissect_data(pd,offset,fd,tree);
+	old_dissect_data(pd,offset,fd,tree);
 	return;
 }
 
@@ -173,7 +173,7 @@ static void dissect_tns_connect(const u_char *pd, int offset, frame_data *fd,
 
 	if ( connect_tree )
 	{
-		dissect_data(pd,offset,fd,connect_tree);
+		old_dissect_data(pd,offset,fd,connect_tree);
 	}
 	return;
 }
@@ -181,7 +181,7 @@ static void dissect_tns_connect(const u_char *pd, int offset, frame_data *fd,
 static void dissect_tns_accept(const u_char *pd, int offset, frame_data *fd, 
 	proto_tree *tree, proto_tree *tns_tree)
 {
-	dissect_data(pd,offset,fd,tns_tree);
+	old_dissect_data(pd,offset,fd,tns_tree);
 	return;
 }
 
@@ -286,7 +286,7 @@ dissect_tns(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
 			dissect_tns_data(pd,offset,fd,tree,tns_tree);
 			break;
 		default:
-			dissect_data(pd,offset,fd,tns_tree);
+			old_dissect_data(pd,offset,fd,tns_tree);
 	}
 }
 
@@ -349,5 +349,5 @@ void proto_register_tns(void)
 void
 proto_reg_handoff_tns(void)
 {
-	dissector_add("tcp.port", TCP_PORT_TNS, dissect_tns);
+	old_dissector_add("tcp.port", TCP_PORT_TNS, dissect_tns);
 }