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-rudp.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-rudp.c')
| -rw-r--r-- | epan/dissectors/packet-rudp.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-rudp.c b/epan/dissectors/packet-rudp.c index b6dd6d8ef7..2f0b12109f 100644 --- a/epan/dissectors/packet-rudp.c +++ b/epan/dissectors/packet-rudp.c @@ -80,8 +80,6 @@ static gint ett_rudp = -1; static gint ett_rudp_flags = -1; static dissector_handle_t sm_handle = NULL; -static dissector_handle_t data_handle = NULL; - static int dissect_rudp(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree, void* data _U_) @@ -125,7 +123,7 @@ dissect_rudp(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree, void* dat * in live captures */ if (hlen > 6) { next_tvb = tvb_new_subset_length(tvb, 6, hlen-6); - call_dissector(data_handle, next_tvb, pinfo, rudp_tree); + call_data_dissector(next_tvb, pinfo, rudp_tree); } next_tvb = tvb_new_subset_remaining(tvb, hlen); @@ -248,7 +246,6 @@ proto_reg_handoff_rudp(void) { rudp_handle = create_dissector_handle(dissect_rudp, proto_rudp); dissector_add_for_decode_as("udp.port", rudp_handle); sm_handle = find_dissector_add_dependency("sm", proto_rudp); - data_handle = find_dissector("data"); initialized = TRUE; } else { if (saved_udp_port != 0) { |