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-quake.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-quake.c')
| -rw-r--r-- | epan/dissectors/packet-quake.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-quake.c b/epan/dissectors/packet-quake.c index 456d7a3aba..58c57d6994 100644 --- a/epan/dissectors/packet-quake.c +++ b/epan/dissectors/packet-quake.c @@ -76,7 +76,6 @@ static gint ett_quake_control_colors = -1; static gint ett_quake_flags = -1; static dissector_handle_t quake_handle; -static dissector_handle_t data_handle; /* I took these names directly out of the Q1 source. */ #define NET_HEADERSIZE 8 @@ -381,7 +380,7 @@ dissect_quake_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (next_tvb, control_tree); break; default: - call_dissector(data_handle,next_tvb, pinfo, control_tree); + call_data_dissector(next_tvb, pinfo, control_tree); break; } } @@ -436,7 +435,7 @@ dissect_quake(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U tvb, 4, 4, sequence); next_tvb = tvb_new_subset_remaining(tvb, 8); - call_dissector(data_handle,next_tvb, pinfo, quake_tree); + call_data_dissector(next_tvb, pinfo, quake_tree); return tvb_captured_length(tvb); } @@ -607,7 +606,6 @@ proto_reg_handoff_quake(void) if (!Initialized) { quake_handle = create_dissector_handle(dissect_quake, proto_quake); - data_handle = find_dissector("data"); Initialized=TRUE; } else { dissector_delete_uint("udp.port", ServerPort, quake_handle); |