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-ossp.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-ossp.c')
-rw-r--r-- | epan/dissectors/packet-ossp.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ossp.c b/epan/dissectors/packet-ossp.c index 355add2658..3f40f0fac6 100644 --- a/epan/dissectors/packet-ossp.c +++ b/epan/dissectors/packet-ossp.c @@ -197,8 +197,6 @@ static expert_field ei_esmc_version_compliance = EI_INIT; static expert_field ei_esmc_tlv_length_bad = EI_INIT; static expert_field ei_esmc_reserved_not_zero = EI_INIT; -static dissector_handle_t dh_data; - static void dissect_esmc_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *treex); @@ -538,7 +536,7 @@ dissect_esmc_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *treex) { proto_tree* tree_b; tree_b = proto_item_add_subtree(item_b, ett_esmc); - call_dissector(dh_data, tvb_next, pinfo, tree_b); + call_data_dissector(tvb_next, pinfo, tree_b); } } } @@ -694,8 +692,6 @@ proto_reg_handoff_ossp(void) ossp_handle = create_dissector_handle(dissect_ossp_pdu, proto_ossp); dissector_add_uint("slow.subtype", OSSP_SUBTYPE, ossp_handle); - - dh_data = find_dissector("data"); } /* |