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-rpcap.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-rpcap.c')
| -rw-r--r-- | epan/dissectors/packet-rpcap.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c index 26ff59a0e6..fc510cba76 100644 --- a/epan/dissectors/packet-rpcap.c +++ b/epan/dissectors/packet-rpcap.c @@ -216,7 +216,6 @@ static expert_field ei_no_more_data = EI_INIT; static expert_field ei_caplen_too_big = EI_INIT; static dissector_handle_t pcap_pktdata_handle; -static dissector_handle_t data_handle; /* User definable values */ static gboolean rpcap_desegment = TRUE; @@ -900,7 +899,7 @@ dissect_rpcap_packet (tvbuff_t *tvb, packet_info *pinfo, proto_tree *top_tree, if (linktype == -1) { proto_item_append_text (ti, ", Unknown link-layer type"); } - call_dissector (data_handle, new_tvb, pinfo, top_tree); + call_data_dissector(new_tvb, pinfo, top_tree); } } @@ -987,7 +986,7 @@ dissect_rpcap (tvbuff_t *tvb, packet_info *pinfo, proto_tree *top_tree, void* da /* Yet unknown, dump as data */ proto_item_set_len (ti, 8); new_tvb = tvb_new_subset_remaining (tvb, offset); - call_dissector (data_handle, new_tvb, pinfo, top_tree); + call_data_dissector(new_tvb, pinfo, top_tree); } break; } @@ -1484,7 +1483,6 @@ proto_reg_handoff_rpcap (void) if (!rpcap_prefs_initialized) { pcap_pktdata_handle = find_dissector_add_dependency("pcap_pktdata", proto_rpcap); - data_handle = find_dissector ("data"); rpcap_prefs_initialized = TRUE; heur_dissector_add ("tcp", dissect_rpcap_heur_tcp, "RPCAP over TCP", "rpcap_tcp", proto_rpcap, HEURISTIC_ENABLE); |