Rework S7Comm dissector; add S7Comm Plus support (#2165)

* Rework S7Comm dissector; add S7Comm Plus support

* Cleanup s7comm.c

* Improve S7Comm Plus detection

* s7comm/s7commplus: faster detection

---------

Co-authored-by: 0xA50C1A1 <mage.wizard88@gmail.com>
Co-authored-by: Nardi Ivan <nardi.ivan@gmail.com>
This commit is contained in:
Vladimir Gavrilov
2023-11-27 14:37:48 +01:00
committed by GitHub
co-authored by 0xA50C1A1 Nardi Ivan
parent 0b6e261523
commit 3763c702f0
9 changed files with 92 additions and 46 deletions
+10
View File
@@ -243,3 +243,13 @@ References: `Protocol Specs: <https://www.omg.org/spec/DDSI-RTPS/>`_.
IEC62541 OPC Unified Architecture
References: `Protocol Specs: <https://reference.opcfoundation.org/>`_.
.. _Proto 361:
`NDPI_PROTOCOL_S7COMM_PLUS`
============================
A proprietary protocol from Siemens used for data exchange between PLCs and access PLC data via SCADA systems.
Completely different from classic S7Comm, but also uses TPKT/COTP as a transport.
References: `Unofficial description: <https://plc4x.apache.org/protocols/s7/s7comm-plus.html>`_.