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, 14 insertions, 21 deletions

diff --git a/packet-h1.c b/packet-h1.c
index dc33a4b644..42534268a4 100644
--- a/packet-h1.c
+++ b/packet-h1.c
@@ -2,7 +2,7 @@
  * Routines for Sinec H1 packet disassembly
  * Gerrit Gehnen <G.Gehnen@atrie.de>
  *
- * $Id: packet-h1.c,v 1.10 2000/07/21 07:51:34 guy Exp $
+ * $Id: packet-h1.c,v 1.11 2000/08/07 03:20:35 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -99,15 +99,8 @@ static gint ett_org = -1;
 static gint ett_response = -1;
 static gint ett_empty = -1;
 
-#if 0
 static gboolean dissect_h1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-#else
-static gboolean dissect_h1(const u_char *pd, int o, frame_data *fd, proto_tree *tree)
-{
-	packet_info	*pinfo = &pi;
-	tvbuff_t	*tvb = tvb_create_from_top(o);
-#endif
   tvbuff_t *next_tvb; 
   
   proto_tree *h1_tree = NULL;
@@ -125,10 +118,10 @@ static gboolean dissect_h1(const u_char *pd, int o, frame_data *fd, proto_tree *
     return FALSE;
     }
 
-      if (check_col (fd, COL_PROTOCOL))
-	col_add_str (fd, COL_PROTOCOL, "H1");
-      if (check_col (fd, COL_INFO))
-	col_add_str (fd, COL_INFO, "S5: ");
+      if (check_col (pinfo->fd, COL_PROTOCOL))
+	col_add_str (pinfo->fd, COL_PROTOCOL, "H1");
+      if (check_col (pinfo->fd, COL_INFO))
+	col_add_str (pinfo->fd, COL_INFO, "S5: ");
       if (tree)
 	{
 	  ti = proto_tree_add_item (tree, proto_h1, tvb, offset, 16, FALSE);
@@ -158,9 +151,9 @@ static gboolean dissect_h1(const u_char *pd, int o, frame_data *fd, proto_tree *
 				       offset + position + 2, 1,
 				       tvb_get_guint8(tvb,offset + position + 2));
 		}
-	      if (check_col (fd, COL_INFO))
+	      if (check_col (pinfo->fd, COL_INFO))
 		{
-		  col_append_str (fd, COL_INFO,
+		  col_append_str (pinfo->fd, COL_INFO,
 				  val_to_str (tvb_get_guint8(tvb,offset + position + 2),
 						opcode_vals,"Unknown Opcode (0x%2.2x)"));
 		}
@@ -189,15 +182,15 @@ static gboolean dissect_h1(const u_char *pd, int o, frame_data *fd, proto_tree *
 				       offset + position + 6, 2,
 				       tvb_get_ntohs(tvb,offset+position+6));
 		}
-	      if (check_col (fd, COL_INFO))
+	      if (check_col (pinfo->fd, COL_INFO))
 		{
-		  col_append_fstr (fd, COL_INFO, " %s %d",
+		  col_append_fstr (pinfo->fd, COL_INFO, " %s %d",
 				  val_to_str (tvb_get_guint8(tvb,offset + position + 2),
 						 org_vals,"Unknown Type (0x%2.2x)"),
 				   tvb_get_guint8(tvb,offset + position + 3));
-		  col_append_fstr (fd, COL_INFO, " DW %d",
+		  col_append_fstr (pinfo->fd, COL_INFO, " DW %d",
 				       tvb_get_ntohs(tvb,offset+position+4));
-		  col_append_fstr (fd, COL_INFO, " Count %d",
+		  col_append_fstr (pinfo->fd, COL_INFO, " Count %d",
 				       tvb_get_ntohs(tvb,offset+position+6));
 		}
 	      break;
@@ -216,9 +209,9 @@ static gboolean dissect_h1(const u_char *pd, int o, frame_data *fd, proto_tree *
 				       offset + position + 2, 1,
 				       tvb_get_guint8(tvb,offset + position+2));
 		}
-	      if (check_col (fd, COL_INFO))
+	      if (check_col (pinfo->fd, COL_INFO))
 		{
-		  col_append_fstr (fd, COL_INFO, " %s",
+		  col_append_fstr (pinfo->fd, COL_INFO, " %s",
 				  val_to_str (tvb_get_guint8(tvb,offset + position + 2),
 						 returncode_vals,"Unknown Returcode (0x%2.2x"));
 		}
@@ -246,7 +239,7 @@ static gboolean dissect_h1(const u_char *pd, int o, frame_data *fd, proto_tree *
 	  position += tvb_get_guint8(tvb,offset + position + 1);	/* Goto next section */
 	}			/* ..while */
     next_tvb = tvb_new_subset(tvb, offset+tvb_get_guint8(tvb,offset+2), -1, -1);
-    dissect_data_tvb(next_tvb, pinfo, tree);
+    dissect_data(next_tvb, pinfo, tree);
 
     return TRUE;
 }