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

diff --git a/packet-eth.c b/packet-eth.c
index 65ce8b3c1b..4f5ff0995a 100644
--- a/packet-eth.c
+++ b/packet-eth.c
@@ -1,7 +1,7 @@
 /* packet-eth.c
  * Routines for ethernet packet disassembly
  *
- * $Id: packet-eth.c,v 1.42 2000/05/31 05:07:03 guy Exp $
+ * $Id: packet-eth.c,v 1.43 2000/08/07 03:20:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -170,10 +170,10 @@ dissect_eth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   src = tvb_get_ptr(tvb, 6, 6);
   dst = tvb_get_ptr(tvb, 0, 6);
-  SET_ADDRESS(&pi.dl_src,	AT_ETHER, 6, src);
-  SET_ADDRESS(&pi.src,		AT_ETHER, 6, src);
-  SET_ADDRESS(&pi.dl_dst,	AT_ETHER, 6, dst);
-  SET_ADDRESS(&pi.dst,		AT_ETHER, 6, dst);
+  SET_ADDRESS(&pinfo->dl_src,	AT_ETHER, 6, src);
+  SET_ADDRESS(&pinfo->src,	AT_ETHER, 6, src);
+  SET_ADDRESS(&pinfo->dl_dst,	AT_ETHER, 6, dst);
+  SET_ADDRESS(&pinfo->dst,	AT_ETHER, 6, dst);
 
   etype = tvb_get_ntohs(tvb, 12);
 
@@ -280,10 +280,10 @@ dissect_eth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   switch (ethhdr_type) {
     case ETHERNET_802_3:
-      dissect_ipx(pd, eth_offset, pinfo->fd, tree);
+      dissect_ipx(next_tvb, pinfo, tree);
       break;
     case ETHERNET_802_2:
-      dissect_llc(next_tvb, &pi, tree);
+      dissect_llc(next_tvb, pinfo, tree);
       break;
     case ETHERNET_II:
       ethertype(etype, tvb, ETH_HEADER_SIZE, pinfo, tree, fh_tree, hf_eth_type);