diff options
author | Michael Mann <mmann78@netscape.net> | 2016-03-19 20:33:14 -0400 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2016-03-20 17:38:03 +0000 |
commit | 1e60d63c8c6882c8c0bdb00cf6df594e1bb6fccf (patch) | |
tree | 4147c4f2bee3b93c250a49fa8ec337072c80e713 /epan/dissectors/packet-ipx.c | |
parent | 2b2fc64447e5f778d969e6c850e9196d248cbbe1 (diff) |
Create call_data_dissector() to call data dissector.
This saves many dissectors the need to find the data dissector and store a handle to it.
There were also some that were finding it, but not using it.
For others this was the only reason for their handoff function, so it could be eliminated.
Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b
Reviewed-on: https://code.wireshark.org/review/14530
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ipx.c')
-rw-r--r-- | epan/dissectors/packet-ipx.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index 85eb2fff5b..4ebb8597a0 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.c @@ -138,8 +138,6 @@ static int proto_ipxmsg = -1; static int hf_msg_conn = -1; static int hf_msg_sigchar = -1; -static dissector_handle_t data_handle; - #define UDP_PORT_IPX 213 /* RFC 1234 */ #define IPX_HEADER_LEN 30 /* It's *always* 30 bytes */ @@ -444,7 +442,7 @@ dissect_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) pinfo, tree, FALSE, ipxh)) return tvb_captured_length(tvb); - call_dissector(data_handle,next_tvb, pinfo, tree); + call_data_dissector(next_tvb, pinfo, tree); return tvb_captured_length(tvb); } /* ================================================================= */ @@ -860,7 +858,7 @@ dissect_spx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { return tvb_captured_length(tvb); } - call_dissector(data_handle, next_tvb, pinfo, tree); + call_data_dissector(next_tvb, pinfo, tree); } return tvb_captured_length(tvb); } @@ -1631,7 +1629,6 @@ proto_reg_handoff_ipx(void) register_capture_dissector("sll.ltype", LINUX_SLL_P_802_3, capture_ipx, proto_ipx); register_capture_dissector("llc.dsap", SAP_NETWARE1, capture_ipx, proto_ipx); register_capture_dissector("llc.dsap", SAP_NETWARE2, capture_ipx, proto_ipx); - data_handle = find_dissector("data"); } /* |