You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2023/12/20 07:28:46 UTC

(plc4x) 03/03: feat: Added the ability to name expectations (helping debug missing requests or replies). Continued working on the PN stuff.

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit c31148d1fba27d538db13c6f32a2a085522bea81
Author: Christofer Dutz <cd...@apache.org>
AuthorDate: Wed Dec 20 08:28:35 2023 +0100

    feat: Added the ability to name expectations (helping debug missing requests or replies). Continued working on the PN stuff.
---
 .../conversation/ConversationContextWrapper.java   |  2 +-
 .../DeferredRequestContextWrapper.java             | 20 ++++--
 .../ResolvedSendRequestContextWrapper.java         | 15 ++++-
 .../conversation/SendRequestContextWrapper.java    | 13 +++-
 .../java/profinet/readwrite/PnIoCm_Packet.java     |  4 ++
 .../apache/plc4x/java/profinet/ProfinetDriver.java |  6 +-
 .../java/profinet/packets/PnDcpPacketFactory.java  | 77 ++++++++++++++++++++--
 .../profinet/protocol/ProfinetProtocolLogic.java   | 64 ++++++++++--------
 .../plc4x/java/profinet/ManualProfinetIoTest.java  |  2 +-
 .../src/test/resources/logback-test.xml            |  2 +
 .../java/profinet/readwrite/PnIoCm_Packet.java     |  4 ++
 plc4j/integrations/apache-kafka/pom.xml            |  2 +-
 plc4j/integrations/pom.xml                         |  2 +-
 .../apache/plc4x/java/spi/ConversationContext.java |  4 ++
 .../apache/plc4x/java/spi/Plc4xNettyWrapper.java   |  5 +-
 .../spi/internal/DefaultConversationContext.java   |  4 +-
 .../spi/internal/DefaultExpectRequestContext.java  | 20 ++++--
 .../spi/internal/DefaultSendRequestContext.java    | 18 +++--
 .../java/spi/internal/HandlerRegistration.java     | 12 +++-
 .../internal/DefaultSendRequestContextTest.java    |  2 +-
 .../main/resources/protocols/profinet/pnio.mspec   |  2 +
 21 files changed, 212 insertions(+), 68 deletions(-)

diff --git a/plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/ConversationContextWrapper.java b/plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/ConversationContextWrapper.java
index 930b0a15f3..40135dee62 100644
--- a/plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/ConversationContextWrapper.java
+++ b/plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/ConversationContextWrapper.java
@@ -82,7 +82,7 @@ public class ConversationContextWrapper<C, T> implements ConversationContext<T>
 
     @Override
     public SendRequestContext<T> sendRequest(T packet) {
-        return new SendRequestContextWrapper<>(delegate.sendRequest(frameHandler.toCAN(packet)), wireType, adapter, frameHandler);
+        return new SendRequestContextWrapper<>("", delegate.sendRequest(frameHandler.toCAN(packet)), wireType, adapter, frameHandler);
     }
 
     @Override
diff --git a/plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/DeferredRequestContextWrapper.java b/plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/DeferredRequestContextWrapper.java
index 76e7105a9b..0f75fd407a 100644
--- a/plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/DeferredRequestContextWrapper.java
+++ b/plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/DeferredRequestContextWrapper.java
@@ -29,19 +29,28 @@ import org.apache.plc4x.java.spi.ConversationContext.SendRequestContext;
 
 public class DeferredRequestContextWrapper<T> implements SendRequestContext<T> {
 
+    private String name;
+
     private final SendRequestContext<T> delegate;
     private final Function<SendRequestContext<?>, SendRequestContext<?>> completer;
     protected final Consumer<TimeoutException> onTimeoutConsumer;
     protected final BiConsumer<?, ? extends Throwable> errorConsumer;
 
-    public DeferredRequestContextWrapper(SendRequestContext<T> delegate, Function<SendRequestContext<?>, SendRequestContext<?>> completer,
+    public DeferredRequestContextWrapper(String name, SendRequestContext<T> delegate, Function<SendRequestContext<?>, SendRequestContext<?>> completer,
         Consumer<TimeoutException> onTimeoutConsumer, BiConsumer<?, ? extends Throwable> errorConsumer) {
+        this.name = name;
         this.delegate = delegate;
         this.completer = completer;
         this.onTimeoutConsumer = onTimeoutConsumer;
         this.errorConsumer = errorConsumer;
     }
 
+    @Override
+    public SendRequestContext<T> name(String name) {
+        this.name = name;
+        return this;
+    }
+
     @Override
     public SendRequestContext<T> expectResponse(Class<T> clazz, Duration timeout) {
         throw new IllegalStateException("Response type is already specified");
@@ -60,17 +69,17 @@ public class DeferredRequestContextWrapper<T> implements SendRequestContext<T> {
 
     @Override
     public SendRequestContext<T> onTimeout(Consumer<TimeoutException> packetConsumer) {
-        return new DeferredRequestContextWrapper<>(delegate, completer, packetConsumer, errorConsumer);
+        return new DeferredRequestContextWrapper<>(name, delegate, completer, packetConsumer, errorConsumer);
     }
 
     @Override
     public <E extends Throwable> SendRequestContext<T> onError(BiConsumer<T, E> packetConsumer) {
-        return new DeferredRequestContextWrapper<>(delegate, completer, onTimeoutConsumer, errorConsumer);
+        return new DeferredRequestContextWrapper<>(name, delegate, completer, onTimeoutConsumer, errorConsumer);
     }
 
     @Override
     public <R> SendRequestContext<R> unwrap(Function<T, R> unwrapper) {
-        return resolve(new DeferredRequestContextWrapper<>(delegate.unwrap(unwrapper), completer, onTimeoutConsumer, errorConsumer));
+        return resolve(new DeferredRequestContextWrapper<>(name, delegate.unwrap(unwrapper), completer, onTimeoutConsumer, errorConsumer));
     }
 
     private <R> SendRequestContext<R> resolve(DeferredRequestContextWrapper<R> contextWrapper) {
@@ -82,6 +91,7 @@ public class DeferredRequestContextWrapper<T> implements SendRequestContext<T> {
 
     @Override
     public <R> SendRequestContext<R> only(Class<R> clazz) {
-        return resolve(new DeferredRequestContextWrapper<>(delegate.only(clazz), completer, onTimeoutConsumer, errorConsumer));
+        return resolve(new DeferredRequestContextWrapper<>(name, delegate.only(clazz), completer, onTimeoutConsumer, errorConsumer));
     }
+
 }
diff --git a/plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/ResolvedSendRequestContextWrapper.java b/plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/ResolvedSendRequestContextWrapper.java
index d031666d83..fa2d7d6053 100644
--- a/plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/ResolvedSendRequestContextWrapper.java
+++ b/plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/ResolvedSendRequestContextWrapper.java
@@ -29,17 +29,26 @@ import org.apache.plc4x.java.spi.ConversationContext.SendRequestContext;
 
 public class ResolvedSendRequestContextWrapper<T> implements SendRequestContext<T> {
 
+    private String name;
+
     private final SendRequestContext<T> delegate;
     private final DeferredErrorHandler<?, ?> errorHandler;
     private final DeferredTimeoutHandler<?> timeoutHandler;
 
-    public ResolvedSendRequestContextWrapper(SendRequestContext<T> delegate, DeferredErrorHandler<?, ?> errorHandler,
+    public ResolvedSendRequestContextWrapper(String name, SendRequestContext<T> delegate, DeferredErrorHandler<?, ?> errorHandler,
         DeferredTimeoutHandler<?> timeoutHandler) {
+        this.name = name;
         this.delegate = delegate;
         this.errorHandler = errorHandler;
         this.timeoutHandler = timeoutHandler;
     }
 
+    @Override
+    public SendRequestContext<T> name(String name) {
+        this.name = name;
+        return this;
+    }
+
     @Override
     public SendRequestContext<T> expectResponse(Class<T> clazz, Duration timeout) {
         throw new IllegalStateException("Response type is already specified");
@@ -70,11 +79,11 @@ public class ResolvedSendRequestContextWrapper<T> implements SendRequestContext<
 
     @Override
     public <R> SendRequestContext<R> unwrap(Function<T, R> unwrapper) {
-        return new ResolvedSendRequestContextWrapper<>(delegate.unwrap(unwrapper), errorHandler, timeoutHandler);
+        return new ResolvedSendRequestContextWrapper<>(name, delegate.unwrap(unwrapper), errorHandler, timeoutHandler);
     }
 
     @Override
     public <R> SendRequestContext<R> only(Class<R> clazz) {
-        return new ResolvedSendRequestContextWrapper<>(delegate.only(clazz), errorHandler, timeoutHandler);
+        return new ResolvedSendRequestContextWrapper<>(name, delegate.only(clazz), errorHandler, timeoutHandler);
     }
 }
diff --git a/plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/SendRequestContextWrapper.java b/plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/SendRequestContextWrapper.java
index cb517e820c..d17e2c0f74 100644
--- a/plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/SendRequestContextWrapper.java
+++ b/plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/SendRequestContextWrapper.java
@@ -31,23 +31,32 @@ import org.apache.plc4x.java.transport.can.FrameData;
 
 public class SendRequestContextWrapper<C, T> implements SendRequestContext<T> {
 
+    private String name;
+
     private final SendRequestContext<C> delegate;
     private final Class<C> wireType;
     private final Function<C, FrameData> adapter;
     private final FrameHandler<C, T> frameHandler;
 
-    public SendRequestContextWrapper(SendRequestContext<C> delegate, Class<C> wireType, Function<C, FrameData> adapter, FrameHandler<C, T> frameHandler) {
+    public SendRequestContextWrapper(String name, SendRequestContext<C> delegate, Class<C> wireType, Function<C, FrameData> adapter, FrameHandler<C, T> frameHandler) {
+        this.name = name;
         this.delegate = delegate;
         this.wireType = wireType;
         this.adapter = adapter;
         this.frameHandler = frameHandler;
     }
 
+    @Override
+    public SendRequestContext<T> name(String name) {
+        this.name = name;
+        return this;
+    }
+
     @Override
     public SendRequestContext<T> expectResponse(Class<T> clazz, Duration timeout) {
         DeferredErrorHandler<C, ?> errorHandler = new DeferredErrorHandler<>(null);
         DeferredTimeoutHandler<?> timeoutHandler = new DeferredTimeoutHandler<>(null);
-        return new ResolvedSendRequestContextWrapper<>(
+        return new ResolvedSendRequestContextWrapper<>(name,
             delegate.onError(errorHandler)
                 .onTimeout(timeoutHandler)
                 .expectResponse(wireType, timeout)
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Packet.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Packet.java
index 7ede523d3d..15c4c58a6a 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Packet.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Packet.java
@@ -117,6 +117,10 @@ public abstract class PnIoCm_Packet implements Message {
       builder = PnIoCm_Packet_Rej.staticParsePnIoCm_PacketBuilder(readBuffer, packetType);
     } else if (EvaluationHelper.equals(packetType, DceRpc_PacketType.WORKING)) {
       builder = PnIoCm_Packet_Working.staticParsePnIoCm_PacketBuilder(readBuffer, packetType);
+    } else if (EvaluationHelper.equals(packetType, DceRpc_PacketType.CONNECTIONLESS_CANCEL)) {
+      builder =
+          PnIoCm_Packet_ConnectionlessCancel.staticParsePnIoCm_PacketBuilder(
+              readBuffer, packetType);
     }
     if (builder == null) {
       throw new ParseException(
diff --git a/plc4j/drivers/profinet-ng/src/main/java/org/apache/plc4x/java/profinet/ProfinetDriver.java b/plc4j/drivers/profinet-ng/src/main/java/org/apache/plc4x/java/profinet/ProfinetDriver.java
index 48518381d0..4e36f11017 100644
--- a/plc4j/drivers/profinet-ng/src/main/java/org/apache/plc4x/java/profinet/ProfinetDriver.java
+++ b/plc4j/drivers/profinet-ng/src/main/java/org/apache/plc4x/java/profinet/ProfinetDriver.java
@@ -71,7 +71,7 @@ public class ProfinetDriver extends GeneratedDriverBase<Ethernet_Frame> implemen
     private final Logger logger = LoggerFactory.getLogger(ProfinetDriver.class);
 
     public static final Pattern MAC_ADDRESS = Pattern.compile(
-        "^([0-9A-Fa-f]{2}[\\\\.:-]){5}?");
+        "^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})?");
 
     public static final String DRIVER_CODE = "profinet";
 
@@ -211,8 +211,8 @@ public class ProfinetDriver extends GeneratedDriverBase<Ethernet_Frame> implemen
         final String transportCode = (transportCodeMatch != null) ? transportCodeMatch : getDefaultTransport();
         final String transportConfig = matcher.group("transportConfig");
         final String paramString = matcher.group("paramString");
-        Matcher macMatcher = MAC_ADDRESS.matcher(connectionString);
-        if (!macMatcher.matches()) {
+        Matcher macMatcher = MAC_ADDRESS.matcher(transportConfig);
+        if (macMatcher.matches()) {
             logger.info("Setting remote PROFINET device IP using DCP");
             ConfigurationFactory configurationFactory = new ConfigurationFactory();
             ProfinetConfiguration configuration = (ProfinetConfiguration) configurationFactory
diff --git a/plc4j/drivers/profinet-ng/src/main/java/org/apache/plc4x/java/profinet/packets/PnDcpPacketFactory.java b/plc4j/drivers/profinet-ng/src/main/java/org/apache/plc4x/java/profinet/packets/PnDcpPacketFactory.java
index 1d54ad4236..79fcffe6ac 100644
--- a/plc4j/drivers/profinet-ng/src/main/java/org/apache/plc4x/java/profinet/packets/PnDcpPacketFactory.java
+++ b/plc4j/drivers/profinet-ng/src/main/java/org/apache/plc4x/java/profinet/packets/PnDcpPacketFactory.java
@@ -51,6 +51,7 @@ public class PnDcpPacketFactory {
     public static CompletableFuture<PnDcp_Pdu_IdentifyRes> sendIdentificationRequest(ConversationContext<Ethernet_Frame> context, MacAddress localMacAddress, MacAddress remoteMacAddress) {
         CompletableFuture<PnDcp_Pdu_IdentifyRes> future = new CompletableFuture<>();
         context.sendRequest(PnDcpPacketFactory.createIdentificationRequest(localMacAddress, remoteMacAddress))
+            .name("Expect Identification response")
             .expectResponse(Ethernet_Frame.class, Duration.ofMillis(6000))
             .onTimeout(future::completeExceptionally)
             .onError((ethernetFrame, throwable) -> future.completeExceptionally(throwable))
@@ -96,6 +97,7 @@ public class PnDcpPacketFactory {
         // TODO: Handle error responses quickly (If the device doesn't support PN CM, then we can abort a lot quicker.
         CompletableFuture<PnIoCm_Block_IAndM0> future = new CompletableFuture<>();
         context.sendRequest(PnDcpPacketFactory.createReadIAndM0BlockRequest(pnChannel, driverContext))
+            .name("Expect ReadIAndM0Block response")
             .expectResponse(Ethernet_Frame.class, Duration.ofMillis(6000))
             .onTimeout(future::completeExceptionally)
             .onError((ethernetFrame, throwable) -> future.completeExceptionally(throwable))
@@ -155,6 +157,7 @@ public class PnDcpPacketFactory {
         // TODO: Handle error responses quickly (If the device doesn't support PN CM, then we can abort a lot quicker.
         CompletableFuture<PnIoCm_Block_IAndM1> future = new CompletableFuture<>();
         context.sendRequest(PnDcpPacketFactory.createReadIAndM1BlockRequest(pnChannel, driverContext))
+            .name("Expect ReadIAndM1Block response")
             .expectResponse(Ethernet_Frame.class, Duration.ofMillis(6000))
             .onTimeout(future::completeExceptionally)
             .onError((ethernetFrame, throwable) -> future.completeExceptionally(throwable))
@@ -214,6 +217,7 @@ public class PnDcpPacketFactory {
     public static CompletableFuture<PnIoCm_Block_RealIdentificationData> sendRealIdentificationDataRequest(ConversationContext<Ethernet_Frame> context, RawSocketChannel pnChannel, ProfinetDriverContext driverContext) {
         CompletableFuture<PnIoCm_Block_RealIdentificationData> future = new CompletableFuture<>();
         context.sendRequest(createReadRealIdentificationDataRequest(pnChannel, driverContext))
+            .name("Expect RealIdentificationData response")
             .expectResponse(Ethernet_Frame.class, Duration.ofMillis(6000))
             .onTimeout(future::completeExceptionally)
             .onError((ethernetFrame, throwable) -> future.completeExceptionally(throwable))
@@ -278,6 +282,7 @@ public class PnDcpPacketFactory {
     public static CompletableFuture<PnIoCm_Control_Response_ParameterEnd> sendParameterEndRequest(ConversationContext<Ethernet_Frame> context, RawSocketChannel pnChannel, ProfinetDriverContext driverContext) {
         CompletableFuture<PnIoCm_Control_Response_ParameterEnd> future = new CompletableFuture<>();
         context.sendRequest(createParameterEndRequest(pnChannel, driverContext))
+            .name("Expect ParameterEnd response")
             .expectResponse(Ethernet_Frame.class, Duration.ofMillis(6000))
             .onTimeout(future::completeExceptionally)
             .onError((ethernetFrame, throwable) -> future.completeExceptionally(throwable))
@@ -312,15 +317,15 @@ public class PnDcpPacketFactory {
         return future;
     }
 
-    public static Ethernet_Frame createApplicationReadyResponse(RawSocketChannel pnChannel, ProfinetDriverContext driverContext, Uuid arUuid, int sessionKey) {
+    public static Ethernet_Frame createApplicationReadyResponse(RawSocketChannel pnChannel, ProfinetDriverContext driverContext, int sourcePort, DceRpc_ActivityUuid activityUuid, Uuid arUuid, int sessionKey) {
         DceRpc_Packet packet = new DceRpc_Packet(
             DceRpc_PacketType.RESPONSE, true, false, false,
             IntegerEncoding.LITTLE_ENDIAN, CharacterEncoding.ASCII, FloatingPointEncoding.IEEE,
             new DceRpc_ObjectUuid((byte) 0x00, (short) 0x0001, driverContext.getDeviceId(), driverContext.getVendorId()),
-            new DceRpc_InterfaceUuid_DeviceInterface(),
-            driverContext.getActivityUuid(),
+            new DceRpc_InterfaceUuid_ControllerInterface(),
+            activityUuid,
+            0,
             0,
-            driverContext.getAndIncrementIdentification(),
             DceRpc_Operation.CONTROL,
             (short) 0,
             new PnIoCm_Packet_Res((short) 0, (short) 0, (short) 0, (short) 0, 16696, (short) 0,
@@ -330,11 +335,69 @@ public class PnDcpPacketFactory {
                 )
         );
 
-        return createEthernetFrame(pnChannel, driverContext, packet);
+        InetSocketAddress localAddress = (InetSocketAddress) pnChannel.getLocalAddress();
+        InetSocketAddress remoteAddress = (InetSocketAddress) pnChannel.getRemoteAddress();
+
+        // Serialize it to a byte-payload
+        Random rand = new Random();
+        Ethernet_FramePayload_IPv4 udpFrame = new Ethernet_FramePayload_IPv4(
+            rand.nextInt(65536),
+            true,
+            false,
+            (short) 64,
+            new IpAddress(localAddress.getAddress().getAddress()),
+            new IpAddress(remoteAddress.getAddress().getAddress()),
+            driverContext.getLocalPort(),
+            sourcePort,
+            packet
+        );
+        MacAddress srcAddress = new MacAddress(pnChannel.getLocalMacAddress().getAddress());
+        MacAddress dstAddress = new MacAddress(pnChannel.getRemoteMacAddress().getAddress());
+        return new Ethernet_Frame(
+            dstAddress,
+            srcAddress,
+            udpFrame);
+    }
+
+    public static void sendApplicationReadyResponse(ConversationContext<Ethernet_Frame> context, RawSocketChannel pnChannel, ProfinetDriverContext driverContext, int sourcePort, DceRpc_ActivityUuid activityUuid, Uuid arUuid, int sessionKey) {
+        context.sendToWire(createApplicationReadyResponse(pnChannel, driverContext, sourcePort, activityUuid, arUuid, sessionKey));
+    }
+
+    public static Ethernet_Frame createPingResponse(RawSocketChannel pnChannel, ProfinetDriverContext driverContext, Ethernet_FramePayload_IPv4 payloadIPv4) {
+        DceRpc_Packet pingRequest = payloadIPv4.getPayload();
+
+        DceRpc_Packet packet = new DceRpc_Packet(DceRpc_PacketType.WORKING,
+            false, false, false,
+            IntegerEncoding.BIG_ENDIAN, CharacterEncoding.ASCII, FloatingPointEncoding.IEEE,
+            pingRequest.getObjectUuid(), pingRequest.getInterfaceUuid(), pingRequest.getActivityUuid(),
+            0L, 0L, DceRpc_Operation.CONNECT, (short) 0, new PnIoCm_Packet_Working());
+
+        InetSocketAddress localAddress = (InetSocketAddress) pnChannel.getLocalAddress();
+        InetSocketAddress remoteAddress = (InetSocketAddress) pnChannel.getRemoteAddress();
+
+        // Serialize it to a byte-payload
+        Random rand = new Random();
+        Ethernet_FramePayload_IPv4 udpFrame = new Ethernet_FramePayload_IPv4(
+            rand.nextInt(65536),
+            true,
+            false,
+            (short) 64,
+            new IpAddress(localAddress.getAddress().getAddress()),
+            new IpAddress(remoteAddress.getAddress().getAddress()),
+            driverContext.getLocalPort(),
+            payloadIPv4.getSourcePort(),
+            packet
+        );
+        MacAddress srcAddress = new MacAddress(pnChannel.getLocalMacAddress().getAddress());
+        MacAddress dstAddress = new MacAddress(pnChannel.getRemoteMacAddress().getAddress());
+        return new Ethernet_Frame(
+            dstAddress,
+            srcAddress,
+            udpFrame);
     }
 
-    public static void sendApplicationReadyResponse(ConversationContext<Ethernet_Frame> context, RawSocketChannel pnChannel, ProfinetDriverContext driverContext, Uuid arUuid, int sessionKey) {
-        context.sendToWire(createApplicationReadyResponse(pnChannel, driverContext, arUuid, sessionKey));
+    public static void sendPingResponse(ConversationContext<Ethernet_Frame> context, RawSocketChannel pnChannel, ProfinetDriverContext driverContext, Ethernet_FramePayload_IPv4 payloadIPv4) {
+        context.sendToWire(createPingResponse(pnChannel, driverContext, payloadIPv4));
     }
 
     /**
diff --git a/plc4j/drivers/profinet-ng/src/main/java/org/apache/plc4x/java/profinet/protocol/ProfinetProtocolLogic.java b/plc4j/drivers/profinet-ng/src/main/java/org/apache/plc4x/java/profinet/protocol/ProfinetProtocolLogic.java
index fafd7209fc..6f18c97262 100644
--- a/plc4j/drivers/profinet-ng/src/main/java/org/apache/plc4x/java/profinet/protocol/ProfinetProtocolLogic.java
+++ b/plc4j/drivers/profinet-ng/src/main/java/org/apache/plc4x/java/profinet/protocol/ProfinetProtocolLogic.java
@@ -40,6 +40,7 @@ import org.apache.plc4x.java.spi.configuration.HasConfiguration;
 import org.apache.plc4x.java.spi.context.DriverContext;
 import org.apache.plc4x.java.spi.messages.DefaultPlcBrowseItem;
 import org.apache.plc4x.java.spi.messages.DefaultPlcBrowseResponse;
+import org.apache.plc4x.java.spi.messages.DefaultPlcSubscriptionResponse;
 import org.apache.plc4x.java.utils.rawsockets.netty.RawSocketChannel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -686,6 +687,7 @@ public class ProfinetProtocolLogic extends Plc4xProtocolBase<Ethernet_Frame> imp
 
         CompletableFuture<PlcSubscriptionResponse> future = new CompletableFuture<>();
         context.sendRequest(requestEthernetFrame)
+            .name("Expect Subscription response")
             .expectResponse(Ethernet_Frame.class, Duration.ofMillis(1000))
             .onTimeout(future::completeExceptionally)
             .onError((responseEthernetFrame, throwable) -> future.completeExceptionally(throwable))
@@ -700,26 +702,35 @@ public class ProfinetProtocolLogic extends Plc4xProtocolBase<Ethernet_Frame> imp
                 // TODO: Maybe do some checks on this.
 
                 // Now we wait for an incoming ApplicationReady request and confirm that.
-/*                context.expectRequest(Ethernet_Frame.class, Duration.ofMillis(500000))
+                context.expectRequest(Ethernet_Frame.class, Duration.ofMillis(500000))
+                    .name("Expect ApplicationReady request")
                     .onTimeout(future::completeExceptionally)
                     .check(ethernetFrame -> ethernetFrame.getPayload() instanceof Ethernet_FramePayload_IPv4)
-                    .unwrap(ethernetFrame -> ((Ethernet_FramePayload_IPv4) ethernetFrame.getPayload()).getPayload())
-                    .check(dceRpc_packet -> dceRpcPacket.getPayload() instanceof PnIoCm_Packet_Req)
-                    .unwrap(dceRpc_packet -> (PnIoCm_Packet_Req) dceRpcPacket.getPayload())
-                    .handle(requestPacket -> {
-                        if(requestPacket.getBlocks().size() == 1) {
-                            if (requestPacket.getBlocks().get(0) instanceof PnIoCm_Control_Request_ApplicationReady) {
-                                // TODO: Send the response back to the udp port used in the request (It differs from the usual port)
-                                System.out.println("Got ApplicationStart Request: "+ requestPacket);
-                            }
-                        }
-                    });*/
+                    .unwrap(ethernetFrame -> ((Ethernet_FramePayload_IPv4) ethernetFrame.getPayload()))
+                    .check(payloadIPv4 -> payloadIPv4.getPayload().getPayload() instanceof PnIoCm_Packet_Req)
+                    .check(payloadIPv4 -> ((PnIoCm_Packet_Req) payloadIPv4.getPayload().getPayload()).getBlocks().size() == 1 && ((PnIoCm_Packet_Req) payloadIPv4.getPayload().getPayload()).getBlocks().get(0) instanceof PnIoCm_Control_Request_ApplicationReady)
+                    .handle(payloadIPv4 -> {
+                        DceRpc_Packet dceRpc_packet = payloadIPv4.getPayload();
+                        PnIoCm_Control_Request_ApplicationReady pnIoCmBlock = (PnIoCm_Control_Request_ApplicationReady) ((PnIoCm_Packet_Req) dceRpc_packet.getPayload()).getBlocks().get(0);
+
+                        // TODO: Save these ...
+                        Uuid arUuid = pnIoCmBlock.getArUuid();
+                        int sessionKey = pnIoCmBlock.getSessionKey();
+
+                        // Send back a response, but this is just a hack ... we need to move this into the subscribe method, or we can't complete the future that we're returning.
+                        RawSocketChannel pnChannel = (RawSocketChannel) context.getChannel();
+                        PnDcpPacketFactory.sendApplicationReadyResponse(context, pnChannel, profinetDriverContext, payloadIPv4.getSourcePort(), dceRpc_packet.getActivityUuid(), arUuid, sessionKey);
+
+                        // TODO: Prepare the subscription response.
+//                        future.complete(new DefaultPlcSubscriptionResponse(subscriptionRequest, ))
+                    });
 
                 // Now send the ParameterEnd request and wait for a response.
                 CompletableFuture<PnIoCm_Control_Response_ParameterEnd> parameterEndFuture = PnDcpPacketFactory.sendParameterEndRequest(context, rawSocketChannel, profinetDriverContext);
                 parameterEndFuture.whenComplete((parameterEnd, throwable) -> {
-                    // Not quite sure what to do with this ... we already set up the listener before sending this request.
-                    System.out.println("Got Parameter End Response: " + parameterEnd);
+                    // We needed to put the code to expect the ApplicationReady to subscribe before sending,
+                    // as the device sends it within 4 ms, and we can't guarantee that we're done setting up
+                    // the listener.
                 });
             });
 
@@ -738,20 +749,17 @@ public class ProfinetProtocolLogic extends Plc4xProtocolBase<Ethernet_Frame> imp
             }
         } else if(msg.getPayload() instanceof Ethernet_FramePayload_IPv4) {
             Ethernet_FramePayload_IPv4 payloadIPv4 = (Ethernet_FramePayload_IPv4) msg.getPayload();
-            if(payloadIPv4.getPayload().getPayload() instanceof PnIoCm_Packet_Req) {
-                PnIoCm_Packet_Req pnIoCmPacketReq = (PnIoCm_Packet_Req) payloadIPv4.getPayload().getPayload();
-                if(pnIoCmPacketReq.getBlocks().size() == 1) {
-                    PnIoCm_Block pnIoCmBlock = pnIoCmPacketReq.getBlocks().get(0);
-                    if(pnIoCmBlock instanceof PnIoCm_Control_Request_ApplicationReady) {
-                        // TODO: Save these
-                        Uuid arUuid = ((PnIoCm_Control_Request_ApplicationReady) pnIoCmBlock).getArUuid();
-                        int sessionKey = ((PnIoCm_Control_Request_ApplicationReady) pnIoCmBlock).getSessionKey();
-
-                        // Send back a response, but this is just a hack ... we need to move this into the subscribe method or we can't complete the future that we're returning.
-                        RawSocketChannel pnChannel = (RawSocketChannel) context.getChannel();
-                        PnDcpPacketFactory.sendApplicationReadyResponse(context, pnChannel, profinetDriverContext, arUuid, sessionKey);
-                    }
-                }
+            if(payloadIPv4.getPayload().getPayload() instanceof PnIoCm_Packet_Ping) {
+                DceRpc_Packet pingPacket = payloadIPv4.getPayload();
+                // Send back a ping response
+                RawSocketChannel pnChannel = (RawSocketChannel) context.getChannel();
+                PnDcpPacketFactory.sendPingResponse(context, pnChannel, profinetDriverContext, payloadIPv4);
+            }
+            // The remote device terminated the connection.
+            else if(payloadIPv4.getPayload().getPayload() instanceof  PnIoCm_Packet_ConnectionlessCancel) {
+                context.getChannel().close();
+            } else {
+                System.out.println(msg);
             }
         }
     }
diff --git a/plc4j/drivers/profinet-ng/src/test/java/org/apache/plc4x/java/profinet/ManualProfinetIoTest.java b/plc4j/drivers/profinet-ng/src/test/java/org/apache/plc4x/java/profinet/ManualProfinetIoTest.java
index 86c92af608..838bb9a257 100644
--- a/plc4j/drivers/profinet-ng/src/test/java/org/apache/plc4x/java/profinet/ManualProfinetIoTest.java
+++ b/plc4j/drivers/profinet-ng/src/test/java/org/apache/plc4x/java/profinet/ManualProfinetIoTest.java
@@ -38,7 +38,7 @@ public class ManualProfinetIoTest {
                 .addCyclicTagAddress("inputs", "1.1.INPUT.0:BYTE[10]", Duration.ofMillis(400))
                 .addCyclicTagAddress("output", "1.1.OUTPUT.0:DWORD", Duration.ofMillis(400))
                 .build();
-            PlcSubscriptionResponse subscriptionResponse = subscriptionRequest.execute().get(10000, TimeUnit.MILLISECONDS);
+            PlcSubscriptionResponse subscriptionResponse = subscriptionRequest.execute().get(100000, TimeUnit.MILLISECONDS);
             System.out.println(subscriptionResponse);
         }
     }
diff --git a/plc4j/drivers/profinet-ng/src/test/resources/logback-test.xml b/plc4j/drivers/profinet-ng/src/test/resources/logback-test.xml
index cc4250b212..d5ea1081e7 100644
--- a/plc4j/drivers/profinet-ng/src/test/resources/logback-test.xml
+++ b/plc4j/drivers/profinet-ng/src/test/resources/logback-test.xml
@@ -29,6 +29,8 @@
     </encoder>
   </appender>
 
+  <logger name="org.apache.plc4x.java.spi.Plc4xNettyWrapper" level="TRACE"/>
+
   <root level="info">
     <appender-ref ref="STDOUT" />
   </root>
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Packet.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Packet.java
index 7ede523d3d..15c4c58a6a 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Packet.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Packet.java
@@ -117,6 +117,10 @@ public abstract class PnIoCm_Packet implements Message {
       builder = PnIoCm_Packet_Rej.staticParsePnIoCm_PacketBuilder(readBuffer, packetType);
     } else if (EvaluationHelper.equals(packetType, DceRpc_PacketType.WORKING)) {
       builder = PnIoCm_Packet_Working.staticParsePnIoCm_PacketBuilder(readBuffer, packetType);
+    } else if (EvaluationHelper.equals(packetType, DceRpc_PacketType.CONNECTIONLESS_CANCEL)) {
+      builder =
+          PnIoCm_Packet_ConnectionlessCancel.staticParsePnIoCm_PacketBuilder(
+              readBuffer, packetType);
     }
     if (builder == null) {
       throw new ParseException(
diff --git a/plc4j/integrations/apache-kafka/pom.xml b/plc4j/integrations/apache-kafka/pom.xml
index 5157ed91a0..3dbe33c4b8 100644
--- a/plc4j/integrations/apache-kafka/pom.xml
+++ b/plc4j/integrations/apache-kafka/pom.xml
@@ -82,7 +82,7 @@
                     <sourceUrl>https://plc4x.apache.org/users/download.html</sourceUrl>
 
                     <supportProviderName>PLC4X</supportProviderName>
-                    <supportSummary>The PLC4X Connnectors are supported by the community</supportSummary>
+                    <supportSummary>The PLC4X Connectors are supported by the community</supportSummary>
                     <supportUrl>https://plc4x.apache.org/index.html</supportUrl>
                     <supportLogo>../../../media/logos/300ppi/PLC4X.png</supportLogo>
 
diff --git a/plc4j/integrations/pom.xml b/plc4j/integrations/pom.xml
index 922c9a900e..c09fc26ead 100644
--- a/plc4j/integrations/pom.xml
+++ b/plc4j/integrations/pom.xml
@@ -47,7 +47,7 @@
     <profile>
       <id>.below-java-21</id>
       <activation>
-        <jdk>[1.8,21)</jdk>
+        <jdk>[11,21)</jdk>
       </activation>
       <modules>
         <module>apache-kafka</module>
diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/ConversationContext.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/ConversationContext.java
index 72508b5484..2856b563cf 100644
--- a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/ConversationContext.java
+++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/ConversationContext.java
@@ -51,6 +51,8 @@ public interface ConversationContext<T> {
 
     interface SendRequestContext<T> {
 
+        SendRequestContext<T> name(String name);
+
         SendRequestContext<T> expectResponse(Class<T> clazz, Duration timeout);
 
         SendRequestContext<T> check(Predicate<T> checker);
@@ -70,6 +72,8 @@ public interface ConversationContext<T> {
 
     interface ExpectRequestContext<T> {
 
+        ExpectRequestContext<T> name(String name);
+
         ExpectRequestContext<T> check(Predicate<T> checker);
 
         ContextHandler handle(Consumer<T> packetConsumer);
diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/Plc4xNettyWrapper.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/Plc4xNettyWrapper.java
index e6fdf575b5..b1dbb37b58 100644
--- a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/Plc4xNettyWrapper.java
+++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/Plc4xNettyWrapper.java
@@ -114,12 +114,12 @@ public class Plc4xNettyWrapper<T> extends MessageToMessageCodec<T, Object> {
 
             @Override
             public SendRequestContext<T> sendRequest(T packet) {
-                return new DefaultSendRequestContext<>(Plc4xNettyWrapper.this::registerHandler, packet, this);
+                return new DefaultSendRequestContext<>(null, Plc4xNettyWrapper.this::registerHandler, packet, this);
             }
 
             @Override
             public ExpectRequestContext<T> expectRequest(Class<T> clazz, Duration timeout) {
-                return new DefaultExpectRequestContext<>(Plc4xNettyWrapper.this::registerHandler, clazz, timeout, this);
+                return new DefaultExpectRequestContext<>(null, Plc4xNettyWrapper.this::registerHandler, clazz, timeout, this);
             }
 
         });
@@ -232,6 +232,7 @@ public class Plc4xNettyWrapper<T> extends MessageToMessageCodec<T, Object> {
         });
         // wrap handler, so we can catch packet consumer call and inform completion callback.
         HandlerRegistration registration = new HandlerRegistration(
+            handler.getName(),
             handler.getCommands(),
             handler.getExpectClazz(),
             completionCallback.andThen(handler.getPacketConsumer()),
diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/internal/DefaultConversationContext.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/internal/DefaultConversationContext.java
index 9f7bf3256b..658effd65f 100644
--- a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/internal/DefaultConversationContext.java
+++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/internal/DefaultConversationContext.java
@@ -90,7 +90,7 @@ public class DefaultConversationContext<T1> implements ConversationContext<T1> {
 
     @Override
     public SendRequestContext<T1> sendRequest(T1 packet) {
-        return new DefaultSendRequestContext<>(handler -> {
+        return new DefaultSendRequestContext<>(null, handler -> {
             logger.trace("Adding Response Handler ...");
             handlerRegistrar.accept(handler);
         }, packet, this);
@@ -98,7 +98,7 @@ public class DefaultConversationContext<T1> implements ConversationContext<T1> {
 
     @Override
     public ExpectRequestContext<T1> expectRequest(Class<T1> clazz, Duration timeout) {
-        return new DefaultExpectRequestContext<>(handler -> {
+        return new DefaultExpectRequestContext<>(null, handler -> {
             logger.trace("Adding Request Handler ...");
             handlerRegistrar.accept(handler);
         }, clazz, timeout, this);
diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/internal/DefaultExpectRequestContext.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/internal/DefaultExpectRequestContext.java
index ec9be896c3..4bf9d020cc 100644
--- a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/internal/DefaultExpectRequestContext.java
+++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/internal/DefaultExpectRequestContext.java
@@ -22,7 +22,6 @@ import io.vavr.control.Either;
 import org.apache.plc4x.java.spi.ConversationContext;
 
 import java.time.Duration;
-import java.time.Instant;
 import java.util.Deque;
 import java.util.LinkedList;
 import java.util.concurrent.TimeoutException;
@@ -33,6 +32,8 @@ import java.util.function.Predicate;
 
 public class DefaultExpectRequestContext<T> implements ConversationContext.ExpectRequestContext<T> {
 
+    protected String name;
+
     protected Deque<Either<Function<?, ?>, Predicate<?>>> commands = new LinkedList<>();
 
     protected final Consumer<HandlerRegistration> finisher;
@@ -50,14 +51,16 @@ public class DefaultExpectRequestContext<T> implements ConversationContext.Expec
     protected final Duration timeout;
     private HandlerRegistration registration;
 
-    public DefaultExpectRequestContext(Consumer<HandlerRegistration> finisher, Class<T> expectClazz, Duration timeout, ConversationContext<T> context) {
+    public DefaultExpectRequestContext(String name, Consumer<HandlerRegistration> finisher, Class<T> expectClazz, Duration timeout, ConversationContext<T> context) {
+        this.name = name;
         this.finisher = finisher;
         this.expectClazz = expectClazz;
         this.timeout = timeout;
         this.context = context;
     }
 
-    protected DefaultExpectRequestContext(Deque<Either<Function<?, ?>, Predicate<?>>> commands, Duration timeout, Consumer<HandlerRegistration> finisher, ConversationContext<T> context, Class<?> expectClazz, Consumer<?> packetConsumer, Consumer<TimeoutException> onTimeoutConsumer, BiConsumer<?, ? extends Throwable> errorConsumer) {
+    protected DefaultExpectRequestContext(String name, Deque<Either<Function<?, ?>, Predicate<?>>> commands, Duration timeout, Consumer<HandlerRegistration> finisher, ConversationContext<T> context, Class<?> expectClazz, Consumer<?> packetConsumer, Consumer<TimeoutException> onTimeoutConsumer, BiConsumer<?, ? extends Throwable> errorConsumer) {
+        this.name = name;
         this.commands = commands;
         this.timeout = timeout;
         this.finisher = finisher;
@@ -68,6 +71,12 @@ public class DefaultExpectRequestContext<T> implements ConversationContext.Expec
         this.errorConsumer = errorConsumer;
     }
 
+    @Override
+    public ConversationContext.ExpectRequestContext<T> name(String name) {
+        this.name = name;
+        return this;
+    }
+
     @Override
     public ConversationContext.ExpectRequestContext<T> check(Predicate<T> checker) {
         commands.addLast(Either.right(checker));
@@ -80,7 +89,8 @@ public class DefaultExpectRequestContext<T> implements ConversationContext.Expec
             throw new ConversationContext.PlcWiringException("can't handle multiple consumers");
         }
         this.packetConsumer = packetConsumer;
-        registration = new HandlerRegistration(commands, expectClazz, packetConsumer, onTimeoutConsumer, errorConsumer, timeout);
+        registration = new HandlerRegistration(name, commands, expectClazz, packetConsumer, onTimeoutConsumer,
+            errorConsumer, timeout);
         finisher.accept(registration);
         return new DefaultContextHandler(registration, registration::cancel);
     }
@@ -114,7 +124,7 @@ public class DefaultExpectRequestContext<T> implements ConversationContext.Expec
             };
         }
         commands.addLast(Either.left(unwrapper));
-        return new DefaultExpectRequestContext<>(commands, timeout, finisher, (ConversationContext<R>) context, expectClazz, packetConsumer, onTimeoutConsumer, errorConsumer);
+        return new DefaultExpectRequestContext<>(name, commands, timeout, finisher, (ConversationContext<R>) context, expectClazz, packetConsumer, onTimeoutConsumer, errorConsumer);
     }
 
 }
diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/internal/DefaultSendRequestContext.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/internal/DefaultSendRequestContext.java
index c975a65149..bf0393ef97 100644
--- a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/internal/DefaultSendRequestContext.java
+++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/internal/DefaultSendRequestContext.java
@@ -32,6 +32,8 @@ import java.util.function.Predicate;
 
 public class DefaultSendRequestContext<T> implements ConversationContext.SendRequestContext<T> {
 
+    protected String name;
+
     protected Deque<Either<Function<?, ?>, Predicate<?>>> commands = new LinkedList<>();
 
     protected final Consumer<HandlerRegistration> finisher;
@@ -50,13 +52,15 @@ public class DefaultSendRequestContext<T> implements ConversationContext.SendReq
 
     protected Duration timeout = Duration.ofMillis(1000);
 
-    public DefaultSendRequestContext(Consumer<HandlerRegistration> finisher, T request, ConversationContext<T> context) {
+    public DefaultSendRequestContext(String name, Consumer<HandlerRegistration> finisher, T request, ConversationContext<T> context) {
+        this.name = name;
         this.finisher = finisher;
         this.request = request;
         this.context = context;
     }
 
-    protected DefaultSendRequestContext(Deque<Either<Function<?, ?>, Predicate<?>>> commands, Duration timeout, Consumer<HandlerRegistration> finisher, T request, ConversationContext<T> context, Class<?> expectClazz, Consumer<?> packetConsumer, Consumer<TimeoutException> onTimeoutConsumer, BiConsumer<?, ? extends Throwable> errorConsumer) {
+    protected DefaultSendRequestContext(String name, Deque<Either<Function<?, ?>, Predicate<?>>> commands, Duration timeout, Consumer<HandlerRegistration> finisher, T request, ConversationContext<T> context, Class<?> expectClazz, Consumer<?> packetConsumer, Consumer<TimeoutException> onTimeoutConsumer, BiConsumer<?, ? extends Throwable> errorConsumer) {
+        this.name = name;
         this.commands = commands;
         this.timeout = timeout;
         this.finisher = finisher;
@@ -79,6 +83,12 @@ public class DefaultSendRequestContext<T> implements ConversationContext.SendReq
         return this;
     }
 
+    @Override
+    public ConversationContext.SendRequestContext<T> name(String name) {
+        this.name = name;
+        return this;
+    }
+
     @Override
     public ConversationContext.SendRequestContext<T> check(Predicate<T> checker) {
         commands.addLast(Either.right(checker));
@@ -91,7 +101,7 @@ public class DefaultSendRequestContext<T> implements ConversationContext.SendReq
             throw new ConversationContext.PlcWiringException("can't handle multiple consumers");
         }
         this.packetConsumer = packetConsumer;
-        final HandlerRegistration registration = new HandlerRegistration(commands, expectClazz, packetConsumer,
+        final HandlerRegistration registration = new HandlerRegistration(name, commands, expectClazz, packetConsumer,
             onTimeoutConsumer, errorConsumer, timeout);
         finisher.accept(registration);
         context.sendToWire(request);
@@ -125,7 +135,7 @@ public class DefaultSendRequestContext<T> implements ConversationContext.SendReq
             onTimeoutConsumer = new NoopTimeoutConsumer();
         }
         commands.addLast(Either.left(unwrapper));
-        return new DefaultSendRequestContext<>(commands, timeout, finisher, (R) request, (ConversationContext<R>) context, expectClazz, packetConsumer, onTimeoutConsumer, errorConsumer);
+        return new DefaultSendRequestContext<>(name, commands, timeout, finisher, (R) request, (ConversationContext<R>) context, expectClazz, packetConsumer, onTimeoutConsumer, errorConsumer);
     }
 
     @Override
diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/internal/HandlerRegistration.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/internal/HandlerRegistration.java
index 8ada15fee9..17cd6e094c 100644
--- a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/internal/HandlerRegistration.java
+++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/internal/HandlerRegistration.java
@@ -38,6 +38,8 @@ public class HandlerRegistration implements Future<Void> {
 
     private final int id = counter++;
 
+    private final String name;
+
     private final Deque<Either<Function<?, ?>, Predicate<?>>> commands;
 
     private final Class<?> expectClazz;
@@ -54,8 +56,9 @@ public class HandlerRegistration implements Future<Void> {
 
     private final CompletableFuture<Void> handled = new CompletableFuture<>();
 
-    public HandlerRegistration(Deque<Either<Function<?, ?>, Predicate<?>>> commands, Class<?> expectClazz, Consumer<?> packetConsumer, Consumer<TimeoutException> onTimeoutConsumer, BiConsumer<?, ? extends Throwable> errorConsumer, Duration timeout) {
+    public HandlerRegistration(String name, Deque<Either<Function<?, ?>, Predicate<?>>> commands, Class<?> expectClazz, Consumer<?> packetConsumer, Consumer<TimeoutException> onTimeoutConsumer, BiConsumer<?, ? extends Throwable> errorConsumer, Duration timeout) {
         this(
+            name,
             commands,
             expectClazz,
             packetConsumer,
@@ -68,7 +71,8 @@ public class HandlerRegistration implements Future<Void> {
         );
     }
 
-    public HandlerRegistration(Deque<Either<Function<?, ?>, Predicate<?>>> commands, Class<?> expectClazz, Consumer<?> packetConsumer, Consumer<TimeoutException> onTimeoutConsumer, BiConsumer<?, ? extends Throwable> errorConsumer, Runnable onHandled, Runnable onError, Runnable onCancelled, Duration timeout) {
+    public HandlerRegistration(String name, Deque<Either<Function<?, ?>, Predicate<?>>> commands, Class<?> expectClazz, Consumer<?> packetConsumer, Consumer<TimeoutException> onTimeoutConsumer, BiConsumer<?, ? extends Throwable> errorConsumer, Runnable onHandled, Runnable onError, Runnable onCancelled, Duration timeout) {
+        this.name = name;
         this.commands = commands;
         this.expectClazz = expectClazz;
         this.packetConsumer = packetConsumer;
@@ -80,6 +84,10 @@ public class HandlerRegistration implements Future<Void> {
         this.timeout = timeout;
     }
 
+    public String getName() {
+        return name;
+    }
+
     public Deque<Either<Function<?, ?>, Predicate<?>>> getCommands() {
         return commands;
     }
diff --git a/plc4j/spi/src/test/java/org/apache/plc4x/java/spi/internal/DefaultSendRequestContextTest.java b/plc4j/spi/src/test/java/org/apache/plc4x/java/spi/internal/DefaultSendRequestContextTest.java
index 11b28df2fc..b9289d15ef 100644
--- a/plc4j/spi/src/test/java/org/apache/plc4x/java/spi/internal/DefaultSendRequestContextTest.java
+++ b/plc4j/spi/src/test/java/org/apache/plc4x/java/spi/internal/DefaultSendRequestContextTest.java
@@ -49,7 +49,7 @@ class DefaultSendRequestContextTest {
 
     @BeforeEach
     void setUp() {
-        SUT = new DefaultSendRequestContext(finisher, null, context);
+        SUT = new DefaultSendRequestContext(null, finisher, null, context);
     }
 
     @Test
diff --git a/protocols/profinet/src/main/resources/protocols/profinet/pnio.mspec b/protocols/profinet/src/main/resources/protocols/profinet/pnio.mspec
index 16114b37b9..e471a734dc 100644
--- a/protocols/profinet/src/main/resources/protocols/profinet/pnio.mspec
+++ b/protocols/profinet/src/main/resources/protocols/profinet/pnio.mspec
@@ -61,6 +61,8 @@
         ]
         ['WORKING'  PnIoCm_Packet_Working
         ]
+        ['CONNECTIONLESS_CANCEL' PnIoCm_Packet_ConnectionlessCancel
+        ]
     ]
 ]