diff options
author | gram <gram@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-11-29 05:16:15 +0000 |
---|---|---|
committer | gram <gram@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-11-29 05:16:15 +0000 |
commit | fdb1111e958124a68463e3c76a66c621d7d26915 (patch) | |
tree | 5469fa22c76501813519d37f54fc09a373e07c8c /packet-lapd.c | |
parent | f9fd8376e4516c310d9b8e3074892f14e9251dfa (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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2708 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-lapd.c')
-rw-r--r-- | packet-lapd.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/packet-lapd.c b/packet-lapd.c index 592c8f5ed6..7941c6c090 100644 --- a/packet-lapd.c +++ b/packet-lapd.c @@ -2,7 +2,7 @@ * Routines for LAPD frame disassembly * Gilbert Ramirez <gram@xiexie.org> * - * $Id: packet-lapd.c,v 1.16 2000/11/19 08:53:59 guy Exp $ + * $Id: packet-lapd.c,v 1.17 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-lapd.h" #include "packet-q931.h" #include "xdlc.h" @@ -83,7 +82,7 @@ static const value_string lapd_sapi_vals[] = { { 0, NULL } }; -void +static void dissect_lapd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *lapd_tree, *addr_tree; @@ -202,3 +201,9 @@ proto_register_lapd(void) proto_register_field_array (proto_lapd, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); } + +void +proto_reg_handoff_lapd(void) +{ + dissector_add("wtap_encap", WTAP_ENCAP_LAPD, dissect_lapd); +} |