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-giop.c b/packet-giop.c
index abf9d284d7..d56f4b4bfe 100644
--- a/packet-giop.c
+++ b/packet-giop.c
@@ -3,7 +3,7 @@
  *
  * Laurent Deniel <deniel@worldnet.fr>
  *
- * $Id: packet-giop.c,v 1.15 2000/07/27 17:11:44 gram Exp $
+ * $Id: packet-giop.c,v 1.16 2000/08/07 03:20:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -256,7 +256,7 @@ dissect_giop(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
 		"Version %d.%d not supported", 
 		header.GIOP_version.major, header.GIOP_version.minor);
     }
-    dissect_data(pd, offset + GIOP_HEADER_SIZE, fd, tree);
+    old_dissect_data(pd, offset + GIOP_HEADER_SIZE, fd, tree);
     return TRUE;
   }
 
@@ -333,7 +333,7 @@ dissect_giop(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
   offset += GIOP_HEADER_SIZE;
 
   if (!BYTES_ARE_IN_FRAME(offset, message_size)) {
-    dissect_data(pd, offset, fd, tree);
+    old_dissect_data(pd, offset, fd, tree);
     return TRUE;
   }
 
@@ -458,7 +458,7 @@ dissect_giop(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
 	pntohl(&pd[offset]) : pletohl(&pd[offset]);
 
       if (sequence_length > message_size) {
-	dissect_data(pd, offset, fd, tree);
+	old_dissect_data(pd, offset, fd, tree);
 	return TRUE;
       }
        
@@ -527,7 +527,7 @@ dissect_giop(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
 	  pntohl(&pd[offset]) : pletohl(&pd[offset]);
 
 	if (sequence_length > message_size) {
-	  dissect_data(pd, offset, fd, tree);
+	  old_dissect_data(pd, offset, fd, tree);
 	  return TRUE;
 	}
 
@@ -566,7 +566,7 @@ dissect_giop(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
 	  pntohl(&pd[offset]) : pletohl(&pd[offset]);
 
 	if (sequence_length > message_size) {
-	  dissect_data(pd, offset, fd, tree);
+	  old_dissect_data(pd, offset, fd, tree);
 	  return TRUE;
 	}
 
@@ -586,7 +586,7 @@ dissect_giop(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
 	  pntohl(&pd[offset]) : pletohl(&pd[offset]);
 
 	if (sequence_length > message_size) {
-	  dissect_data(pd, offset, fd, tree);
+	  old_dissect_data(pd, offset, fd, tree);
 	  return TRUE;
 	}
 
@@ -720,7 +720,7 @@ dissect_giop(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
   offset = first_offset + GIOP_HEADER_SIZE + message_size;
 
   if (IS_DATA_IN_FRAME(offset)) {
-    dissect_data(pd, offset, fd, tree);
+    old_dissect_data(pd, offset, fd, tree);
   }
 
   return TRUE;
@@ -749,5 +749,5 @@ proto_register_giop(void)
 void
 proto_reg_handoff_giop(void)
 {
-  heur_dissector_add("tcp", dissect_giop);
+  old_heur_dissector_add("tcp", dissect_giop);
 }