diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-01-09 09:59:28 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-01-09 09:59:28 +0000 |
| commit | c25c23463fb2f25e836c9100140a6e70bcd164ea (patch) | |
| tree | b4f19995d9968d6add3313338ba37fb7eb8b7b1e /packet-eth.c | |
| parent | 873b52ac1cdd52af0153b2aeb22af12143a34248 (diff) | |
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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2851 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-eth.c')
| -rw-r--r-- | packet-eth.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/packet-eth.c b/packet-eth.c index 653b55ef69..0370982d27 100644 --- a/packet-eth.c +++ b/packet-eth.c @@ -1,7 +1,7 @@ /* packet-eth.c * Routines for ethernet packet disassembly * - * $Id: packet-eth.c,v 1.54 2001/01/09 06:31:35 guy Exp $ + * $Id: packet-eth.c,v 1.55 2001/01/09 09:59:28 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -55,6 +55,7 @@ static gint ett_ieee8023 = -1; static gint ett_ether2 = -1; static dissector_handle_t isl_handle; +static dissector_handle_t ipx_handle; static dissector_handle_t llc_handle; #define ETH_HEADER_SIZE 14 @@ -302,7 +303,7 @@ dissect_eth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (ethhdr_type) { case ETHERNET_802_3: - dissect_ipx(next_tvb, pinfo, tree); + call_dissector(ipx_handle, next_tvb, pinfo, tree); break; case ETHERNET_802_2: call_dissector(llc_handle, next_tvb, pinfo, tree); @@ -387,9 +388,10 @@ void proto_reg_handoff_eth(void) { /* - * Get handles for the ISL and LLC dissectors. + * Get handles for the ISL, IPX, and LLC dissectors. */ isl_handle = find_dissector("isl"); + ipx_handle = find_dissector("ipx"); llc_handle = find_dissector("llc"); dissector_add("wtap_encap", WTAP_ENCAP_ETHERNET, dissect_eth, |