Batch ping/request network settings

Signed-off-by: Joshua Castle <[email protected]>
Kas-tle · Sep 23, 2024 · fea86ff · fea86ff
1 parent 8de7a22
commit fea86ff
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/network b/network
diff --git a/src/main/java/org/cloudburstmc/proxypass/ProxyPass.java b/src/main/java/org/cloudburstmc/proxypass/ProxyPass.java
@@ -232,6 +232,8 @@ public void newClient(InetSocketAddress socketAddress, Consumer<ProxyClientSessi
                 .option(RakChannelOption.RAK_IP_DONT_FRAGMENT, true)
                 .option(RakChannelOption.RAK_MTU_SIZES, new Integer[]{1492, 1200, 576})
                 .option(RakChannelOption.RAK_CLIENT_INTERNAL_ADDRESSES, 20)
+                .option(RakChannelOption.RAK_TIME_BETWEEN_SEND_CONNECTION_ATTEMPTS_MS, 500)
+                .option(RakChannelOption.RAK_CLIENT_BEDROCK_PROTOCOL_VERSION, PROTOCOL_VERSION)
                 .handler(new BedrockChannelInitializer<ProxyClientSession>() {
 
                     @Override

diff --git a/src/main/java/org/cloudburstmc/proxypass/network/bedrock/session/UpstreamPacketHandler.java b/src/main/java/org/cloudburstmc/proxypass/network/bedrock/session/UpstreamPacketHandler.java
@@ -213,14 +213,14 @@ private void initializeOnlineProxySession() {
             login.setExtra(skinData);
             login.setProtocolVersion(ProxyPass.PROTOCOL_VERSION);
 
+            // RequestNetworkSettingsPacket packet = new RequestNetworkSettingsPacket();
+            // packet.setProtocolVersion(ProxyPass.PROTOCOL_VERSION);
+            // downstream.sendPacketImmediately(packet);
+            // this.player.logger.logPacket(this.session, packet, true);
+
             downstream.setPacketHandler(new DownstreamInitialPacketHandler(downstream, proxySession, this.proxy, login));
             downstream.setLogging(true);
 
-            RequestNetworkSettingsPacket packet = new RequestNetworkSettingsPacket();
-            packet.setProtocolVersion(ProxyPass.PROTOCOL_VERSION);
-            downstream.sendPacketImmediately(packet);
-            this.player.logger.logPacket(this.session, packet, true);
-
             //SkinUtils.saveSkin(proxySession, this.skinData);
         });
     }
+3 −0		transport-raknet/src/main/java/org/cloudburstmc/netty/channel/raknet/RakConstants.java
+16 −2		transport-raknet/src/main/java/org/cloudburstmc/netty/channel/raknet/RakServerChannel.java
+31 −1		transport-raknet/src/main/java/org/cloudburstmc/netty/channel/raknet/config/DefaultRakClientConfig.java
+8 −2		transport-raknet/src/main/java/org/cloudburstmc/netty/channel/raknet/config/RakChannelMetrics.java
+13 −0		transport-raknet/src/main/java/org/cloudburstmc/netty/channel/raknet/config/RakChannelOption.java
+2 −17		transport-raknet/src/main/java/org/cloudburstmc/netty/channel/raknet/packet/EncapsulatedPacket.java
+1 −21		transport-raknet/src/main/java/org/cloudburstmc/netty/channel/raknet/packet/RakDatagramPacket.java
+2 −1		transport-raknet/src/main/java/org/cloudburstmc/netty/handler/codec/raknet/client/RakClientOfflineHandler.java
+24 −8		...-raknet/src/main/java/org/cloudburstmc/netty/handler/codec/raknet/client/RakClientOnlineInitialHandler.java
+3 −1		...ort-raknet/src/main/java/org/cloudburstmc/netty/handler/codec/raknet/client/RakClientProxyRouteHandler.java
+2 −2		transport-raknet/src/main/java/org/cloudburstmc/netty/handler/codec/raknet/common/RakDatagramCodec.java
+17 −9		transport-raknet/src/main/java/org/cloudburstmc/netty/handler/codec/raknet/common/RakSessionCodec.java
+31 −27		transport-raknet/src/main/java/org/cloudburstmc/netty/handler/codec/raknet/server/RakServerOfflineHandler.java
+10 −56		transport-raknet/src/main/java/org/cloudburstmc/netty/util/FastBinaryMinHeap.java