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-pdcp-lte.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-pdcp-lte.c')
-rw-r--r-- | epan/dissectors/packet-pdcp-lte.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index e9dc58d885..fe6ea69806 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -435,7 +435,6 @@ static const value_string ciphering_algorithm_vals[] = { static dissector_handle_t ip_handle; static dissector_handle_t ipv6_handle; static dissector_handle_t rohc_handle; -static dissector_handle_t data_handle; #define SEQUENCE_ANALYSIS_RLC_ONLY 1 @@ -2219,7 +2218,7 @@ static int dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, call_dissector_only(ipv6_handle, ip_payload_tvb, pinfo, pdcp_tree, NULL); break; default: - call_dissector_only(data_handle, ip_payload_tvb, pinfo, pdcp_tree, NULL); + call_data_dissector(ip_payload_tvb, pinfo, pdcp_tree); break; } @@ -2784,7 +2783,6 @@ void proto_reg_handoff_pdcp_lte(void) ip_handle = find_dissector_add_dependency("ip", proto_pdcp_lte); ipv6_handle = find_dissector_add_dependency("ipv6", proto_pdcp_lte); rohc_handle = find_dissector_add_dependency("rohc", proto_pdcp_lte); - data_handle = find_dissector("data"); } /* |