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-giop.c | |
| parent | 2b2fc64447e5f778d969e6c850e9196d248cbbe1 (diff) | |
| download | wireshark-1e60d63c8c6882c8c0bdb00cf6df594e1bb6fccf.tar.gz | |
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-giop.c')
| -rw-r--r-- | epan/dissectors/packet-giop.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index 752aa48dc8..b4515790e4 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -502,7 +502,6 @@ static const int *giop_message_flags[] = { NULL }; -static dissector_handle_t data_handle; static dissector_handle_t giop_tcp_handle; #define GIOP_MESSAGE_FLAGS_ZIOP_ENABLED 0x08 @@ -4735,7 +4734,7 @@ static int dissect_giop_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree header.GIOP_version.major, header.GIOP_version.minor); payload_tvb = tvb_new_subset_remaining (tvb, GIOP_HEADER_SIZE); - call_dissector(data_handle, payload_tvb, pinfo, tree); + call_data_dissector(payload_tvb, pinfo, tree); return tvb_captured_length(tvb); } @@ -5566,7 +5565,6 @@ proto_register_giop (void) void proto_reg_handoff_giop (void) { - data_handle = find_dissector("data"); heur_dissector_add("tcp", dissect_giop_heur, "GIOP over TCP", "giop_tcp", proto_giop, HEURISTIC_ENABLE); /* Support DIOP (GIOP/UDP) */ heur_dissector_add("udp", dissect_giop_heur, "DIOP (GIOP/UDP)", "giop_udp", proto_giop, HEURISTIC_ENABLE); |