Use more correct ping time and only set needsB&AS on RakDatagramPacket

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

Author: Kas-tle

transport-raknet/src/main/java/org/cloudburstmc/netty/handler/codec/raknet/client/RakClientOnlineInitialHandlerCompatible.java

@@ -7,11 +7,16 @@
 import org.cloudburstmc.netty.channel.raknet.RakChannel;
 import org.cloudburstmc.netty.channel.raknet.RakPriority;
 import org.cloudburstmc.netty.channel.raknet.RakReliability;
+import org.cloudburstmc.netty.channel.raknet.config.RakChannelOption;
 import org.cloudburstmc.netty.channel.raknet.packet.RakMessage;
 import org.cloudburstmc.netty.util.RakUtils;
 
+import java.net.InetSocketAddress;
+
 import static org.cloudburstmc.netty.channel.raknet.RakConstants.ID_CONNECTED_PING;
+import static org.cloudburstmc.netty.channel.raknet.RakConstants.ID_NEW_INCOMING_CONNECTION;
 import static org.cloudburstmc.netty.channel.raknet.RakConstants.IPV4_MESSAGE_SIZE;
+import static org.cloudburstmc.netty.channel.raknet.RakConstants.LOCAL_ADDRESS;
 
 public class RakClientOnlineInitialHandlerCompatible extends RakClientOnlineInitialHandler {
     public static final String NAME = "rak-client-online-initial-handler";
@@ -36,7 +41,7 @@ void onSuccess(ChannelHandlerContext ctx) {
 
             ByteBuf pingBuffer = ctx.alloc().ioBuffer();
             pingBuffer.writeByte(ID_CONNECTED_PING);
-            pingBuffer.writeLong(System.currentTimeMillis());
+            pingBuffer.writeLong(System.nanoTime() / 1_000_000L);
             ctx.write(new RakMessage(pingBuffer, RakReliability.UNRELIABLE, RakPriority.NORMAL));
 
             ctx.write(future.get());
@@ -57,4 +62,18 @@ void onConnectionRequestAccepted(ChannelHandlerContext ctx, ByteBuf buf) {
         this.pingTime = buf.readLong();
         return;
     }
+
+    @Override
+    void writeIncomingConnection(ChannelHandlerContext ctx, ByteBuf buf, long pingTime) {
+        buf.writeByte(ID_NEW_INCOMING_CONNECTION);
+        RakUtils.writeAddress(buf, (InetSocketAddress) ctx.channel().remoteAddress());
+
+        RakUtils.writeAddress(buf, (InetSocketAddress) ctx.channel().localAddress());
+        for (int i = 0; i < this.rakChannel().config().getOption(RakChannelOption.RAK_CLIENT_INTERNAL_ADDRESSES) - 1; i++) {
+            RakUtils.writeAddress(buf, LOCAL_ADDRESS);
+        }
+
+        buf.writeLong(pingTime);
+        buf.writeLong(System.nanoTime() / 1_000_000L);
+    }
 }

transport-raknet/src/main/java/org/cloudburstmc/netty/handler/codec/raknet/common/RakSessionCodec.java

@@ -58,7 +58,7 @@ public class RakSessionCodec extends ChannelDuplexHandler {
     private RakSlidingWindow slidingWindow;
     private int splitIndex;
     private int datagramReadIndex;
-    private int datagramWriteIndex;
+    int datagramWriteIndex;
     private int reliabilityReadIndex;
     private int reliabilityWriteIndex;
     private int[] orderReadIndex;
@@ -70,7 +70,7 @@ public class RakSessionCodec extends ChannelDuplexHandler {
     private FastBinaryMinHeap<EncapsulatedPacket> outgoingPackets;
     private long[] outgoingPacketNextWeights;
     private FastBinaryMinHeap<EncapsulatedPacket>[] orderingHeaps;
-    private long currentPingTime = -1;
+    long currentPingTime = -1;
     private long lastPingTime = -1;
     private long lastPongTime = -1;
     private IntObjectMap<RakDatagramPacket> sentDatagrams;
@@ -432,15 +432,19 @@ private void onTick() {
 
         ChannelHandlerContext ctx = ctx();
 
-        if (this.currentPingTime + 2000L < curTime) {
+        this.writePing(ctx, curTime);
+
+        this.internalFlush(ctx);
+    }
+
+    void writePing(ChannelHandlerContext ctx, long curTime) {
+        if (this.currentPingTime + 2000L < curTime && this.datagramWriteIndex > 1) {
             ByteBuf buffer = ctx.alloc().ioBuffer(9);
             buffer.writeByte(ID_CONNECTED_PING);
             buffer.writeLong(curTime);
             this.currentPingTime = curTime;
             this.write(ctx, new RakMessage(buffer, RakReliability.UNRELIABLE, RakPriority.IMMEDIATE), ctx.voidPromise());
         }
-
-         this.internalFlush(ctx);
     }
 
     private void internalFlush(ChannelHandlerContext ctx) {

transport-raknet/src/main/java/org/cloudburstmc/netty/handler/codec/raknet/common/RakSessionCodecCompatible.java

@@ -1,8 +1,12 @@
 package org.cloudburstmc.netty.handler.codec.raknet.common;
 
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
 import org.cloudburstmc.netty.channel.raknet.*;
 import org.cloudburstmc.netty.channel.raknet.packet.EncapsulatedPacket;
-import org.cloudburstmc.netty.channel.raknet.packet.RakDatagramPacket;
+import org.cloudburstmc.netty.channel.raknet.packet.RakMessage;
+
+import static org.cloudburstmc.netty.channel.raknet.RakConstants.ID_CONNECTED_PING;
 
 public class RakSessionCodecCompatible extends RakSessionCodec {
     public static final String NAME = "rak-session-codec";
@@ -12,12 +16,18 @@ public RakSessionCodecCompatible(RakChannel channel) {
     }
 
     @Override
-    RakDatagramPacket createDatagramPacket() {
-        return RakDatagramPacket.newInstance();
+    EncapsulatedPacket createEncapsulatedPacket() {
+        return EncapsulatedPacket.newInstance();
     }
 
     @Override
-    EncapsulatedPacket createEncapsulatedPacket() {
-        return EncapsulatedPacket.newInstance();
+    void writePing(ChannelHandlerContext ctx, long curTime) {
+        if (this.currentPingTime + 2000L < curTime && this.datagramWriteIndex > 1) {
+            ByteBuf buffer = ctx.alloc().ioBuffer(9);
+            buffer.writeByte(ID_CONNECTED_PING);
+            buffer.writeLong(System.nanoTime() / 1_000_000L);
+            this.currentPingTime = curTime;
+            this.write(ctx, new RakMessage(buffer, RakReliability.UNRELIABLE, RakPriority.IMMEDIATE), ctx.voidPromise());
+        }
     }
 }