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-tns.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-tns.c')
| -rw-r--r-- | epan/dissectors/packet-tns.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c index 70ab9bfef7..0d3a82c404 100644 --- a/epan/dissectors/packet-tns.c +++ b/epan/dissectors/packet-tns.c @@ -157,8 +157,6 @@ static gint ett_tns_ntp_flag = -1; static gint ett_tns_conn_flag = -1; static gint ett_sql = -1; -static dissector_handle_t data_handle; - #define TCP_PORT_TNS 1521 static const value_string tns_type_vals[] = { @@ -297,8 +295,7 @@ static void dissect_tns_data(tvbuff_t *tvb, int offset, packet_info *pinfo, col_append_str(pinfo->cinfo, COL_INFO, ", Data"); } - call_dissector(data_handle, - tvb_new_subset_remaining(tvb, offset), pinfo, data_tree); + call_data_dissector(tvb_new_subset_remaining(tvb, offset), pinfo, data_tree); return; } @@ -881,8 +878,7 @@ dissect_tns_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data dissect_tns_data(tvb,offset,pinfo,tree,tns_tree); break; default: - call_dissector(data_handle, - tvb_new_subset_remaining(tvb, offset), pinfo, + call_data_dissector(tvb_new_subset_remaining(tvb, offset), pinfo, tns_tree); break; } @@ -1236,7 +1232,6 @@ proto_reg_handoff_tns(void) tns_handle = create_dissector_handle(dissect_tns, proto_tns); dissector_add_uint("tcp.port", TCP_PORT_TNS, tns_handle); - data_handle = find_dissector("data"); } /* |