This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit a5b123e601cd0dc70dc93d7363e86dbaedbb3f0f Author: Christofer Dutz <christofer.d...@c-ware.de> AuthorDate: Sun Mar 11 11:09:25 2018 +0100 - Updated some links in the s7 documentation - Updated the festures table - Added a link to some more wireshark dumps --- src/site/asciidoc/protocols/features.adoc | 38 ++++++++++++++++++------------- src/site/asciidoc/protocols/index.adoc | 2 ++ src/site/asciidoc/protocols/s7/index.adoc | 4 ++-- 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/site/asciidoc/protocols/features.adoc b/src/site/asciidoc/protocols/features.adoc index ffcf018..e2c114e 100644 --- a/src/site/asciidoc/protocols/features.adoc +++ b/src/site/asciidoc/protocols/features.adoc @@ -21,35 +21,41 @@ The following table contains a list of operations and the protocols that support them: |=== -|Protocol |Read Address Value |Write Address Value |List Resources |Telegrams/Broadcased Values +|Protocol |Read Single Address Value |Read Multiple Address Values |Write Single Address Value |Write Multiple Address Value |S7 |icon:check[role="green"] |icon:check[role="green"] -|icon:remove[role="red"] |icon:check[role="green"] +|icon:exclamation[role="yellow"] |Beckhoff ADS |icon:check[role="green"] |icon:check[role="green"] -|icon:question[role="yellow"] -|icon:question[role="yellow"] - -|Modbus |icon:check[role="green"] |icon:check[role="green"] -|icon:check[role="green"] -|icon:question[role="yellow"] + +|Modbus +|icon:question[role="red"] +|icon:question[role="red"] +|icon:question[role="red"] +|icon:question[role="red"] |OPC-UA -|icon:check[role="green"] -|icon:check[role="green"] -|icon:check[role="green"] -|icon:check[role="green"] +|icon:question[role="red"] +|icon:question[role="red"] +|icon:question[role="red"] +|icon:question[role="red"] |IEC 60870-5-104 -|icon:check[role="green"] -|icon:check[role="green"] -|icon:question[role="yellow"] -|icon:question[role="yellow"] +|icon:question[role="red"] +|icon:question[role="red"] +|icon:question[role="red"] +|icon:question[role="red"] |=== + +Legend: + +- icon:check[role="green"] Implemented and fully supported +- icon:exclamation[role="yellow"] Implemented and supported by simulation +- icon:question[role="red"] Not implemented yet \ No newline at end of file diff --git a/src/site/asciidoc/protocols/index.adoc b/src/site/asciidoc/protocols/index.adoc index 08fa0fc..3400043 100644 --- a/src/site/asciidoc/protocols/index.adoc +++ b/src/site/asciidoc/protocols/index.adoc @@ -26,4 +26,6 @@ Apache 2.0 licensed JNI library for accessing raw IPv4 and IPv6 sockets. Might be the ideal starting point for implementing protocols below TCP & UDP. https://www.savarese.org/software/rocksaw/ +Links to different Wireshark captures: https://github.com/automayt/ICS-pcap + diff --git a/src/site/asciidoc/protocols/s7/index.adoc b/src/site/asciidoc/protocols/s7/index.adoc index fd259c1..ed0f54b 100644 --- a/src/site/asciidoc/protocols/s7/index.adoc +++ b/src/site/asciidoc/protocols/s7/index.adoc @@ -88,9 +88,9 @@ The `S7 Comm` protocols are generally split up into to flavours: The classic `S7 |=== |Name |ISO |RFC |Link |Transmission Control Protocol (TCP) |- | RFC 793 |https://tools.ietf.org/html/rfc793 -|ISO Transport Protocol (Class 4) |ISO DP 8073 | RFC 905 |https://tools.ietf.org/html/rfc905 |ISO on TCP |- | RFC 1006| https://tools.ietf.org/html/rfc1006 -|S7 Comm (0x32) |- |- |http://gmiru.com/article/s7comm/ http://gmiru.com/article/s7comm-part2/ +|ISO Transport Protocol (Class 4) |ISO DP 8073 | RFC 905 |https://tools.ietf.org/html/rfc905 +|S7 Comm (0x32) |- |- |http://gmiru.com/article/s7comm/ http://gmiru.com/article/s7comm-part2/ https://www.eng.tau.ac.il/~yash/jdsfl2014.pdf |S7 Comm Plus (0x72) |- |- |https://opensource-security.de/thesis/MA_Maik_Brueggemann.pdf |RPC |- | RFC 1057 & RFC 5531 |https://tools.ietf.org/html/rfc1057 https://tools.ietf.org/html/rfc5531 |DCOM |- |- | https://msdn.microsoft.com/library/cc201989.aspx -- To stop receiving notification emails like this one, please contact cd...@apache.org.