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

diff --git a/packet-osi.c b/packet-osi.c
index 3bca500086..ab3ab43f59 100644
--- a/packet-osi.c
+++ b/packet-osi.c
@@ -2,7 +2,7 @@
  * Routines for ISO/OSI network and transport protocol packet disassembly
  * Main entrance point and common functions
  *
- * $Id: packet-osi.c,v 1.33 2000/04/17 01:36:31 guy Exp $
+ * $Id: packet-osi.c,v 1.34 2000/08/07 03:20:58 guy Exp $
  * Laurent Deniel <deniel@worldnet.fr>
  * Ralf Schneider <Ralf.Schneider@t-online.de>
  *
@@ -225,7 +225,7 @@ void dissect_osi(const u_char *pd, int offset, frame_data *fd,
 		 proto_tree *tree) 
 {
   /* do lookup with the subdissector table */
-  if (dissector_try_port(subdissector_table, pd[offset], pd, offset, fd, tree))
+  if (old_dissector_try_port(subdissector_table, pd[offset], pd, offset, fd, tree))
       return;
 
   switch (pd[offset]) {
@@ -236,13 +236,13 @@ void dissect_osi(const u_char *pd, int offset, frame_data *fd,
       if (check_col(fd, COL_PROTOCOL)) {
 	col_add_str(fd, COL_PROTOCOL, "ESIS (X.25)");
       }
-      dissect_data(pd, offset, fd, tree);
+      old_dissect_data(pd, offset, fd, tree);
       break;
     case NLPID_ISO10747_IDRP:
       if (check_col(fd, COL_PROTOCOL)) {
         col_add_str(fd, COL_PROTOCOL, "IDRP");
       }
-      dissect_data(pd, offset, fd, tree);
+      old_dissect_data(pd, offset, fd, tree);
       break;
     default:
       if (check_col(fd, COL_PROTOCOL)) {
@@ -251,7 +251,7 @@ void dissect_osi(const u_char *pd, int offset, frame_data *fd,
       if (check_col(fd, COL_INFO)) {
 	col_add_fstr(fd, COL_INFO, "Unknown ISO protocol (%02x)", pd[offset]);
       }
-      dissect_data(pd, offset, fd, tree);
+      old_dissect_data(pd, offset, fd, tree);
       break;
   }
 } /* dissect_osi */
@@ -268,5 +268,5 @@ proto_register_osi(void)
 void
 proto_reg_handoff_osi(void)
 {
-	dissector_add("llc.dsap", SAP_OSINL, dissect_osi);
+	old_dissector_add("llc.dsap", SAP_OSINL, dissect_osi);
 }