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-lwapp.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-lwapp.c')
| -rw-r--r-- | epan/dissectors/packet-lwapp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c index 7e3c70fc97..09007fde95 100644 --- a/epan/dissectors/packet-lwapp.c +++ b/epan/dissectors/packet-lwapp.c @@ -63,7 +63,6 @@ static gint hf_lwapp_control_length = -1; static dissector_handle_t eth_withoutfcs_handle; static dissector_handle_t wlan_handle; static dissector_handle_t wlan_bsfc_handle; -static dissector_handle_t data_handle; /* Set by preferences */ static gboolean swap_frame_control; @@ -301,7 +300,7 @@ dissect_control(tvbuff_t *tvb, packet_info *pinfo, /* Dissect rest of packet as data */ next_tvb = tvb_new_subset_remaining(tvb, offset); - call_dissector(data_handle,next_tvb, pinfo, tree); + call_data_dissector(next_tvb, pinfo, tree); } } /* dissect_control */ @@ -546,7 +545,6 @@ proto_reg_handoff_lwapp(void) eth_withoutfcs_handle = find_dissector_add_dependency("eth_withoutfcs", proto_lwapp); wlan_handle = find_dissector_add_dependency("wlan_withoutfcs", proto_lwapp); wlan_bsfc_handle = find_dissector_add_dependency("wlan_bsfc", proto_lwapp); - data_handle = find_dissector("data"); /* This dissector assumes lwapp packets in an 802.3 frame */ lwapp_l3_handle = create_dissector_handle(dissect_lwapp_l3, proto_lwapp_l3); |