diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-01-09 09:59:28 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-01-09 09:59:28 +0000 |
| commit | 0998433430070846a7b7f16975bae136dc7cb489 (patch) | |
| tree | b4f19995d9968d6add3313338ba37fb7eb8b7b1e /packet-sll.c | |
| parent | 0ae122c3a9da2ffb83cfb5d0744cd4e48f1c451c (diff) | |
| download | wireshark-0998433430070846a7b7f16975bae136dc7cb489.tar.gz wireshark-0998433430070846a7b7f16975bae136dc7cb489.tar.bz2 wireshark-0998433430070846a7b7f16975bae136dc7cb489.zip | |
Register the IPX dissector, make it static, and call it through a
handle.
Call the IP dissector through a handle in the Frame Relay dissector.
svn path=/trunk/; revision=2851
Diffstat (limited to 'packet-sll.c')
| -rw-r--r-- | packet-sll.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/packet-sll.c b/packet-sll.c index 7f053e3f83..2e82af1d62 100644 --- a/packet-sll.c +++ b/packet-sll.c @@ -1,7 +1,7 @@ /* packet-sll.c * Routines for disassembly of packets from Linux "cooked mode" captures * - * $Id: packet-sll.c,v 1.4 2001/01/09 06:31:43 guy Exp $ + * $Id: packet-sll.c,v 1.5 2001/01/09 09:59:28 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -87,6 +87,7 @@ static const value_string ltype_vals[] = { { 0, NULL } }; +static dissector_handle_t ipx_handle; static dissector_handle_t llc_handle; void @@ -215,7 +216,7 @@ dissect_sll(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * Novell IPX inside 802.3 with no 802.2 LLC * header. */ - dissect_ipx(next_tvb, pinfo, tree); + call_dissector(ipx_handle, next_tvb, pinfo, tree); break; default: @@ -316,9 +317,10 @@ void proto_reg_handoff_sll(void) { /* - * Get a handle for the LLC dissector. + * Get handles for the IPX and LLC dissectors. */ llc_handle = find_dissector("llc"); + ipx_handle = find_dissector("ipx"); dissector_add("wtap_encap", WTAP_ENCAP_SLL, dissect_sll, proto_sll); } |