From 101cc92be41540e22b393230007fc443fb5e89d7 Mon Sep 17 00:00:00 2001 From: Collin Smith Date: Fri, 19 Jun 2020 15:01:01 -0700 Subject: [PATCH] Added protocol field to netty packet header --- .../com/riiablo/net/packet/netty/Header.java | 20 +++++++++++-------- core/src/com/riiablo/net/netty/Netty.fbs | 1 + 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/core/gen/com/riiablo/net/packet/netty/Header.java b/core/gen/com/riiablo/net/packet/netty/Header.java index 1109b6aa..b6a161d9 100644 --- a/core/gen/com/riiablo/net/packet/netty/Header.java +++ b/core/gen/com/riiablo/net/packet/netty/Header.java @@ -14,25 +14,29 @@ public final class Header extends Table { public void __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; vtable_start = bb_pos - bb.getInt(bb_pos); vtable_size = bb.getShort(vtable_start); } public Header __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - public int sequence() { int o = __offset(4); return o != 0 ? bb.getShort(o + bb_pos) & 0xFFFF : 0; } - public int ack() { int o = __offset(6); return o != 0 ? bb.getShort(o + bb_pos) & 0xFFFF : 0; } - public int ackBits() { int o = __offset(8); return o != 0 ? bb.getInt(o + bb_pos) : 0; } + public int protocol() { int o = __offset(4); return o != 0 ? bb.get(o + bb_pos) & 0xFF : 0; } + public int sequence() { int o = __offset(6); return o != 0 ? bb.getShort(o + bb_pos) & 0xFFFF : 0; } + public int ack() { int o = __offset(8); return o != 0 ? bb.getShort(o + bb_pos) & 0xFFFF : 0; } + public int ackBits() { int o = __offset(10); return o != 0 ? bb.getInt(o + bb_pos) : 0; } public static int createHeader(FlatBufferBuilder builder, + int protocol, int sequence, int ack, int ack_bits) { - builder.startObject(3); + builder.startObject(4); Header.addAckBits(builder, ack_bits); Header.addAck(builder, ack); Header.addSequence(builder, sequence); + Header.addProtocol(builder, protocol); return Header.endHeader(builder); } - public static void startHeader(FlatBufferBuilder builder) { builder.startObject(3); } - public static void addSequence(FlatBufferBuilder builder, int sequence) { builder.addShort(0, (short)sequence, (short)0); } - public static void addAck(FlatBufferBuilder builder, int ack) { builder.addShort(1, (short)ack, (short)0); } - public static void addAckBits(FlatBufferBuilder builder, int ackBits) { builder.addInt(2, ackBits, 0); } + public static void startHeader(FlatBufferBuilder builder) { builder.startObject(4); } + public static void addProtocol(FlatBufferBuilder builder, int protocol) { builder.addByte(0, (byte)protocol, (byte)0); } + public static void addSequence(FlatBufferBuilder builder, int sequence) { builder.addShort(1, (short)sequence, (short)0); } + public static void addAck(FlatBufferBuilder builder, int ack) { builder.addShort(2, (short)ack, (short)0); } + public static void addAckBits(FlatBufferBuilder builder, int ackBits) { builder.addInt(3, ackBits, 0); } public static int endHeader(FlatBufferBuilder builder) { int o = builder.endObject(); return o; diff --git a/core/src/com/riiablo/net/netty/Netty.fbs b/core/src/com/riiablo/net/netty/Netty.fbs index c4392648..3cea6ed8 100644 --- a/core/src/com/riiablo/net/netty/Netty.fbs +++ b/core/src/com/riiablo/net/netty/Netty.fbs @@ -3,6 +3,7 @@ include "Packets.fbs"; namespace com.riiablo.net.packet.netty; table Header { + protocol:uint8; sequence:uint16; ack:uint16; ack_bits:int32;