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-aeron.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-aeron.c')
-rw-r--r-- | epan/dissectors/packet-aeron.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-aeron.c b/epan/dissectors/packet-aeron.c index 20a05657ac..d89eb0fde3 100644 --- a/epan/dissectors/packet-aeron.c +++ b/epan/dissectors/packet-aeron.c @@ -42,7 +42,6 @@ static int proto_aeron = -1; /* Dissector handles */ static dissector_handle_t aeron_dissector_handle; -static dissector_handle_t aeron_data_dissector_handle; static heur_dissector_list_t aeron_heuristic_subdissector_list; /*----------------------------------------------------------------------------*/ @@ -2403,7 +2402,7 @@ static int dissect_aeron_data(tvbuff_t * tvb, int offset, packet_info * pinfo, p } if (!dissector_found) { - call_dissector(aeron_data_dissector_handle, data_tvb, pinfo, subtree); + call_data_dissector(data_tvb, pinfo, subtree); } } aeron_sequence_report(tvb, pinfo, subtree, transport, &pktinfo, finfo); @@ -3135,7 +3134,6 @@ void proto_reg_handoff_aeron(void) aeron_dissector_handle = create_dissector_handle(dissect_aeron, proto_aeron); dissector_add_for_decode_as("udp.port", aeron_dissector_handle); heur_dissector_add("udp", test_aeron_packet, "Aeron over UDP", "aeron_udp", proto_aeron, HEURISTIC_DISABLE); - aeron_data_dissector_handle = find_dissector("data"); } /* |