Do not set raknet flag NEEDS_B_AND_AS in compatibility mode

Signed-off-by: GitHub <noreply@github.com>

Author: Kas-tle

transport-raknet/src/main/java/org/cloudburstmc/netty/channel/raknet/packet/RakDatagramPacket.java

@@ -30,7 +30,7 @@ public class RakDatagramPacket extends AbstractReferenceCounted {
 
     private final ObjectPool.Handle<RakDatagramPacket> handle;
     private final List<EncapsulatedPacket> packets = new ArrayList<>();
-    private byte flags = FLAG_VALID | FLAG_NEEDS_B_AND_AS;
+    private byte flags = FLAG_VALID;
     private long sendTime;
     private long nextSend;
     private int sequenceIndex = -1;
@@ -86,7 +86,7 @@ protected void deallocate() {
             packet.release();
         }
         this.packets.clear();
-        this.flags = FLAG_VALID | FLAG_NEEDS_B_AND_AS;
+        this.flags = FLAG_VALID;
         this.sendTime = 0;
         this.nextSend = 0;
         this.sequenceIndex = -1;
@@ -114,6 +114,10 @@ public void setFlags(byte flags) {
         this.flags = flags;
     }
 
+    public void setFlag(byte flag) {
+        this.flags |= flag;
+    }
+
     public long getSendTime() {
         return sendTime;
     }

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

@@ -14,10 +14,9 @@
 import org.cloudburstmc.netty.handler.codec.raknet.common.RakAcknowledgeHandler;
 import org.cloudburstmc.netty.handler.codec.raknet.common.RakDatagramCodec;
 import org.cloudburstmc.netty.handler.codec.raknet.common.RakSessionCodec;
+import org.cloudburstmc.netty.handler.codec.raknet.common.RakSessionCodecCompatible;
 import org.cloudburstmc.netty.util.RakUtils;
 
-import static org.cloudburstmc.netty.channel.raknet.RakConstants.MAXIMUM_MTU_SIZE;
-
 public class RakClientOfflineHandlerCompatible extends RakClientOfflineHandler {
     public static final String NAME = "rak-client-handler";
 
@@ -36,7 +35,7 @@ void onRetryAttempt(Channel channel) {
 
     @Override
     void onSuccess(ChannelHandlerContext ctx) {
-        RakSessionCodec sessionCodec = new RakSessionCodec(this.rakChannel());
+        RakSessionCodec sessionCodec = new RakSessionCodecCompatible(this.rakChannel());
         ctx.pipeline().addAfter(NAME, RakDatagramCodec.NAME, new RakDatagramCodec());
         ctx.pipeline().addAfter(RakDatagramCodec.NAME, RakAcknowledgeHandler.NAME, new RakAcknowledgeHandler(sessionCodec));
         ctx.pipeline().addAfter(RakAcknowledgeHandler.NAME, RakSessionCodec.NAME, sessionCodec);

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

@@ -580,7 +580,7 @@ private void sendDatagrams(ChannelHandlerContext ctx, long curTime, int mtuSize)
         }
 
         int transmissionBandwidth = this.slidingWindow.getTransmissionBandwidth();
-        RakDatagramPacket datagram = RakDatagramPacket.newInstance();
+        RakDatagramPacket datagram = this.createDatagramPacket();
         datagram.setSendTime(curTime);
         EncapsulatedPacket packet;
 
@@ -597,7 +597,7 @@ private void sendDatagrams(ChannelHandlerContext ctx, long curTime, int mtuSize)
             if (!datagram.tryAddPacket(packet, mtuSize)) {
                 this.sendDatagram(ctx, datagram, curTime, this.sentDatagrams);
 
-                datagram = RakDatagramPacket.newInstance();
+                datagram = this.createDatagramPacket();
                 datagram.setSendTime(curTime);
                 if (!datagram.tryAddPacket(packet, mtuSize)) {
                     throw new IllegalArgumentException("Packet too large to fit in MTU (size: " + packet.getSize() + ", MTU: " + mtuSize + ")");
@@ -613,7 +613,7 @@ private void sendDatagrams(ChannelHandlerContext ctx, long curTime, int mtuSize)
     private void sendImmediate(ChannelHandlerContext ctx, EncapsulatedPacket[] packets) {
         long curTime = System.currentTimeMillis();
         for (EncapsulatedPacket packet : packets) {
-            RakDatagramPacket datagram = RakDatagramPacket.newInstance();
+            RakDatagramPacket datagram = this.createDatagramPacket();
             datagram.setSendTime(curTime);
             if (!datagram.tryAddPacket(packet, this.getMtu())) {
                 throw new IllegalArgumentException("Packet too large to fit in MTU (size: " + packet.getSize() + ", MTU: " + this.getMtu() + ")");
@@ -705,9 +705,8 @@ private EncapsulatedPacket[] createEncapsulated(RakMessage rakMessage) {
         // Now create the packets.
         EncapsulatedPacket[] packets = new EncapsulatedPacket[buffers.length];
         for (int i = 0, parts = buffers.length; i < parts; i++) {
-            EncapsulatedPacket packet = EncapsulatedPacket.newInstance();
+            EncapsulatedPacket packet = this.createEncapsulatedPacket();
             packet.setBuffer(buffers[i]);
-            packet.setNeedsBAS(true);
             packet.setOrderingChannel((short) orderingChannel);
             packet.setOrderingIndex(orderingIndex);
             // packet.setSequenceIndex(sequencingIndex);
@@ -870,4 +869,16 @@ protected Queue<IntRange> getAcknowledgeQueue(boolean nack) {
     public Channel getChannel() {
         return channel;
     }
+
+    protected RakDatagramPacket createDatagramPacket() {
+        RakDatagramPacket datagram = RakDatagramPacket.newInstance();
+        datagram.setFlag(FLAG_NEEDS_B_AND_AS);
+        return datagram;
+    }
+
+    protected EncapsulatedPacket createEncapsulatedPacket() {
+        EncapsulatedPacket packet = EncapsulatedPacket.newInstance();
+        packet.setNeedsBAS(true);
+        return packet;
+    }
 }

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

@@ -0,0 +1,23 @@
+package org.cloudburstmc.netty.handler.codec.raknet.common;
+
+import org.cloudburstmc.netty.channel.raknet.*;
+import org.cloudburstmc.netty.channel.raknet.packet.EncapsulatedPacket;
+import org.cloudburstmc.netty.channel.raknet.packet.RakDatagramPacket;
+
+public class RakSessionCodecCompatible extends RakSessionCodec {
+    public static final String NAME = "rak-session-codec";
+
+    public RakSessionCodecCompatible(RakChannel channel) {
+        super(channel);
+    }
+
+    @Override
+    protected RakDatagramPacket createDatagramPacket() {
+        return RakDatagramPacket.newInstance();
+    }
+
+    @Override
+    protected EncapsulatedPacket createEncapsulatedPacket() {
+        return EncapsulatedPacket.newInstance();
+    }
+}