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-geneve.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-geneve.c')
-rw-r--r-- | epan/dissectors/packet-geneve.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-geneve.c b/epan/dissectors/packet-geneve.c index 39fe82249f..58461c4599 100644 --- a/epan/dissectors/packet-geneve.c +++ b/epan/dissectors/packet-geneve.c @@ -83,7 +83,6 @@ static expert_field ei_geneve_ver_unknown = EI_INIT; static expert_field ei_geneve_opt_len_invalid = EI_INIT; static dissector_table_t ethertype_dissector_table; -static dissector_handle_t data_handle; static void print_flags(guint8 flags, proto_item *flag_item) @@ -311,7 +310,7 @@ dissect_geneve(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ next_tvb = tvb_new_subset_remaining(tvb, offset); if (!dissector_try_uint(ethertype_dissector_table, proto_type, next_tvb, pinfo, tree)) - call_dissector(data_handle, next_tvb, pinfo, tree); + call_data_dissector(next_tvb, pinfo, tree); return tvb_captured_length(tvb); } @@ -451,7 +450,6 @@ proto_reg_handoff_geneve(void) dissector_add_for_decode_as("udp.port", geneve_handle); ethertype_dissector_table = find_dissector_table("ethertype"); - data_handle = find_dissector("data"); } /* |