Wireshark-commits: [Wireshark-commits] master 8bb8d5f: [packet-iec104.c] - Add dissection for IEC 6
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8bb8d5f86c81ff5aa40facbecc8cb14c5fce09cc
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
8bb8d5f by Chris Bontje (cbontje@xxxxxxxxx):
[packet-iec104.c] - Add dissection for IEC 60870-5-101 Messages
IEC 60870-5-101 is the traditional serial version of '104. The headers are different but the ASDU dissection is identical.
Changes made to the '104 dissector to accommodate '101 are as follows:
- Added in a new protocol dissector 'iec60870_101'. This dissector handles the '101 header and calls the ASDU dissector when required.
- The existing '104acpi' dissector has been renamed to 'iec60870_104' to better align with the '101 addition
- The '104asdu' protocol has been renamed to 'iec60870_asdu' in order to make it more generalized between the two variants. Updated variable names and display filter fields as needed.
- 3 preferences exist in the iec60870_101 dissector to allow for configurable length of the COT, ASDU Addr and IOA fields. These are fixed their max length in '104 (2, 2 and 3 octets respectively) but are configurable in '101.
- The ASDU dissector has been modified to accept a data parameter that contains the fixed/configurable lengths of COT, ASDU Addr and IOA fields.
Bug: 15688
Change-Id: Ib0c918a40d24967caa8588067fa9e9a240af4ca5
Reviewed-on: https://code.wireshark.org/review/32802
Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from 64a56cf macOS: Add a workaround for libbrotli.
add 8bb8d5f [packet-iec104.c] - Add dissection for IEC 60870-5-101 Messages
Summary of changes:
epan/dissectors/packet-iec104.c | 652 +++++++++++++++++++++++++++++++---------
1 file changed, 508 insertions(+), 144 deletions(-)
