mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-07-15 02:08:23 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved sequence manipulators to MessageChannel

Browse Source
This commit is contained in:
Collin Smith
2020-06-24 22:16:57 -07:00
parent e36b832667
commit bfe71c1031
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/netty/src/com/riiablo/net/reliable/MessageChannel.java
View File

@ -18,6 +18,14 @@ public abstract class MessageChannel implements ReliablePacketController.PacketL
this.packetController = new ReliablePacketController(config, this); this.packetController = new ReliablePacketController(config, this);
} }
public int nextSequence() {
return sequence;
}
protected int incSequence() {
return sequence = (sequence + 1) & Packet.USHORT_MAX_VALUE;
}
public abstract void reset(); public abstract void reset();
public abstract void update(float delta, int channelId, DatagramChannel ch); public abstract void update(float delta, int channelId, DatagramChannel ch);
public abstract void sendMessage(int channelId, DatagramChannel ch, ByteBuf bb); public abstract void sendMessage(int channelId, DatagramChannel ch, ByteBuf bb);

10
server/netty/src/com/riiablo/net/reliable/ReliablePacketController.java
View File

@ -43,14 +43,6 @@ public class ReliablePacketController {
this.fragmentReassembly = new SequenceBuffer<>(FragmentReassemblyData.class, config.fragmentReassemblyBufferSize); this.fragmentReassembly = new SequenceBuffer<>(FragmentReassemblyData.class, config.fragmentReassemblyBufferSize);
} }
public int nextSequence() {
return channel.sequence;
}
private int incSequence() {
return channel.sequence = (channel.sequence + 1) & Packet.USHORT_MAX_VALUE;
}
public float rtt() { public float rtt() {
return rtt; return rtt;
} }
@ -204,7 +196,7 @@ public class ReliablePacketController {
return -1; return -1;
} }
final int sequence = incSequence(); final int sequence = channel.incSequence();
int ack, ackBits; int ack, ackBits;
synchronized (receivedPackets) { synchronized (receivedPackets) {
ack = receivedPackets.generateAck(); ack = receivedPackets.generateAck();