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-ip.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-ip.c')
-rw-r--r-- | epan/dissectors/packet-ip.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index aa0368b328..6bcabf9266 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -289,7 +289,6 @@ static heur_dissector_list_t heur_subdissector_list; static dissector_table_t ip_dissector_table; static dissector_handle_t ipv6_handle; -static dissector_handle_t data_handle; /* IP structs and definitions */ @@ -2460,7 +2459,7 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* ipfd_head->reassembled_in); } - call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo, + call_data_dissector(tvb_new_subset_remaining(tvb, offset), pinfo, parent_tree); pinfo->fragmented = save_fragmented; return tvb_captured_length(tvb); @@ -2480,7 +2479,7 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* col_add_fstr(pinfo->cinfo, COL_INFO, "%s (%u)", ipprotostr(iph->ip_p), iph->ip_p); } - call_dissector(data_handle,next_tvb, pinfo, parent_tree); + call_data_dissector(next_tvb, pinfo, parent_tree); } } pinfo->fragmented = save_fragmented; @@ -3179,7 +3178,6 @@ proto_reg_handoff_ip(void) ip_handle = find_dissector("ip"); ipv6_handle = find_dissector("ipv6"); - data_handle = find_dissector("data"); ipv4_handle = create_dissector_handle(dissect_ip_v4, proto_ip); dissector_add_uint("ethertype", ETHERTYPE_IP, ipv4_handle); |