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

diff --git a/conversation.h b/conversation.h
index 68acad1833..635e7ec903 100644
--- a/conversation.h
+++ b/conversation.h
@@ -1,7 +1,7 @@
 /* conversation.h
  * Routines for building lists of packets that are part of a "conversation"
  *
- * $Id: conversation.h,v 1.5 2000/04/12 22:53:14 guy Exp $
+ * $Id: conversation.h,v 1.6 2000/08/07 03:20:20 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -34,8 +34,11 @@ typedef struct conversation {
 	struct conversation *next;	/* pointer to next conversation on hash chain */
 	guint32	index;	/* unique ID for conversation */
 	void	*data;	/* data our client can associate with a conversation */
-	dissector_t	dissector; 	/* protocol dissector client can associate with conversation */
-
+	gboolean is_old_dissector;	/* XXX - nuke when everybody tvbuffified */
+	union {
+		old_dissector_t	old;
+		dissector_t	new;
+	} dissector; 			/* protocol dissector client can associate with conversation */
 } conversation_t;
 
 extern void conversation_init(void);
@@ -44,7 +47,13 @@ conversation_t *conversation_new(address *src, address *dst, port_type ptype,
 conversation_t *find_conversation(address *src, address *dst, port_type ptype,
     guint32 src_port, guint32 dst_port);
 
-dissector_t find_conversation_dissector(address *src, address *dst, port_type ptype,
-    guint32 src_port, guint32 dst_port);
+gboolean
+old_try_conversation_dissector(address *src, address *dst, port_type ptype,
+    guint32 src_port, guint32 dst_port, const u_char *pd, int offset,
+    frame_data *fd, proto_tree *tree);
+gboolean
+try_conversation_dissector(address *src, address *dst, port_type ptype,
+    guint32 src_port, guint32 dst_port, tvbuff_t *tvb, packet_info *pinfo,
+    proto_tree *tree);
 
 #endif /* conversation.h */