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-turbocell.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-turbocell.c')
| -rw-r--r-- | epan/dissectors/packet-turbocell.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c index 1cf6824e7b..ad81e939ef 100644 --- a/epan/dissectors/packet-turbocell.c +++ b/epan/dissectors/packet-turbocell.c @@ -80,8 +80,6 @@ static gint ett_msdu_aggregation_subframe_tree = -1; /* The ethernet dissector we hand off to */ static dissector_handle_t eth_handle; -static dissector_handle_t data_handle; - static const value_string turbocell_type_values[] = { { TURBOCELL_TYPE_BEACON_NON_POLLING, "Beacon (Non-Polling Base Station)" }, { TURBOCELL_TYPE_BEACON_NORMAL, "Beacon (Normal Base Station)" }, @@ -178,7 +176,7 @@ dissect_turbocell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat /*Couldn't make sense of the apparently random data in the end*/ next_tvb = tvb_new_subset_remaining(tvb, 0x34 + 8*i); - call_dissector(data_handle, next_tvb, pinfo, tree); + call_data_dissector(next_tvb, pinfo, tree); } else { @@ -222,7 +220,7 @@ dissect_turbocell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat if (remaining_length > 2) { next_tvb = tvb_new_subset_remaining(next_tvb, msdu_offset); - call_dissector(data_handle, next_tvb, pinfo, tree); + call_data_dissector(next_tvb, pinfo, tree); } } } @@ -340,7 +338,6 @@ void proto_register_turbocell(void) void proto_reg_handoff_turbocell(void) { eth_handle = find_dissector_add_dependency("eth_withoutfcs", proto_turbocell); - data_handle = find_dissector("data"); } /* |