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-v120.c | |
| parent | d6d2a9ccc99fadfb5a0fd6b1c9052bf6c2bcdb54 (diff) | |
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-v120.c')
| -rw-r--r-- | packet-v120.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/packet-v120.c b/packet-v120.c index 3847180bb5..c0a1223aa1 100644 --- a/packet-v120.c +++ b/packet-v120.c @@ -2,7 +2,7 @@ * Routines for v120 frame disassembly * Bert Driehuis <driehuis@playbeing.org> * - * $Id: packet-v120.c,v 1.14 2000/11/19 08:54:10 guy Exp $ + * $Id: packet-v120.c,v 1.15 2000/11/29 05:16:15 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -36,7 +36,6 @@ #include <glib.h> #include <string.h> #include "packet.h" -#include "packet-v120.h" #include "xdlc.h" #define FROM_DCE 0x80 @@ -53,7 +52,7 @@ static gint ett_v120_header = -1; static int dissect_v120_header(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree); -void +static void dissect_v120(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *v120_tree, *tc, *address_tree; @@ -231,3 +230,9 @@ proto_register_v120(void) proto_register_field_array (proto_v120, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); } + +void +proto_reg_handoff_v120(void) +{ + dissector_add("wtap_encap", WTAP_ENCAP_V120, dissect_v120); +} |