Multiple changes#39
Draft
jogibear9988 wants to merge 55 commits into
Draft
Conversation
jogibear9988
commented
Aug 22, 2024
jogibear9988
commented
- switch to new csproj file format.
- create a version for net472 and net8
- automaticly load correct openssl dll
- switch to ne solution file format (slnx)
- automatic load openSSL in the correct version (x86/x64)
Author
|
Maybe the switch to slnx is a little bit early and should not be done yet, I need to look if building with dotnet command is already possible atm. |
Author
|
I also added your fix in zlib to cinderblocks/zlib.net#5 |
Owner
|
I can't use .Net Core, and I have to stay at Visual Studio 2019 for some reason. |
Owner
|
I had to fix a bug in zlib.net, which is also still present in the .Net core version (maybe no one used zlib with dictionaries, or .Net core handles type casts in a different manner). So I'd like to keep it internally, also I prefer to reduce external dependencies to an absolute minimum. Download the source, and you should be ready to go. |
Author
|
I've seen the bug, I've created a pull with your fix at a zlib nuget package. wich merged it : cinderblocks/zlib.net#5 But no problem to keep it internal. |
Author
|
VS2019 should be possible ( I think, need to try), but for sure the SLNX will not work |
Author
|
@thomas-v2 my changes compile now also in VS2019 |
-> switching dll names does not work very well, and openssl has -x64 on the 64bit dlls. atm supporting full framework is not needed add support for win arm (needs test) and osx (needs test)
# Conflicts: # src/S7CommPlusGUIBrowser/Form1.cs
install_name_tool -change /tmp/openssl-arm/lib/libcrypto.3.dylib @rpath/libcrypto.3.dylib libssl.3.dylib install_name_tool -add_rpath @loader_path libssl.3.dylib
# Conflicts: # src/S7CommPlusDriver/S7CommPlusConnection.cs # src/S7CommPlusDriver/S7CommPlusDriver.csproj # src/S7CommPlusGUIBrowser/Form1.Designer.cs # src/S7CommPlusGUIBrowser/Form1.cs # src/S7CommPlusGUIBrowser/Form1.resx
# Conflicts: # src/S7CommPlusDriver/Core/Ids.cs # src/S7CommPlusDriver/S7CommPlusConnection.cs
Add S7CommPlusClient as the production async API with typed options, result types, connection state events, typed exceptions, serialized operations, read-side reconnect, and an explicit write enable safety gate. Replace the legacy receive polling/mutex path with channel-backed dispatch, add bounded disconnect handling, route S7Client through injectable IS7Transport/SocketS7Transport, and harden socket send/receive error handling for disconnects and timeouts. Move library diagnostics away from Console.WriteLine, remove obsolete SHA1Managed usage, fix partial stream reads and switch exhaustiveness warnings, and clean package metadata. Add unit, receive-dispatch, transport, and opt-in read-only live PLC smoke tests for the production behavior.
Rewrite the root README around the production S7CommPlusClient API, including async usage, write safety, error handling, logging, test commands, and opt-in read-only PLC smoke testing.
Add selectable S7CommPlus security modes for TLS, legacy challenge authentication, and automatic negotiation, including negotiated-mode exposure on the client options. Keep net6 on the TLS-only path while enabling legacy challenge authentication and protected protocol-v3 framing for newer builds. HarpoS7 usage for Legacy connection. Build the legacy session handshake structurally instead of relying on canned frames. Parse fingerprints, challenges, session versions, roles, and security attributes from CreateObject responses; generate CreateObject and authentication SetMultiVariables requests from typed protocol values; support S7-1500 V3/V3.1, compact, high-session, low-session, and PLCSIM authentication shapes; and retry compatible ES/HMI session roles and TSAPs when needed. Align legacy protocol-v3 integrity handling with observed PLC behavior. Include the protected-frame digest length field, sign and verify the correct body data, accumulate digest input across continuation fragments, reassemble legacy receive fragments, restore normal request timeouts after authentication, and reject oversized protected legacy requests before they can trigger PLC integrity disconnects. Split large legacy read batches before they exceed the single protected-frame payload budget, while leaving TLS batching unchanged. Add a reusable payload-budget calculation and return a dedicated legacy-request-too-large error for huge single requests, writes, or future protected operations that would require unsupported outgoing legacy fragmentation. Add production support for session password legitimation, active-alarm reads, disposable tag and alarm subscriptions, snapshot-backed alarm subscription startup, CPU culture information, PLC communication defaults/resources, online view support, Bouncy Castle connection support, raw PLC structure XML access, and parsed PLC block/tag-table browsing through the async client pipeline. Harden subscription and alarm behavior by serializing subscription operations through the production client gate, deleting the real subscription object id, updating alarm credit on the alarm subscription object, handling idle waits and communication faults, filtering malformed alarm objects, preserving connect errors during cleanup, and replaying early notifications captured during alarm snapshots. Harden parser, transport, and connection failure handling. Surface fatal SSL/OpenSSL failures through normal receive errors, guard ISO/OpenSSL receive loops against stalls, oversized PDUs, repeated empty packets, and silent spins, validate remote TSAP values and COTP connection confirms, validate item addresses and one-byte PLC CHAR values, fail malformed blob decompression cleanly, tolerate PLC structure blobs without zlib trailers, and add parser progress checks for truncated or non-advancing protocol data. Apply Siemens/OMS protocol naming across the driver and Harpo-backed legacy path. Centralize constants for CSI/TLS security modes, session roles, public-key families, security object ids, digest framing, value-array flags, subscription ids, alarm message types, ASOM job/protection values, system-limit LIDs, and PLC communication resources; replace remaining raw magic values where practical; and expose readable alarm/notification result names. Refactor the client/session architecture by narrowing the public API surface, splitting connection feature services, refining protocol-session responsibilities, keeping sockets open across receive timeouts, resolving alarm text placeholders, improving PLCcom alarm metadata support, and routing block browsing/content access through the same timeout, reconnect, and typed-error behavior as other production operations. Refresh README and protocol notes with the final TLS and legacy challenge flows, security-mode selection, legitimation behavior, subscription usage, active-alarm snapshot startup, PLC defaults/resources, block browsing, packet integrity layout, known legacy-fragment limits, and live read-only PLC verification results. Extend regression coverage for legacy challenge parsing, authentication frame selection, protected V3 digest framing, continuation-fragment handling, structural CreateObject/authentication requests, TSAP validation, COTP confirms, legacy payload budgeting, oversized legacy request rejection, malformed parser inputs, decompression fallback, PLC CHAR and item-address validation, subscriptions, alarm snapshots, CPU culture/default/resource APIs, parsed block structure browsing, and Siemens/OMS constant mappings.
Route subscription notifications by PLC subscription object id and keep per-subscription state for tag, alarm, and TIS watch subscriptions so multiple subscriptions can share one client connection. Remove implicit companion-client alarm snapshot APIs; snapshot reads now require an explicit caller-owned S7CommPlusClient. Update docs and regression tests for alarm snapshots, active alarm reads after subscription start, and multiple TIS watches on one connection.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.