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/06/07 14:50:35 UTC
[incubator-plc4x] 02/06: added ADS protocol Tracing
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 4ad7ea20ca03a6bc1e6aff156c4303b335177961
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Jun 7 09:39:17 2018 +0200
added ADS protocol Tracing
---
.../org/apache/plc4x/java/ads/protocol/Ads2PayloadProtocol.java | 2 ++
.../org/apache/plc4x/java/ads/protocol/Payload2SerialProtocol.java | 2 ++
.../org/apache/plc4x/java/ads/protocol/Payload2TcpProtocol.java | 6 ++++--
.../java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java | 2 ++
4 files changed, 10 insertions(+), 2 deletions(-)
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 6beae2e..d0d8468 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
@@ -66,6 +66,7 @@ public class Ads2PayloadProtocol extends MessageToMessageCodec<ByteBuf, AmsPacke
@Override
protected void encode(ChannelHandlerContext channelHandlerContext, AmsPacket amsPacket, List<Object> out) {
+ LOGGER.trace("(<--OUT): {}, {}, {}", channelHandlerContext, amsPacket, out);
Invoke invokeId = amsPacket.getAmsHeader().getInvokeId();
if (invokeId != Invoke.NONE) {
requests.put(invokeId, amsPacket);
@@ -75,6 +76,7 @@ public class Ads2PayloadProtocol extends MessageToMessageCodec<ByteBuf, AmsPacke
@Override
protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> out) {
+ LOGGER.trace("(-->IN): {}, {}, {}", channelHandlerContext, byteBuf, out);
AmsNetId targetAmsNetId = AmsNetId.of(byteBuf);
AmsPort targetAmsPort = AmsPort.of(byteBuf);
AmsNetId sourceAmsNetId = AmsNetId.of(byteBuf);
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Payload2SerialProtocol.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Payload2SerialProtocol.java
index 1fd4c42..d6411fd 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Payload2SerialProtocol.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Payload2SerialProtocol.java
@@ -54,6 +54,7 @@ public class Payload2SerialProtocol extends MessageToMessageCodec<ByteBuf, ByteB
@Override
protected void encode(ChannelHandlerContext channelHandlerContext, ByteBuf amsPacket, List<Object> out) throws Exception {
+ LOGGER.trace("(<--OUT): {}, {}, {}", channelHandlerContext, amsPacket, out);
while (frameOnTheWay.get() || !lock.tryLock()) {
// In this case we might not send it yet.
TimeUnit.MILLISECONDS.sleep(10);
@@ -86,6 +87,7 @@ public class Payload2SerialProtocol extends MessageToMessageCodec<ByteBuf, ByteB
@Override
protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> out) throws Exception {
+ LOGGER.trace("(-->IN): {}, {}, {}", channelHandlerContext, byteBuf, out);
MagicCookie magicCookie = MagicCookie.of(byteBuf);
TransmitterAddress transmitterAddress = TransmitterAddress.of(byteBuf);
ReceiverAddress receiverAddress = ReceiverAddress.of(byteBuf);
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Payload2TcpProtocol.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Payload2TcpProtocol.java
index b164368..c0e06fd 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Payload2TcpProtocol.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Payload2TcpProtocol.java
@@ -35,13 +35,15 @@ public class Payload2TcpProtocol extends MessageToMessageCodec<ByteBuf, ByteBuf>
private static final Logger LOGGER = LoggerFactory.getLogger(Payload2TcpProtocol.class);
@Override
- protected void encode(ChannelHandlerContext channelHandlerContext, ByteBuf amsPacket, List<Object> out) throws Exception {
+ protected void encode(ChannelHandlerContext channelHandlerContext, ByteBuf amsPacket, List<Object> out) {
+ LOGGER.trace("(<--OUT): {}, {}, {}", channelHandlerContext, amsPacket, out);
out.add(AmsTCPPacket.of(UserData.of(amsPacket)).getByteBuf());
}
@SuppressWarnings("unchecked")
@Override
- protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> out) throws Exception {
+ protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> out) {
+ LOGGER.trace("(-->IN): {}, {}, {}", channelHandlerContext, byteBuf, out);
// Reserved
byteBuf.skipBytes(AmsTcpHeader.Reserved.NUM_BYTES);
TcpLength packetLength = TcpLength.of(byteBuf);
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 577c529..7e2c19e 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
@@ -86,6 +86,7 @@ public class Plc4x2AdsProtocol extends MessageToMessageCodec<AmsPacket, PlcReque
@Override
protected void encode(ChannelHandlerContext ctx, PlcRequestContainer<PlcRequest, PlcResponse> msg, List<Object> out) throws Exception {
+ LOGGER.trace("(<--OUT): {}, {}, {}", ctx, msg, out);
PlcRequest request = msg.getRequest();
if (request instanceof PlcReadRequest) {
encodeReadRequest(msg, out);
@@ -187,6 +188,7 @@ public class Plc4x2AdsProtocol extends MessageToMessageCodec<AmsPacket, PlcReque
@Override
protected void decode(ChannelHandlerContext channelHandlerContext, AmsPacket amsPacket, List<Object> out) throws Exception {
+ LOGGER.trace("(-->IN): {}, {}, {}", channelHandlerContext, amsPacket, out);
if (amsPacket instanceof AdsDeviceNotificationRequest) {
LOGGER.debug("Received notification {}", amsPacket);
handleAdsDeviceNotificationRequest((AdsDeviceNotificationRequest) amsPacket);
--
To stop receiving notification emails like this one, please contact
sruehl@apache.org.