diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-03-13 07:51:45 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-03-17 00:05:17 +0000 |
| commit | e37275bfdee7a0ea4745def144d4a0e5c62e282d (patch) | |
| tree | e556a0170b2a35bd4bf975823de4205f7d30ba09 /plugins/ethercat | |
| parent | b46fe7e95ae09c062ec066838f05b2c42a3b2726 (diff) | |
| download | wireshark-e37275bfdee7a0ea4745def144d4a0e5c62e282d.tar.gz | |
Associate dissector tables and heuristic subdissector lists with a protocol.
This will make it easier to determine protocol dependencies.
Some LLC OUI dissector tables didn't have an associated protocol, so they were left without one (-1 used)
Change-Id: I6339f16476510ef3f393d6fb5d8946419bfb4b7d
Reviewed-on: https://code.wireshark.org/review/14446
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'plugins/ethercat')
| -rw-r--r-- | plugins/ethercat/packet-ethercat-datagram.c | 2 | ||||
| -rw-r--r-- | plugins/ethercat/packet-ethercat-frame.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/ethercat/packet-ethercat-datagram.c index 971cf30160..a5387f5b2a 100644 --- a/plugins/ethercat/packet-ethercat-datagram.c +++ b/plugins/ethercat/packet-ethercat-datagram.c @@ -1683,7 +1683,7 @@ void proto_register_ecat(void) proto_register_subtree_array(ett, array_length(ett)); /* Sub dissector code */ - heur_subdissector_list = register_heur_dissector_list("ecat.data"); + heur_subdissector_list = register_heur_dissector_list("ecat.data", proto_ecat_datagram); } /* The registration hand-off routing */ diff --git a/plugins/ethercat/packet-ethercat-frame.c b/plugins/ethercat/packet-ethercat-frame.c index ca3f5e4c46..dd71c17cf6 100644 --- a/plugins/ethercat/packet-ethercat-frame.c +++ b/plugins/ethercat/packet-ethercat-frame.c @@ -139,8 +139,8 @@ void proto_register_ethercat_frame(void) /* Define a handle (ecatf.type) for sub dissectors that want to dissect the Ethercat frame ether type (E88A4) payload. */ - ethercat_frame_dissector_table = register_dissector_table("ecatf.type", - "EtherCAT frame type", FT_UINT8, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE); + ethercat_frame_dissector_table = register_dissector_table("ecatf.type", "EtherCAT frame type", + proto_ethercat_frame, FT_UINT8, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE); } void proto_reg_handoff_ethercat_frame(void) |