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

diff --git a/packet-syslog.c b/packet-syslog.c
index d04530b181..1935d2a997 100644
--- a/packet-syslog.c
+++ b/packet-syslog.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000, Gerald Combs <gerald@zing.org>
  *
- * $Id: packet-syslog.c,v 1.4 2000/06/18 22:12:14 gerald Exp $
+ * $Id: packet-syslog.c,v 1.5 2000/08/07 03:21:14 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -136,20 +136,8 @@ static gint ett_syslog = -1;
    upper five bits are the facility.  T is the message text.
  */
 
-#if 0
 static void dissect_syslog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  gint pri = -1, lev, fac;
-  gint msg_off = 0, msg_len;
-  gint ellipsis_len = (COL_INFO_LEN - strlen(ELLIPSIS)) - 1;
-  proto_item *ti;
-  proto_tree *syslog_tree;
-  gchar msg_str[COL_INFO_LEN];
-#else
-static void dissect_syslog(const u_char *pd, int o, frame_data *fd, proto_tree *tree)
-{
-  packet_info	*pinfo = &pi;
-  tvbuff_t	*tvb = tvb_create_from_top(o);
   gint pri = -1, lev = -1, fac = -1;
   gint msg_off = 0, msg_len;
   gint ellipsis_len = (COL_INFO_LEN - strlen(ELLIPSIS)) - 1;
@@ -157,8 +145,6 @@ static void dissect_syslog(const u_char *pd, int o, frame_data *fd, proto_tree *
   proto_tree *syslog_tree;
   gchar msg_str[COL_INFO_LEN];
 
-#endif
-
   pinfo->current_proto = "Syslog";
   msg_len = tvb_length(tvb);