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, 17 insertions, 24 deletions

diff --git a/packet-ethertype.c b/packet-ethertype.c
index b7003027ce..f5378954a7 100644
--- a/packet-ethertype.c
+++ b/packet-ethertype.c
@@ -1,7 +1,7 @@
 /* ethertype.c
  * Routines for calling the right protocol for the ethertype.
  *
- * $Id: packet-ethertype.c,v 1.5 2000/05/31 05:07:03 guy Exp $
+ * $Id: packet-ethertype.c,v 1.6 2000/08/07 03:20:33 guy Exp $
  *
  * Gilbert Ramirez <gram@xiexie.org>
  *
@@ -89,11 +89,8 @@ void
 ethertype(guint16 etype, tvbuff_t *tvb, int offset_after_etype, packet_info *pinfo,
 		proto_tree *tree, proto_tree *fh_tree, int item_id)
 {
-	dissector_t	sub_dissector;
 	char		*description;
 	tvbuff_t	*next_tvb;
-	const guint8	*next_pd;
-	int		next_offset;
 	
 	/* Add to proto_tree */
 	if (tree) {
@@ -101,31 +98,27 @@ ethertype(guint16 etype, tvbuff_t *tvb, int offset_after_etype, packet_info *pin
 	}
 
 	next_tvb = tvb_new_subset(tvb, offset_after_etype, -1, -1);
-	tvb_compat(next_tvb, &next_pd, &next_offset);
 
 	/* Look for sub-dissector */
-	sub_dissector = dissector_lookup( ethertype_dissector_table, etype );
-
-	if (sub_dissector) {
-		/* Call sub-dissector */
-		sub_dissector(next_pd, next_offset, pinfo->fd, tree);
-	}
-	else {
-		/* Label rest of packet as "Data" */
-		dissect_data_tvb(next_tvb, pinfo, tree);
+	if (!dissector_try_port(ethertype_dissector_table, etype,
+	    next_tvb, pinfo, tree)) {
+		/* No sub-dissector found.
+		   Label rest of packet as "Data" */
+		dissect_data(next_tvb, pinfo, tree);
 
 		/* Label protocol */
 		switch(etype) {
-			case ETHERTYPE_LOOP:
-				if (check_col(pinfo->fd, COL_PROTOCOL)) {
-					col_add_fstr(pinfo->fd, COL_PROTOCOL, "LOOP");
-				}
-				break;
-			    default:
-				if (check_col(pinfo->fd, COL_PROTOCOL)) {
-					col_add_fstr(pinfo->fd, COL_PROTOCOL, "0x%04x", etype);
-				}
-				break;
+
+		case ETHERTYPE_LOOP:
+			if (check_col(pinfo->fd, COL_PROTOCOL)) {
+				col_add_fstr(pinfo->fd, COL_PROTOCOL, "LOOP");
+			}
+			break;
+		default:
+			if (check_col(pinfo->fd, COL_PROTOCOL)) {
+				col_add_fstr(pinfo->fd, COL_PROTOCOL, "0x%04x", etype);
+			}
+			break;
 		}
 		if (check_col(pinfo->fd, COL_INFO)) {
 			description = match_strval(etype, etype_vals);