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-icmpv6.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-icmpv6.c')
| -rw-r--r-- | epan/dissectors/packet-icmpv6.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index d60239dfa9..5d623e5385 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -562,7 +562,6 @@ static expert_field ei_icmpv6_rpl_p2p_dro_zero = EI_INIT; static dissector_handle_t icmpv6_handle; static dissector_handle_t ipv6_handle; -static dissector_handle_t data_handle; #define ICMP6_DST_UNREACH 1 #define ICMP6_PACKET_TOO_BIG 2 @@ -1185,7 +1184,7 @@ dissect_contained_icmpv6(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr /* The contained packet is an IPv6 datagram; dissect it. */ offset += call_dissector(ipv6_handle, next_tvb, pinfo, tree); } else - offset += call_dissector(data_handle, next_tvb, pinfo, tree); + offset += call_data_dissector(next_tvb, pinfo, tree); /* Restore the "we're inside an error packet" flag. */ pinfo->flags.in_error_pkt = save_in_error_pkt; @@ -3634,7 +3633,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } } next_tvb = tvb_new_subset_remaining(tvb, offset); - offset += call_dissector(data_handle, next_tvb, pinfo, icmp6_tree); + offset += call_data_dissector(next_tvb, pinfo, icmp6_tree); } } @@ -5371,7 +5370,6 @@ proto_reg_handoff_icmpv6(void) * Get a handle for the IPv6 dissector. */ ipv6_handle = find_dissector_add_dependency("ipv6", proto_icmpv6); - data_handle = find_dissector("data"); } /* |