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-sita.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-sita.c')
-rw-r--r-- | epan/dissectors/packet-sita.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-sita.c b/epan/dissectors/packet-sita.c index 14d067c898..69bdc6f6ba 100644 --- a/epan/dissectors/packet-sita.c +++ b/epan/dissectors/packet-sita.c @@ -34,7 +34,6 @@ void proto_register_sita(void); void proto_reg_handoff_sita(void); static dissector_table_t sita_dissector_table; -static dissector_handle_t data_handle; static gint ett_sita = -1; static gint ett_sita_flags = -1; static gint ett_sita_signals = -1; @@ -197,7 +196,7 @@ dissect_sita(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ and give them the details then */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "UNKNOWN"); col_add_fstr(pinfo->cinfo, COL_INFO, "IOP protocol number: %u", pinfo->pseudo_header->sita.sita_proto); - call_dissector(data_handle, tvb, pinfo, tree); /* call the generic (hex display) decoder instead */ + call_data_dissector(tvb, pinfo, tree); /* call the generic (hex display) decoder instead */ } return tvb_captured_length(tvb); } @@ -396,7 +395,6 @@ proto_reg_handoff_sita(void) uts_handle = find_dissector("uts"); ipars_handle = find_dissector("ipars"); sita_handle = find_dissector("sita"); - data_handle = find_dissector("data"); dissector_add_uint("sita.proto", SITA_PROTO_BOP_LAPB, lapb_handle); dissector_add_uint("sita.proto", SITA_PROTO_BOP_FRL, frame_relay_handle); |