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, 15 deletions

diff --git a/packet-sctp.c b/packet-sctp.c
index 7db76e9610..2fd807552f 100644
--- a/packet-sctp.c
+++ b/packet-sctp.c
@@ -2,7 +2,7 @@
  * Routines for Stream Control Transmission Protocol dissection
  * Copyright 2000, Michael Tüxen <Michael.Tuexen@icn.siemens.de>
  *
- * $Id: packet-sctp.c,v 1.2 2000/07/31 04:12:04 guy Exp $
+ * $Id: packet-sctp.c,v 1.3 2000/08/07 03:21:09 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@unicom.net>
@@ -959,7 +959,7 @@ dissect_error_cause(tvbuff_t *cause_tvb, proto_tree *chunk_tree)
  * Code to actually dissect the packets 
 */
 
-void
+static void
 dissect_data_chunk(tvbuff_t *chunk_tvb,
 		   proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item)
 { 
@@ -1479,18 +1479,9 @@ dissect_sctp_chunks(tvbuff_t *tvb, proto_tree *sctp_tree)
  * For the handling of the chunks dissect_sctp_chunks is called.
  */
 
-#if 0
 static void
 dissect_sctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-#else
-static void
-dissect_sctp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
-{
-        tvbuff_t *tvb = tvb_create_from_top(offset);
-        packet_info *pinfo = &pi;
-#endif
-
   guint16 source_port, destination_port;
   guint32 verification_tag, checksum;
   proto_item *ti;
@@ -1505,12 +1496,12 @@ dissect_sctp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
   checksum         = tvb_get_ntohl(tvb, CHECKSUM_OFFSET);
 
   /* make entry in the Protocol column on summary display */
-  if (check_col(fd, COL_PROTOCOL)) 
-    col_add_str(fd, COL_PROTOCOL, "SCTP");
+  if (check_col(pinfo->fd, COL_PROTOCOL)) 
+    col_add_str(pinfo->fd, COL_PROTOCOL, "SCTP");
 
   /* Make entries in Info column on summary display */
-  if (check_col(fd, COL_INFO)) 
-    col_add_fstr(fd, COL_INFO, "%u > %u: tag 0x%x",
+  if (check_col(pinfo->fd, COL_INFO)) 
+    col_add_fstr(pinfo->fd, COL_INFO, "%u > %u: tag 0x%x",
 		 source_port, destination_port, verification_tag);
   
   /* In the interest of speed, if "tree" is NULL, don't do any work not