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-gre.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-gre.c')
| -rw-r--r-- | packet-gre.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/packet-gre.c b/packet-gre.c index 3162db06c9..fc79ce9405 100644 --- a/packet-gre.c +++ b/packet-gre.c @@ -2,7 +2,7 @@ * Routines for the Generic Routing Encapsulation (GRE) protocol * Brad Robel-Forrest <brad.robel-forrest@watchguard.com> * - * $Id: packet-gre.c,v 1.36 2001/01/09 06:31:36 guy Exp $ + * $Id: packet-gre.c,v 1.37 2001/01/09 09:59:28 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -80,6 +80,7 @@ static const value_string typevals[] = { }; static dissector_handle_t ip_handle; +static dissector_handle_t ipx_handle; static dissector_handle_t ppp_handle; static dissector_handle_t fr_handle; @@ -273,7 +274,7 @@ dissect_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector(ip_handle, next_tvb, pinfo, tree); break; case GRE_IPX: - dissect_ipx(next_tvb, pinfo, tree); + call_dissector(ipx_handle, next_tvb, pinfo, tree); break; case GRE_FR: call_dissector(fr_handle, next_tvb, pinfo, tree); @@ -387,9 +388,10 @@ proto_reg_handoff_gre(void) dissector_add("ip.proto", IP_PROTO_GRE, dissect_gre, proto_gre); /* - * Get handles for the IP, PPP, and Frame Relay dissectors. + * Get handles for the IP, IPX, PPP, and Frame Relay dissectors. */ ip_handle = find_dissector("ip"); + ipx_handle = find_dissector("ipx"); ppp_handle = find_dissector("ppp"); fr_handle = find_dissector("fr"); } |