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-atm.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-atm.c')
| -rw-r--r-- | packet-atm.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/packet-atm.c b/packet-atm.c index 223cb1543d..8ce586b955 100644 --- a/packet-atm.c +++ b/packet-atm.c @@ -1,7 +1,7 @@ /* packet-atm.c * Routines for ATM packet disassembly * - * $Id: packet-atm.c,v 1.27 2000/11/19 08:53:55 guy Exp $ + * $Id: packet-atm.c,v 1.28 2000/11/29 05:16:15 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -37,7 +37,6 @@ #include "oui.h" #include "resolv.h" -#include "packet-atm.h" #include "packet-eth.h" #include "packet-llc.h" #include "packet-snmp.h" @@ -556,7 +555,7 @@ atm_guess_content(tvbuff_t *tvb, packet_info *pinfo) } } -void +static void dissect_atm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *atm_tree; @@ -790,3 +789,9 @@ proto_register_atm(void) proto_atm_lane = proto_register_protocol("ATM LANE", "lane"); proto_register_subtree_array(ett, array_length(ett)); } + +void +proto_reg_handoff_atm(void) +{ + dissector_add("wtap_encap", WTAP_ENCAP_ATM_SNIFFER, dissect_atm); +} |