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-netanalyzer.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-netanalyzer.c')
| -rw-r--r-- | epan/dissectors/packet-netanalyzer.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-netanalyzer.c b/epan/dissectors/packet-netanalyzer.c index cb515276d4..d5ba327c71 100644 --- a/epan/dissectors/packet-netanalyzer.c +++ b/epan/dissectors/packet-netanalyzer.c @@ -110,7 +110,6 @@ static const value_string gpio_edge_vals[] = { static dissector_handle_t eth_dissector_handle; -static dissector_handle_t data_dissector_handle; static gint proto_netanalyzer = -1; @@ -341,7 +340,7 @@ dissect_netanalyzer_transparent(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t transparent_payload_tree = proto_tree_add_subtree(tree, tvb, 4, tvb_captured_length(tvb)-4, ett_netanalyzer_transparent, NULL, "Raw packet data"); next_tvb = tvb_new_subset_remaining(tvb, 4); - call_dissector(data_dissector_handle, next_tvb, pinfo, transparent_payload_tree); + call_data_dissector(next_tvb, pinfo, transparent_payload_tree); col_set_str(pinfo->cinfo, COL_PROTOCOL, "netANALYZER"); col_set_str(pinfo->cinfo, COL_INFO, "Frame captured in transparent mode"); @@ -462,7 +461,6 @@ void proto_reg_handoff_netanalyzer(void) dissector_handle_t netana_handle_transparent; eth_dissector_handle = find_dissector_add_dependency("eth_withfcs", proto_netanalyzer); - data_dissector_handle = find_dissector("data"); netana_handle = create_dissector_handle(dissect_netanalyzer, proto_netanalyzer); netana_handle_transparent = create_dissector_handle(dissect_netanalyzer_transparent, proto_netanalyzer); |