Skip to content

fix(plc4j/eip): fix ConnectionManager #2673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrisdutz merged 1 commit into from
Aug 10, 2026
+5 −14
Merged

fix(plc4j/eip): fix ConnectionManager #2673

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/base/EipTcpConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,8 @@
import org.apache.plc4x.java.eip.base.tag.EipTag;
import org.apache.plc4x.java.eip.base.tag.EipTagHandler;
import org.apache.plc4x.java.eip.readwrite.*;
import org.apache.plc4x.java.spi.buffers.api.WithOption;
import org.apache.plc4x.java.spi.buffers.api.exceptions.BufferException;
import org.apache.plc4x.java.spi.buffers.bytebased.ReadBufferByteBased;
import org.apache.plc4x.java.spi.buffers.bytebased.WithByteBasedOption;
import org.apache.plc4x.java.spi.buffers.bytebased.WriteBufferByteBased;
import org.apache.plc4x.java.utils.subscriptionemulation.PollingSubscriptionConnectionBase;
import org.apache.plc4x.java.spi.drivers.exceptions.MessageCodecException;
Expand Down Expand Up @@ -93,7 +91,7 @@ public class EipTcpConnection extends PollingSubscriptionConnectionBase<EIPConfi
private final NullAddressItem nullAddressItem = new NullAddressItem();
private final List<PathSegment> routingAddress = new ArrayList<>();
private short connectionPathSize = 0;
private final int connectionSerialNumber = ThreadLocalRandom.current().nextInt();
private final int connectionSerialNumber = ThreadLocalRandom.current().nextInt(1, 0xFFFF);
Comment thread
chrisdutz marked this conversation as resolved.
Comment thread
chrisdutz marked this conversation as resolved.

public EipTcpConnection(EIPConfiguration configuration, TransportInstance<?> transportInstance, AuditLog auditLog) {
this(configuration, transportInstance, auditLog, configuration.isBigEndian());
Expand Down Expand Up @@ -749,7 +747,7 @@ private Map<String, PlcResponseCode> writeErrorMap(DefaultPlcWriteRequest reques
// Encoders / decoders
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

private static byte[] toAnsi(String tag) throws BufferException {
private byte[] toAnsi(String tag) throws BufferException {
Pattern resourcePattern = Pattern.compile("([.\\[\\]])*([A-Za-z_0-9]+)");
Matcher matcher = resourcePattern.matcher(tag);
List<PathSegment> segments = new LinkedList<>();
Expand All @@ -767,12 +765,7 @@ private static byte[] toAnsi(String tag) throws BufferException {
segments.add(newSegment);
lengthBytes += newSegment.getLengthInBytes();
}
WriteBufferByteBased buffer = new WriteBufferByteBased(new byte[lengthBytes],
WithByteBasedOption.WithByteOrder("LITTLE_ENDIAN"),
WithOption.WithUnsignedIntegerEncoding("unsigned-binary"),
WithOption.WithSignedIntegerEncoding("twos-complement"),
WithOption.WithFloatEncoding("IEEE754"),
Comment thread
chrisdutz marked this conversation as resolved.
WithOption.WithStringEncoding("UTF8"));
WriteBufferByteBased buffer = messageCodec.createWriteBuffer(lengthBytes);
for (PathSegment segment : segments) {
segment.serialize(buffer);
}
Expand All @@ -795,8 +788,7 @@ private PlcReadResponse decodeReadResponse(CipService p, PlcReadRequest readRequ
List<CipService> arr = new ArrayList<>(nb);
try {
byte[] servicesData = responses.getServicesData();
ReadBufferByteBased read = new ReadBufferByteBased(servicesData,
WithByteBasedOption.WithByteOrder("LITTLE_ENDIAN"));
ReadBufferByteBased read = messageCodec.createReadBuffer(servicesData);
Comment thread
chrisdutz marked this conversation as resolved.
int total = servicesData.length;
for (int i = 0; i < nb; i++) {
int offset = responses.getOffsets().get(i) - responses.getOffsets().getFirst();
Expand Down Expand Up @@ -934,8 +926,7 @@ private PlcWriteResponse decodeWriteResponse(CipService p, PlcWriteRequest write
List<CipService> arr = new ArrayList<>(nb);
try {
byte[] servicesData = resp.getServicesData();
ReadBufferByteBased read = new ReadBufferByteBased(servicesData,
WithByteBasedOption.WithByteOrder("LITTLE_ENDIAN"));
ReadBufferByteBased read = messageCodec.createReadBuffer(servicesData);
int total = servicesData.length;
for (int i = 0; i < nb; i++) {
int offset = resp.getOffsets().get(i);
Expand Down
Loading