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-ppcap.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-ppcap.c')
| -rw-r--r-- | epan/dissectors/packet-ppcap.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ppcap.c b/epan/dissectors/packet-ppcap.c index d736449089..c5398a820f 100644 --- a/epan/dissectors/packet-ppcap.c +++ b/epan/dissectors/packet-ppcap.c @@ -42,7 +42,6 @@ static dissector_handle_t sip_handle; /* SIP handle */ static dissector_handle_t sccp_handle; /* SCCP handle */ static dissector_handle_t sgsap_handle; /* SGSAP handle */ static dissector_handle_t gtpv2_handle; /* GTPv2 handle */ -static dissector_handle_t data_handle; /* DATA handle */ static dissector_table_t sccp_ssn_dissector_table; @@ -576,7 +575,7 @@ dissect_ppcap_payload_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree * ppcap call_dissector(gtpv2_handle, next_tvb, pinfo, tree); /* calling the GTPv2 handle */ break; default: - call_dissector(data_handle, next_tvb, pinfo, tree); /* calling the DATA handle */ + call_data_dissector(next_tvb, pinfo, tree); /* calling the DATA handle */ break; } @@ -698,7 +697,6 @@ void proto_reg_handoff_ppcap(void) sccp_handle = find_dissector_add_dependency("sccp", proto_ppcap); /* calling the protocol SCCP */ sgsap_handle = find_dissector_add_dependency("sgsap", proto_ppcap); /* calling the protocol SGSAP */ gtpv2_handle = find_dissector_add_dependency("gtpv2", proto_ppcap); /* calling the protocol GTPv2 */ - data_handle = find_dissector("data"); /* calling the protocol DATA */ sccp_ssn_dissector_table = find_dissector_table("sccp.ssn"); |