You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2018/05/17 13:58:48 UTC
[incubator-plc4x] branch master updated (113a226 -> d918d54)
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from 113a226 initial port of AdsLib to test compatibility of to c++ implementation
new 010c5cb fixed handling of variable response lengths.
new d918d54 implemented symbolic addressing support of Beckhoff ADS protocol.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/api/messages/PlcProprietaryRequest.java | 7 ++
.../java/api/messages/PlcProprietaryResponse.java | 7 ++
.../ads/connection/AdsAbstractPlcConnection.java | 107 +++++++++++++++++++--
.../ads/connection/AdsSerialPlcConnection.java | 2 +-
.../java/ads/connection/AdsTcpPlcConnection.java | 4 +-
.../apache/plc4x/java/ads/model/AdsAddress.java | 33 ++++++-
.../plc4x/java/ads/model/SymbolicAdsAddress.java | 74 ++++++++++++++
.../java/ads/protocol/Ads2PayloadProtocol.java | 2 +-
.../plc4x/java/ads/protocol/Plc4x2AdsProtocol.java | 33 +++++--
.../ads/protocol/util/LittleEndianDecoder.java | 20 ++++
.../apache/plc4x/java/ads/ManualPlc4XAdsTest.java | 49 ++++++++++
.../ads/connection/AdsSerialPlcConnectionTest.java | 17 +++-
.../ads/connection/AdsTcpPlcConnectionTests.java | 15 ++-
.../java/ads/protocol/Plc4x2AdsProtocolTest.java | 5 +-
14 files changed, 349 insertions(+), 26 deletions(-)
create mode 100644 plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/SymbolicAdsAddress.java
create mode 100644 plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java
--
To stop receiving notification emails like this one, please contact
sruehl@apache.org.
[incubator-plc4x] 01/02: fixed handling of variable response
lengths.
Posted by sr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 010c5cbf029e07d0c73c9e631f926070e999afc5
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu May 17 15:57:30 2018 +0200
fixed handling of variable response lengths.
---
.../java/ads/protocol/util/LittleEndianDecoder.java | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/LittleEndianDecoder.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/LittleEndianDecoder.java
index 8394cdf..a68cb7d 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/LittleEndianDecoder.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/LittleEndianDecoder.java
@@ -51,15 +51,35 @@ public class LittleEndianDecoder {
result.add(byteOne);
i += 1;
} else if (datatype == Short.class) {
+ if (length < 2) {
+ byte[] copy = new byte[2];
+ System.arraycopy(adsData, 0, copy, 0, length);
+ adsData = copy;
+ }
decodeShort(adsData, i, result);
i += 2;
} else if (datatype == Integer.class) {
+ if (length < 4) {
+ byte[] copy = new byte[4];
+ System.arraycopy(adsData, 0, copy, 0, length);
+ adsData = copy;
+ }
decodeInteger(adsData, i, result);
i += 4;
} else if (datatype == Float.class) {
+ if (length < 4) {
+ byte[] copy = new byte[4];
+ System.arraycopy(adsData, 0, copy, 0, length);
+ adsData = copy;
+ }
decodeFloat(adsData, i, result);
i += 4;
} else if (datatype == Calendar.class || Calendar.class.isAssignableFrom(datatype)) {
+ if (length < 8) {
+ byte[] copy = new byte[8];
+ System.arraycopy(adsData, 0, copy, 0, length);
+ adsData = copy;
+ }
extractCalendar(adsData, i, result);
i += 8;
} else {
--
To stop receiving notification emails like this one, please contact
sruehl@apache.org.
[incubator-plc4x] 02/02: implemented symbolic addressing support of
Beckhoff ADS protocol.
Posted by sr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit d918d5466861a324ca98c9e23519141c47486aa3
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu May 17 15:58:45 2018 +0200
implemented symbolic addressing support of Beckhoff ADS protocol.
---
.../java/api/messages/PlcProprietaryRequest.java | 7 ++
.../java/api/messages/PlcProprietaryResponse.java | 7 ++
.../ads/connection/AdsAbstractPlcConnection.java | 107 +++++++++++++++++++--
.../ads/connection/AdsSerialPlcConnection.java | 2 +-
.../java/ads/connection/AdsTcpPlcConnection.java | 4 +-
.../apache/plc4x/java/ads/model/AdsAddress.java | 33 ++++++-
.../plc4x/java/ads/model/SymbolicAdsAddress.java | 74 ++++++++++++++
.../java/ads/protocol/Ads2PayloadProtocol.java | 2 +-
.../plc4x/java/ads/protocol/Plc4x2AdsProtocol.java | 33 +++++--
.../apache/plc4x/java/ads/ManualPlc4XAdsTest.java | 49 ++++++++++
.../ads/connection/AdsSerialPlcConnectionTest.java | 17 +++-
.../ads/connection/AdsTcpPlcConnectionTests.java | 15 ++-
.../java/ads/protocol/Plc4x2AdsProtocolTest.java | 5 +-
13 files changed, 329 insertions(+), 26 deletions(-)
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryRequest.java
index 359ed03..3389317 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryRequest.java
@@ -45,4 +45,11 @@ public class PlcProprietaryRequest<CUSTOM_REQUEST> extends PlcRequest<PlcProprie
});
}
}
+
+ @Override
+ public String toString() {
+ return "PlcProprietaryRequest{" +
+ "request=" + request +
+ "} " + super.toString();
+ }
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponse.java
index 3c3d159..96a9654 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponse.java
@@ -45,4 +45,11 @@ public class PlcProprietaryResponse<CUSTOM_RESPONSE> extends PlcResponse<PlcProp
super(new PlcProprietaryRequest.DummyRequestItem(), ResponseCode.OK);
}
}
+
+ @Override
+ public String toString() {
+ return "PlcProprietaryResponse{" +
+ "response=" + response +
+ "} " + super.toString();
+ }
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java
index cf70f22..7c5412a 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java
@@ -19,22 +19,38 @@
package org.apache.plc4x.java.ads.connection;
import io.netty.channel.ChannelFuture;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.SystemConfiguration;
+import org.apache.plc4x.java.ads.api.commands.AdsReadWriteRequest;
+import org.apache.plc4x.java.ads.api.commands.AdsReadWriteResponse;
+import org.apache.plc4x.java.ads.api.commands.AdsWriteRequest;
+import org.apache.plc4x.java.ads.api.commands.types.*;
import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
import org.apache.plc4x.java.ads.model.AdsAddress;
+import org.apache.plc4x.java.ads.model.SymbolicAdsAddress;
import org.apache.plc4x.java.api.connection.PlcProprietarySender;
import org.apache.plc4x.java.api.connection.PlcReader;
import org.apache.plc4x.java.api.connection.PlcWriter;
-import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.apache.plc4x.java.api.messages.*;
+import org.apache.plc4x.java.api.messages.items.RequestItem;
import org.apache.plc4x.java.api.model.Address;
import org.apache.plc4x.java.base.connection.AbstractPlcConnection;
import org.apache.plc4x.java.base.connection.ChannelFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.*;
public abstract class AdsAbstractPlcConnection extends AbstractPlcConnection implements PlcReader, PlcWriter, PlcProprietarySender {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AdsAbstractPlcConnection.class);
+
+ private static final Configuration CONF = new SystemConfiguration();
+ private static final long SYMBOL_RESOLVE_TIMEOUT = CONF.getLong("plc4x.adsconnection.symbol.resolve,timeout", 3000);
+
protected final AmsNetId targetAmsNetId;
protected final AmsPort targetAmsPort;
@@ -43,6 +59,8 @@ public abstract class AdsAbstractPlcConnection extends AbstractPlcConnection imp
protected final AmsPort sourceAmsPort;
+ protected final ConcurrentMap<SymbolicAdsAddress, AdsAddress> addressMapping;
+
protected AdsAbstractPlcConnection(ChannelFactory channelFactory, AmsNetId targetAmsNetId, AmsPort targetAmsPort) {
this(channelFactory, targetAmsNetId, targetAmsPort, generateAMSNetId(), generateAMSPort());
}
@@ -53,6 +71,7 @@ public abstract class AdsAbstractPlcConnection extends AbstractPlcConnection imp
this.targetAmsPort = targetAmsPort;
this.sourceAmsNetId = sourceAmsNetId;
this.sourceAmsPort = sourceAmsPort;
+ this.addressMapping = new ConcurrentHashMap<>();
}
public AmsNetId getTargetAmsNetId() {
@@ -73,12 +92,17 @@ public abstract class AdsAbstractPlcConnection extends AbstractPlcConnection imp
@Override
- public Address parseAddress(String addressString) throws PlcException {
- return AdsAddress.of(addressString);
+ public Address parseAddress(String addressString) {
+ if (AdsAddress.matches(addressString)) {
+ return AdsAddress.of(addressString);
+ } else {
+ return SymbolicAdsAddress.of(addressString);
+ }
}
@Override
public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
+ mapAddresses(readRequest);
CompletableFuture<PlcReadResponse> readFuture = new CompletableFuture<>();
ChannelFuture channelFuture = channel.writeAndFlush(new PlcRequestContainer<>(readRequest, readFuture));
channelFuture.addListener(future -> {
@@ -91,6 +115,7 @@ public abstract class AdsAbstractPlcConnection extends AbstractPlcConnection imp
@Override
public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
+ mapAddresses(writeRequest);
CompletableFuture<PlcWriteResponse> writeFuture = new CompletableFuture<>();
ChannelFuture channelFuture = channel.writeAndFlush(new PlcRequestContainer<>(writeRequest, writeFuture));
channelFuture.addListener(future -> {
@@ -102,9 +127,10 @@ public abstract class AdsAbstractPlcConnection extends AbstractPlcConnection imp
}
@Override
- public <T, R> CompletableFuture<PlcProprietaryResponse<R>> send(PlcProprietaryRequest<T> request) {
+ public <T, R> CompletableFuture<PlcProprietaryResponse<R>> send(PlcProprietaryRequest<T> proprietaryRequest) {
+ mapAddresses(proprietaryRequest);
CompletableFuture<PlcProprietaryResponse<R>> sendFuture = new CompletableFuture<>();
- ChannelFuture channelFuture = channel.writeAndFlush(new PlcRequestContainer<>(request, sendFuture));
+ ChannelFuture channelFuture = channel.writeAndFlush(new PlcRequestContainer<>(proprietaryRequest, sendFuture));
channelFuture.addListener(future -> {
if (!future.isSuccess()) {
sendFuture.completeExceptionally(future.cause());
@@ -113,6 +139,47 @@ public abstract class AdsAbstractPlcConnection extends AbstractPlcConnection imp
return sendFuture;
}
+ private void mapAddresses(PlcRequest<?> request) {
+ for (RequestItem requestItem : request.getRequestItems()) {
+ if (requestItem.getAddress() instanceof SymbolicAdsAddress) {
+ SymbolicAdsAddress symbolicAdsAddress = (SymbolicAdsAddress) requestItem.getAddress();
+ addressMapping.computeIfAbsent(symbolicAdsAddress, symbolicAdsAddressInternal -> {
+ LOGGER.debug("Resolving {}", symbolicAdsAddressInternal);
+ AdsReadWriteRequest adsReadWriteRequest = AdsReadWriteRequest.of(
+ targetAmsNetId,
+ targetAmsPort,
+ sourceAmsNetId,
+ sourceAmsPort,
+ Invoke.NONE,
+ IndexGroup.ReservedGroups.ADSIGRP_SYM_HNDBYNAME,
+ IndexOffset.of(0),
+ ReadLength.of(4),
+ Data.of(symbolicAdsAddressInternal.getSymbolicAddress())
+ );
+
+ CompletableFuture<PlcProprietaryResponse<AdsReadWriteResponse>> getHandelFuture = new CompletableFuture<>();
+ channel.writeAndFlush(new PlcRequestContainer<>(new PlcProprietaryRequest<>(adsReadWriteRequest), getHandelFuture));
+ PlcProprietaryResponse<AdsReadWriteResponse> getHandleResponse;
+ try {
+ getHandleResponse = getHandelFuture.get(SYMBOL_RESOLVE_TIMEOUT, TimeUnit.MILLISECONDS);
+ } catch (InterruptedException e) {
+ LOGGER.warn("Interrupted!", e);
+ Thread.currentThread().interrupt();
+ throw new PlcRuntimeException(e);
+ } catch (ExecutionException | TimeoutException e) {
+ throw new PlcRuntimeException(e);
+ }
+ AdsReadWriteResponse response = getHandleResponse.getResponse();
+ if (response.getResult().toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
+ throw new PlcRuntimeException("Non error code received " + response.getResult());
+ }
+ IndexOffset symbolHandle = IndexOffset.of(response.getData().getBytes());
+ return AdsAddress.of(IndexGroup.ReservedGroups.ADSIGRP_SYM_VALBYHND.getAsLong(), symbolHandle.getAsLong());
+ });
+ }
+ }
+ }
+
protected static AmsNetId generateAMSNetId() {
return AmsNetId.of("0.0.0.0.0.0");
}
@@ -121,4 +188,32 @@ public abstract class AdsAbstractPlcConnection extends AbstractPlcConnection imp
return AmsPort.of(0);
}
+ @Override
+ public void close() {
+ for (AdsAddress adsAddress : addressMapping.values()) {
+ AdsWriteRequest adsWriteRequest = AdsWriteRequest.of(
+ targetAmsNetId,
+ targetAmsPort,
+ sourceAmsNetId,
+ sourceAmsPort,
+ Invoke.NONE,
+ IndexGroup.ReservedGroups.ADSIGRP_SYM_RELEASEHND,
+ IndexOffset.of(0),
+ Data.of(IndexGroup.of(adsAddress.getIndexGroup()).getBytes())
+ );
+ // We don't need a response so we just supply a throw away future.
+ channel.writeAndFlush(new PlcRequestContainer<>(new PlcProprietaryRequest<>(adsWriteRequest), new CompletableFuture<>()));
+ }
+ super.close();
+ }
+
+ @Override
+ public String toString() {
+ return "AdsAbstractPlcConnection{" +
+ "targetAmsNetId=" + targetAmsNetId +
+ ", targetAmsPort=" + targetAmsPort +
+ ", sourceAmsNetId=" + sourceAmsNetId +
+ ", sourceAmsPort=" + sourceAmsPort +
+ "} " + super.toString();
+ }
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnection.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnection.java
index f322847..848a743 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnection.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnection.java
@@ -58,7 +58,7 @@ public class AdsSerialPlcConnection extends AdsAbstractPlcConnection {
ChannelPipeline pipeline = channel.pipeline();
pipeline.addLast(new Payload2SerialProtocol());
pipeline.addLast(new Ads2PayloadProtocol());
- pipeline.addLast(new Plc4x2AdsProtocol(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort));
+ pipeline.addLast(new Plc4x2AdsProtocol(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, addressMapping));
}
};
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
index 505ab63..5cc69a6 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
@@ -80,13 +80,13 @@ public class AdsTcpPlcConnection extends AdsAbstractPlcConnection {
ChannelPipeline pipeline = channel.pipeline();
pipeline.addLast(new Payload2TcpProtocol());
pipeline.addLast(new Ads2PayloadProtocol());
- pipeline.addLast(new Plc4x2AdsProtocol(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort));
+ pipeline.addLast(new Plc4x2AdsProtocol(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, addressMapping));
}
};
}
public InetAddress getRemoteAddress() {
- return ((TcpSocketChannelFactory)channelFactory).getAddress();
+ return ((TcpSocketChannelFactory) channelFactory).getAddress();
}
protected static AmsNetId generateAMSNetId() {
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsAddress.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsAddress.java
index d3a9b6c..c90d574 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsAddress.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsAddress.java
@@ -21,11 +21,12 @@ package org.apache.plc4x.java.ads.model;
import org.apache.plc4x.java.ads.api.util.ByteValue;
import org.apache.plc4x.java.api.model.Address;
+import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class AdsAddress implements Address {
- private static final Pattern RESSOURCE_ADDRESS_PATTERN = Pattern.compile("^(?<indexGroup>\\d+)/(?<indexOffset>\\d+)");
+ private static final Pattern RESOURCE_ADDRESS_PATTERN = Pattern.compile("^(?<indexGroup>\\d+)/(?<indexOffset>\\d+)");
private final long indexGroup;
@@ -43,10 +44,10 @@ public class AdsAddress implements Address {
}
public static AdsAddress of(String address) {
- Matcher matcher = RESSOURCE_ADDRESS_PATTERN.matcher(address);
+ Matcher matcher = RESOURCE_ADDRESS_PATTERN.matcher(address);
if (!matcher.matches()) {
throw new IllegalArgumentException(
- "address " + address + " doesn't match '{indexGroup}/{indexOffset}' RAW:" + RESSOURCE_ADDRESS_PATTERN);
+ "address " + address + " doesn't match '{indexGroup}/{indexOffset}' RAW:" + RESOURCE_ADDRESS_PATTERN);
}
String indexGroup = matcher.group("indexGroup");
String indexOffset = matcher.group("indexOffset");
@@ -54,6 +55,10 @@ public class AdsAddress implements Address {
return new AdsAddress(Long.parseLong(indexGroup), Long.parseLong(indexOffset));
}
+ public static boolean matches(String address) {
+ return RESOURCE_ADDRESS_PATTERN.matcher(address).matches();
+ }
+
public long getIndexGroup() {
return indexGroup;
}
@@ -61,4 +66,26 @@ public class AdsAddress implements Address {
public long getIndexOffset() {
return indexOffset;
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof AdsAddress)) return false;
+ AdsAddress that = (AdsAddress) o;
+ return indexGroup == that.indexGroup &&
+ indexOffset == that.indexOffset;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(indexGroup, indexOffset);
+ }
+
+ @Override
+ public String toString() {
+ return "AdsAddress{" +
+ "indexGroup=" + indexGroup +
+ ", indexOffset=" + indexOffset +
+ '}';
+ }
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/SymbolicAdsAddress.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/SymbolicAdsAddress.java
new file mode 100644
index 0000000..3d91477
--- /dev/null
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/SymbolicAdsAddress.java
@@ -0,0 +1,74 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.model;
+
+import org.apache.plc4x.java.api.model.Address;
+
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class SymbolicAdsAddress implements Address {
+ private static final Pattern SYMBOLIC_ADDRESS_PATTERN = Pattern.compile("^(?<symbolicAddress>.+)");
+
+ private final String symbolicAddress;
+
+ private SymbolicAdsAddress(String symbolicAddress) {
+ this.symbolicAddress = Objects.requireNonNull(symbolicAddress);
+ }
+
+ public static SymbolicAdsAddress of(String address) {
+ Matcher matcher = SYMBOLIC_ADDRESS_PATTERN.matcher(address);
+ if (!matcher.matches()) {
+ throw new IllegalArgumentException(
+ "address " + address + " doesn't match '{address}' RAW:" + SYMBOLIC_ADDRESS_PATTERN);
+ }
+ String symbolicAddress = matcher.group("symbolicAddress");
+
+ return new SymbolicAdsAddress(symbolicAddress);
+ }
+
+ public static boolean matches(String address) {
+ return SYMBOLIC_ADDRESS_PATTERN.matcher(address).matches();
+ }
+
+ public String getSymbolicAddress() {
+ return symbolicAddress;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof SymbolicAdsAddress)) return false;
+ SymbolicAdsAddress that = (SymbolicAdsAddress) o;
+ return Objects.equals(symbolicAddress, that.symbolicAddress);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(symbolicAddress);
+ }
+
+ @Override
+ public String toString() {
+ return "SymbolicAdsAddress{" +
+ "symbolicAddress='" + symbolicAddress + '\'' +
+ '}';
+ }
+}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2PayloadProtocol.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2PayloadProtocol.java
index ce38a42..6beae2e 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2PayloadProtocol.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2PayloadProtocol.java
@@ -129,8 +129,8 @@ public class Ads2PayloadProtocol extends MessageToMessageCodec<ByteBuf, AmsPacke
default:
amsPacket = handleUnknownCommand(commandBuffer, amsHeader);
}
+ LOGGER.debug("Received amsPacket {}", amsPacket);
out.add(amsPacket);
- LOGGER.trace("Set amsPacket {} to out", amsPacket);
if (commandBuffer.readableBytes() > 0) {
throw new IllegalStateException("Unread bytes left: " + commandBuffer.readableBytes());
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java
index c11c819..3586bee 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java
@@ -27,6 +27,7 @@ import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
import org.apache.plc4x.java.ads.model.AdsAddress;
+import org.apache.plc4x.java.ads.model.SymbolicAdsAddress;
import org.apache.plc4x.java.api.exceptions.PlcException;
import org.apache.plc4x.java.api.exceptions.PlcIoException;
import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
@@ -64,6 +65,8 @@ public class Plc4x2AdsProtocol extends MessageToMessageCodec<AmsPacket, PlcReque
private final ConcurrentMap<Long, PlcRequestContainer<PlcRequest, PlcResponse>> requests;
+ private final ConcurrentMap<SymbolicAdsAddress, AdsAddress> addressMapping;
+
private List<Consumer<AdsDeviceNotificationRequest>> deviceNotificationListeners;
private final AmsNetId targetAmsNetId;
@@ -71,12 +74,13 @@ public class Plc4x2AdsProtocol extends MessageToMessageCodec<AmsPacket, PlcReque
private final AmsNetId sourceAmsNetId;
private final AmsPort sourceAmsPort;
- public Plc4x2AdsProtocol(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
+ public Plc4x2AdsProtocol(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, ConcurrentMap<SymbolicAdsAddress, AdsAddress> addressMapping) {
this.targetAmsNetId = targetAmsNetId;
this.targetAmsPort = targetAmsPort;
this.sourceAmsNetId = sourceAmsNetId;
this.sourceAmsPort = sourceAmsPort;
this.requests = new ConcurrentHashMap<>();
+ this.addressMapping = addressMapping;
this.deviceNotificationListeners = new LinkedList<>();
}
@@ -120,6 +124,11 @@ public class Plc4x2AdsProtocol extends MessageToMessageCodec<AmsPacket, PlcReque
}
WriteRequestItem<?> writeRequestItem = writeRequest.getRequestItems().get(0);
Address address = writeRequestItem.getAddress();
+ if (address instanceof SymbolicAdsAddress) {
+ AdsAddress mappedAddress = addressMapping.get(address);
+ LOGGER.debug("Replacing {} with {}", address, mappedAddress);
+ address = mappedAddress;
+ }
if (!(address instanceof AdsAddress)) {
throw new PlcProtocolException("Address not of type AdsAddress: " + address.getClass());
}
@@ -129,8 +138,9 @@ public class Plc4x2AdsProtocol extends MessageToMessageCodec<AmsPacket, PlcReque
IndexOffset indexOffset = IndexOffset.of(adsAddress.getIndexOffset());
byte[] bytes = encodeData(writeRequestItem.getDatatype(), writeRequestItem.getValues().toArray());
Data data = Data.of(bytes);
- AmsPacket AmsPacket = AdsWriteRequest.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, data);
- out.add(AmsPacket);
+ AmsPacket amsPacket = AdsWriteRequest.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, data);
+ LOGGER.debug("encoded write request {}", amsPacket);
+ out.add(amsPacket);
requests.put(invokeId.getAsLong(), msg);
}
@@ -142,6 +152,14 @@ public class Plc4x2AdsProtocol extends MessageToMessageCodec<AmsPacket, PlcReque
}
ReadRequestItem<?> readRequestItem = readRequest.getRequestItems().get(0);
Address address = readRequestItem.getAddress();
+ if (address instanceof SymbolicAdsAddress) {
+ AdsAddress mappedAddress = addressMapping.get(address);
+ if (mappedAddress == null) {
+ throw new PlcProtocolException("No address mapping for " + address);
+ }
+ LOGGER.debug("Replacing {} with {}", address, mappedAddress);
+ address = mappedAddress;
+ }
if (!(address instanceof AdsAddress)) {
throw new PlcProtocolException("Address not of type AdsAddress: " + address.getClass());
}
@@ -150,8 +168,9 @@ public class Plc4x2AdsProtocol extends MessageToMessageCodec<AmsPacket, PlcReque
IndexGroup indexGroup = IndexGroup.of(adsAddress.getIndexGroup());
IndexOffset indexOffset = IndexOffset.of(adsAddress.getIndexOffset());
Length length = Length.of(readRequestItem.getSize());
- AmsPacket AmsPacket = AdsReadRequest.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, length);
- out.add(AmsPacket);
+ AmsPacket amsPacket = AdsReadRequest.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, length);
+ LOGGER.debug("encoded read request {}", amsPacket);
+ out.add(amsPacket);
requests.put(invokeId.getAsLong(), msg);
}
@@ -161,8 +180,9 @@ public class Plc4x2AdsProtocol extends MessageToMessageCodec<AmsPacket, PlcReque
throw new PlcProtocolException("Unsupported proprietary type for this driver " + plcProprietaryRequest.getRequest().getClass());
}
AmsPacket amsPacket = (AmsPacket) plcProprietaryRequest.getRequest();
- requests.put(amsPacket.getAmsHeader().getInvokeId().getAsLong(), msg);
+ LOGGER.debug("encoded proprietary request {}", amsPacket);
out.add(amsPacket);
+ requests.put(amsPacket.getAmsHeader().getInvokeId().getAsLong(), msg);
}
@Override
@@ -196,6 +216,7 @@ public class Plc4x2AdsProtocol extends MessageToMessageCodec<AmsPacket, PlcReque
} else if (request instanceof PlcProprietaryRequest) {
response = decodeProprietaryResponse(amsPacket, plcRequestContainer);
}
+ LOGGER.debug("Plc4x response {}", response);
// Confirm the response being handled.
if (response != null) {
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java
new file mode 100644
index 0000000..7dfdda7
--- /dev/null
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java
@@ -0,0 +1,49 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads;
+
+import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.connection.PlcReader;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.messages.items.ReadResponseItem;
+
+import java.util.concurrent.CompletableFuture;
+
+public class ManualPlc4XAdsTest {
+
+ public static void main(String... args) throws Exception {
+ try (PlcConnection plcConnection = new PlcDriverManager().getConnection("ads:tcp://10.10.64.40/10.10.64.40.1.1:851/10.10.56.23.1.1:30000")) {
+ System.out.println("PlcConnection " + plcConnection);
+
+ PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
+
+ CompletableFuture<? extends PlcReadResponse> response = reader
+ .read(new PlcReadRequest(Integer.class, plcConnection.parseAddress("Allgemein_S2.Station")));
+
+ PlcReadResponse plcReadResponse = response.get();
+ System.out.println("Response " + plcReadResponse);
+ ReadResponseItem<?> responseItem = plcReadResponse.getResponseItem().orElseThrow(() -> new RuntimeException("No Item found"));
+ System.out.println("ResponseItem " + responseItem);
+ responseItem.getValues().stream().map(o -> "Value: " + o).forEach(System.out::println);
+ }
+ System.exit(0);
+ }
+}
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnectionTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnectionTest.java
index 0df3ce5..b59be5a 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnectionTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnectionTest.java
@@ -21,6 +21,7 @@ package org.apache.plc4x.java.ads.connection;
import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.model.AdsAddress;
+import org.apache.plc4x.java.ads.model.SymbolicAdsAddress;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -32,7 +33,7 @@ public class AdsSerialPlcConnectionTest {
private AdsSerialPlcConnection SUT;
@Before
- public void setUp() throws Exception {
+ public void setUp() {
SUT = AdsSerialPlcConnection.of("/dev/tty0", AmsNetId.of("0.0.0.0.0.0"), AmsPort.of(13));
}
@@ -48,7 +49,7 @@ public class AdsSerialPlcConnectionTest {
}
@Test
- public void emptyParseAddress() throws Exception {
+ public void emptyParseAddress() {
try {
SUT.parseAddress("");
} catch (IllegalArgumentException exception) {
@@ -57,7 +58,7 @@ public class AdsSerialPlcConnectionTest {
}
@Test
- public void parseAddress() throws Exception {
+ public void parseAddress() {
try {
AdsAddress address = (AdsAddress) SUT.parseAddress("1/1");
assertEquals(address.getIndexGroup(), 1);
@@ -66,4 +67,14 @@ public class AdsSerialPlcConnectionTest {
fail("valid data block address");
}
}
+
+ @Test
+ public void parseSymbolicAddress() {
+ try {
+ SymbolicAdsAddress address = (SymbolicAdsAddress) SUT.parseAddress("Main.variable");
+ assertEquals(address.getSymbolicAddress(), "Main.variable");
+ } catch (IllegalArgumentException exception) {
+ fail("valid data block address");
+ }
+ }
}
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnectionTests.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnectionTests.java
index b56cb75..4337be8 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnectionTests.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnectionTests.java
@@ -22,6 +22,7 @@ package org.apache.plc4x.java.ads.connection;
import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.model.AdsAddress;
+import org.apache.plc4x.java.ads.model.SymbolicAdsAddress;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -51,7 +52,7 @@ public class AdsTcpPlcConnectionTests {
}
@Test
- public void emptyParseAddress() throws Exception {
+ public void emptyParseAddress() {
try {
adsTcpPlcConnection.parseAddress("");
} catch (IllegalArgumentException exception) {
@@ -60,7 +61,7 @@ public class AdsTcpPlcConnectionTests {
}
@Test
- public void parseAddress() throws Exception {
+ public void parseAddress() {
try {
AdsAddress address = (AdsAddress) adsTcpPlcConnection.parseAddress("1/1");
assertEquals(address.getIndexGroup(), 1);
@@ -69,4 +70,14 @@ public class AdsTcpPlcConnectionTests {
fail("valid data block address");
}
}
+
+ @Test
+ public void parseSymbolicAddress() {
+ try {
+ SymbolicAdsAddress address = (SymbolicAdsAddress) adsTcpPlcConnection.parseAddress("Main.variable");
+ assertEquals(address.getSymbolicAddress(), "Main.variable");
+ } catch (IllegalArgumentException exception) {
+ fail("valid data block address");
+ }
+ }
}
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocolTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocolTest.java
index e4e8687..226bbde 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocolTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocolTest.java
@@ -46,6 +46,7 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -135,12 +136,12 @@ public class Plc4x2AdsProtocolTest {
}
@Before
- public void setUp() throws Exception {
+ public void setUp() {
AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
AmsPort targetAmsPort = AmsPort.of(7);
AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
AmsPort sourceAmsPort = AmsPort.of(14);
- SUT = new Plc4x2AdsProtocol(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
+ SUT = new Plc4x2AdsProtocol(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, new ConcurrentHashMap<>());
}
@Test
--
To stop receiving notification emails like this one, please contact
sruehl@apache.org.