diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-05-27 04:50:51 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-05-27 04:50:51 +0000 |
| commit | 0dac81e3125a7fa7ab60504e377fec40aadaab47 (patch) | |
| tree | dadb3a3c2b0079990240096a3126a3066c09f050 /packet-atm.c | |
| parent | 6f80d501efb595b5bb6080449960f553f6fef889 (diff) | |
Call the SSCOP dissector through a handle. That lets us get rid of the
CHECK_DISPLAY_AS_DATA call and code to set "pinfo->current_proto", as
"call_dissector()" does that for us.
svn path=/trunk/; revision=3457
Diffstat (limited to 'packet-atm.c')
| -rw-r--r-- | packet-atm.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/packet-atm.c b/packet-atm.c index 1ba40260c7..1c438c21c8 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.33 2001/04/15 07:30:02 guy Exp $ + * $Id: packet-atm.c,v 1.34 2001/05/27 04:50:51 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -38,7 +38,6 @@ #include "resolv.h" #include "packet-snmp.h" -#include "packet-sscop.h" static int proto_atm = -1; static int hf_atm_vpi = -1; @@ -57,6 +56,7 @@ static gint ett_ilmi = -1; static dissector_handle_t eth_handle; static dissector_handle_t tr_handle; static dissector_handle_t llc_handle; +static dissector_handle_t sscop_handle; /* * See @@ -716,7 +716,7 @@ dissect_atm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (aal_type) { case ATT_AAL_SIGNALLING: - dissect_sscop(tvb, pinfo, tree); + call_dissector(sscop_handle, tvb, pinfo, tree); break; case ATT_AAL5: @@ -789,11 +789,13 @@ void proto_reg_handoff_atm(void) { /* - * Get handles for the Ethernet, Token Ring, and LLC dissectors. + * Get handles for the Ethernet, Token Ring, LLC, and SSCOP + * dissectors. */ eth_handle = find_dissector("eth"); tr_handle = find_dissector("tr"); llc_handle = find_dissector("llc"); + sscop_handle = find_dissector("sscop"); dissector_add("wtap_encap", WTAP_ENCAP_ATM_SNIFFER, dissect_atm, proto_atm); |