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 /plugins/ethercat/packet-ethercat-frame.c | |
| parent | 2b2fc64447e5f778d969e6c850e9196d248cbbe1 (diff) | |
| download | wireshark-1e60d63c8c6882c8c0bdb00cf6df594e1bb6fccf.tar.gz | |
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 'plugins/ethercat/packet-ethercat-frame.c')
| -rw-r--r-- | plugins/ethercat/packet-ethercat-frame.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/plugins/ethercat/packet-ethercat-frame.c b/plugins/ethercat/packet-ethercat-frame.c index dd71c17cf6..0d9eb5f677 100644 --- a/plugins/ethercat/packet-ethercat-frame.c +++ b/plugins/ethercat/packet-ethercat-frame.c @@ -38,7 +38,6 @@ void proto_reg_handoff_ethercat_frame(void); static int proto_ethercat_frame = -1; static dissector_table_t ethercat_frame_dissector_table; -static dissector_handle_t ethercat_frame_data_handle; /* Define the tree for the EtherCAT frame */ static int ett_ethercat_frame = -1; @@ -97,7 +96,7 @@ static int dissect_ethercat_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree col_add_fstr (pinfo->cinfo, COL_PROTOCOL, "0x%04x", hdr.v.protocol); /* No sub dissector wanted to handle this payload, decode it as general data instead. */ - call_dissector (ethercat_frame_data_handle, next_tvb, pinfo, tree); + call_data_dissector(next_tvb, pinfo, tree); } return tvb_captured_length(tvb); } @@ -151,7 +150,6 @@ void proto_reg_handoff_ethercat_frame(void) dissector_add_uint("ethertype", ETHERTYPE_ECATF, ethercat_frame_handle); dissector_add_uint("udp.port", ETHERTYPE_ECATF, ethercat_frame_handle); dissector_add_uint("tcp.port", ETHERTYPE_ECATF, ethercat_frame_handle); - ethercat_frame_data_handle = find_dissector("data"); } /* |