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-tftp.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-tftp.c')
| -rw-r--r-- | epan/dissectors/packet-tftp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c index ebe3a4695b..fcaa58401f 100644 --- a/epan/dissectors/packet-tftp.c +++ b/epan/dissectors/packet-tftp.c @@ -85,7 +85,6 @@ static gint ett_tftp_option = -1; static expert_field ei_tftp_blocksize_range = EI_INIT; static dissector_handle_t tftp_handle; -static dissector_handle_t data_handle; #define UDP_PORT_TFTP_RANGE "69" @@ -340,7 +339,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, /* Show data in tree */ if (bytes > 0) { data_tvb = tvb_new_subset(tvb, offset, -1, bytes); - call_dissector(data_handle, data_tvb, pinfo, tree); + call_data_dissector(data_tvb, pinfo, tree); } /* If Export Object tap is listening, need to accumulate blocks info list @@ -703,7 +702,6 @@ proto_reg_handoff_tftp(void) if (!tftp_initialized) { tftp_handle = find_dissector("tftp"); - data_handle = find_dissector("data"); heur_dissector_add("stun", dissect_embeddedtftp_heur, "TFTP over TURN", "tftp_stun", proto_tftp, HEURISTIC_ENABLE); tftp_initialized = TRUE; } else { |