fix(plc4j/ads): connect handshake honors configured AMS ports instead of hardcoded RUNTIME_SYSTEM_01#2630
Open
soldom wants to merge 1 commit into
Open
Conversation
… of hardcoded RUNTIME_SYSTEM_01 (851)
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
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.
Closes #2629.
Problem
The ADS connect handshake (
AdsTcpConnection.doConnectHandshake()andonPing()) sent its proberequests —
ReadDeviceInfo, online-version, symbol-version — to a hardcoded AMS portDefaultAmsPorts.RUNTIME_SYSTEM_01(851) with a hardcoded source port800, ignoring the configuredtarget-ams-port/source-ams-port. Only the handshake was affected; the symbol/datatype-tablereads and the read/write path already use
getConfiguration().getTargetAmsPort().Consequence: any PLC runtime not on 851 — a second PLC project (852), a non-default port, or parallel
runtimes — failed to connect during the handshake with ADS error
0x6("target port not found"),even with
target-ams-portset correctly. Full analysis and a packet capture are in #2629.It may be intended to have the handshake port hardcoded to "System_01" (851), but the reason escapes me
and it does break the above mentioned PLC setup use cases.
Change
In
plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/AdsTcpConnection.java, the fourhandshake/ping request builders now use the configured ports, matching the data path:
No behavior change for the common case:
target-ams-portalready defaults to 851.Testing
Verified against a real Beckhoff TwinCAT
3.1.4026IPC:AdsErrorResponse,AMS error 0x6); after: connects and reads a live symbol successfully.
ReadDeviceInfois now sent tothe configured
target-ams-port(852) instead of 851.