diff options
author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-11-29 05:16:15 +0000 |
---|---|---|
committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-11-29 05:16:15 +0000 |
commit | d673500082461b67f57914dca6176447f73f6c27 (patch) | |
tree | 5469fa22c76501813519d37f54fc09a373e07c8c /packet-ascend.c | |
parent | d6d2a9ccc99fadfb5a0fd6b1c9052bf6c2bcdb54 (diff) | |
download | wireshark-d673500082461b67f57914dca6176447f73f6c27.tar.gz wireshark-d673500082461b67f57914dca6176447f73f6c27.tar.bz2 wireshark-d673500082461b67f57914dca6176447f73f6c27.zip |
Wrap the dissect_fddi() call (with a 4th argument) with
dissect_fddi_not_bitswapped() and dissect_fddi_bitswapped(), both of which
use the standard 3-argument tvbuffified-dissector argument list.
Add a dissector table called "wtap_encap" which is used to call dissectors
from dissect_frame(). The switch() statement from this top-level dissector
is removed.
The link-layer dissectors register themselves with the "wtap_encap"
dissector table. The dissectors are now static where possible.
svn path=/trunk/; revision=2708
Diffstat (limited to 'packet-ascend.c')
-rw-r--r-- | packet-ascend.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-ascend.c b/packet-ascend.c index 2efc22061c..8a5a7e0d8b 100644 --- a/packet-ascend.c +++ b/packet-ascend.c @@ -1,7 +1,7 @@ /* packet-ascend.c * Routines for decoding Lucent/Ascend packet traces * - * $Id: packet-ascend.c,v 1.20 2000/11/19 08:53:54 guy Exp $ + * $Id: packet-ascend.c,v 1.21 2000/11/29 05:16:14 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -32,7 +32,6 @@ #include <glib.h> #include <string.h> #include "packet.h" -#include "packet-ascend.h" static int proto_ascend = -1; static int hf_link_type = -1; @@ -53,7 +52,7 @@ static const value_string encaps_vals[] = { static dissector_handle_t eth_handle; static dissector_handle_t ppp_handle; -void +static void dissect_ascend(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *fh_tree; @@ -157,4 +156,5 @@ proto_reg_handoff_ascend(void) */ eth_handle = find_dissector("eth"); ppp_handle = find_dissector("ppp"); + dissector_add("wtap_encap", WTAP_ENCAP_ASCEND, dissect_ascend); } |