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-netbios.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-netbios.c')
| -rw-r--r-- | epan/dissectors/packet-netbios.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c index 7da3f3470b..5dc1b97ee4 100644 --- a/epan/dissectors/packet-netbios.c +++ b/epan/dissectors/packet-netbios.c @@ -154,8 +154,6 @@ static const fragment_items netbios_frag_items = { "fragments" }; -static dissector_handle_t data_handle; - /* The strings for the station type, used by get_netbios_name function; many of them came from the file "NetBIOS.txt" in the Zip archive at @@ -1076,7 +1074,7 @@ dissect_netbios_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ if (!dissector_try_heuristic(netbios_heur_subdissector_list, tvb, pinfo, tree, &hdtbl_entry, NULL)) - call_dissector(data_handle,tvb, pinfo, tree); + call_data_dissector(tvb, pinfo, tree); } static int @@ -1233,8 +1231,7 @@ dissect_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data dissect_netbios_payload(next_tvb, pinfo, tree); else { next_tvb = tvb_new_subset_remaining (tvb, offset); - call_dissector(data_handle, next_tvb, pinfo, - tree); + call_data_dissector(next_tvb, pinfo, tree); } break; } @@ -1491,7 +1488,6 @@ proto_reg_handoff_netbios(void) proto_netbios); dissector_add_uint("llc.dsap", SAP_NETBIOS, netbios_handle); register_capture_dissector("llc.dsap", SAP_NETBIOS, capture_netbios, proto_netbios); - data_handle = find_dissector("data"); } |