diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-01-03 10:34:42 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-01-03 10:34:42 +0000 |
| commit | b151ddecbb6800271e1cc2b8b0d2bb355dadbe89 (patch) | |
| tree | b9e74ab80383b0add3d88c281308f9fb06f0b32e /packet-tr.c | |
| parent | b92ebd4a23fb75f3972527609abd4f8360489805 (diff) | |
Have the TR MAC and LLC dissectors register themselves, make them
static, and have other dissectors call them through handles.
svn path=/trunk/; revision=2816
Diffstat (limited to 'packet-tr.c')
| -rw-r--r-- | packet-tr.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/packet-tr.c b/packet-tr.c index 64ae7ed87c..8d8698d069 100644 --- a/packet-tr.c +++ b/packet-tr.c @@ -2,7 +2,7 @@ * Routines for Token-Ring packet disassembly * Gilbert Ramirez <gram@xiexie.org> * - * $Id: packet-tr.c,v 1.53 2001/01/03 06:55:34 guy Exp $ + * $Id: packet-tr.c,v 1.54 2001/01/03 10:34:41 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -38,7 +38,6 @@ #include "packet.h" #include "packet-tr.h" #include "packet-llc.h" -#include "packet-trmac.h" static int proto_tr = -1; static int hf_tr_dst = -1; @@ -117,6 +116,9 @@ static const value_string direction_vals[] = { { 0, NULL } }; +static dissector_handle_t trmac_handle; +static dissector_handle_t llc_handle; + /* * DODGY LINUX HACK DODGY LINUX HACK * Linux 2.0.x always passes frames to the Token Ring driver for transmission with @@ -522,10 +524,10 @@ dissect_tr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (frame_type) { /* MAC */ case 0: - dissect_trmac(next_tvb, pinfo, tree); + call_dissector(trmac_handle, next_tvb, pinfo, tree); break; case 1: - dissect_llc(next_tvb, pinfo, tree); + call_dissector(llc_handle, next_tvb, pinfo, tree); break; default: /* non-MAC, non-LLC, i.e., "Reserved" */ @@ -674,5 +676,11 @@ proto_register_tr(void) void proto_reg_handoff_tr(void) { + /* + * Get handles for the TR MAC and LLC dissectors. + */ + trmac_handle = find_dissector("trmac"); + llc_handle = find_dissector("llc"); + dissector_add("wtap_encap", WTAP_ENCAP_TOKEN_RING, dissect_tr); } |