From 35587ff1d67b2b91eba6a2868c8fa110b1bbd07b Mon Sep 17 00:00:00 2001 From: ian Date: Sat, 30 Dec 2023 16:59:33 +1100 Subject: [PATCH] Ping over remote relay is working!!! --- .../io/libp2p/protocol/circuit/CircuitHopProtocol.java | 7 +++++++ .../io/libp2p/protocol/circuit/CircuitStopProtocol.java | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/libp2p/src/main/java/io/libp2p/protocol/circuit/CircuitHopProtocol.java b/libp2p/src/main/java/io/libp2p/protocol/circuit/CircuitHopProtocol.java index 55d78688..d6931e83 100644 --- a/libp2p/src/main/java/io/libp2p/protocol/circuit/CircuitHopProtocol.java +++ b/libp2p/src/main/java/io/libp2p/protocol/circuit/CircuitHopProtocol.java @@ -21,6 +21,8 @@ import java.util.concurrent.*; import java.util.function.*; import java.util.stream.*; + +import io.netty.handler.codec.protobuf.*; import org.jetbrains.annotations.*; public class CircuitHopProtocol extends ProtobufProtocolHandler { @@ -173,6 +175,11 @@ public static class SenderUpgrader extends ChannelInitializer { protected void initChannel(@NotNull Channel ch) throws Exception { System.out.println("Removed Hop handler"); ch.pipeline().remove(INITIATOR_HANDLER_NAME); + // also remove associated protobuf handlers + ch.pipeline().remove(ProtobufDecoder.class); + ch.pipeline().remove(ProtobufEncoder.class); + ch.pipeline().remove(ProtobufVarint32FrameDecoder.class); + ch.pipeline().remove(ProtobufVarint32LengthFieldPrepender.class); ch.pipeline().remove(STREAM_CLEARER_NAME); } } diff --git a/libp2p/src/main/java/io/libp2p/protocol/circuit/CircuitStopProtocol.java b/libp2p/src/main/java/io/libp2p/protocol/circuit/CircuitStopProtocol.java index 6fc81023..eb2c5beb 100644 --- a/libp2p/src/main/java/io/libp2p/protocol/circuit/CircuitStopProtocol.java +++ b/libp2p/src/main/java/io/libp2p/protocol/circuit/CircuitStopProtocol.java @@ -8,6 +8,7 @@ import java.util.concurrent.*; import io.netty.channel.*; +import io.netty.handler.codec.protobuf.*; import org.jetbrains.annotations.*; public class CircuitStopProtocol @@ -77,6 +78,10 @@ public static class ReceiverUpgrader extends ChannelInitializer { @Override protected void initChannel(@NotNull Channel ch) throws Exception { System.out.println("Removed Stop handler"); + ch.pipeline().remove(ProtobufDecoder.class); + ch.pipeline().remove(ProtobufEncoder.class); + ch.pipeline().remove(ProtobufVarint32FrameDecoder.class); + ch.pipeline().remove(ProtobufVarint32LengthFieldPrepender.class); ch.pipeline().remove(RECEIVER_HANDLER_NAME); ch.pipeline().remove(STREAM_CLEARER_NAME); }