From 8a38fd71393bb358089fe994990e811cec063c62 Mon Sep 17 00:00:00 2001 From: Collin Smith Date: Thu, 25 Jun 2020 12:18:44 -0700 Subject: [PATCH] Added Channel field to processPacket callback to retrieve attributes and manage connection --- core/src/com/riiablo/net/PacketProcessor.java | 3 ++- core/src/com/riiablo/net/reliable/ReliableEndpoint.java | 2 +- core/src/com/riiablo/net/tcp/TcpEndpoint.java | 2 +- server/netty/src/com/riiablo/net/reliable/TestClient.java | 3 ++- server/netty/src/com/riiablo/net/reliable/TestServer.java | 3 ++- server/netty/src/com/riiablo/net/tcp/TestClient.java | 3 ++- server/netty/src/com/riiablo/net/tcp/TestServer.java | 3 ++- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/core/src/com/riiablo/net/PacketProcessor.java b/core/src/com/riiablo/net/PacketProcessor.java index ae66a060..5065c9bb 100644 --- a/core/src/com/riiablo/net/PacketProcessor.java +++ b/core/src/com/riiablo/net/PacketProcessor.java @@ -1,7 +1,8 @@ package com.riiablo.net; import io.netty.buffer.ByteBuf; +import io.netty.channel.Channel; public interface PacketProcessor { - void processPacket(ByteBuf bb); + void processPacket(Channel ch, ByteBuf bb); } diff --git a/core/src/com/riiablo/net/reliable/ReliableEndpoint.java b/core/src/com/riiablo/net/reliable/ReliableEndpoint.java index 45928354..6eea0685 100644 --- a/core/src/com/riiablo/net/reliable/ReliableEndpoint.java +++ b/core/src/com/riiablo/net/reliable/ReliableEndpoint.java @@ -121,7 +121,7 @@ public class ReliableEndpoint implements Endpoint, MessageChanne @Override public void receivePacket(ByteBuf bb) { - packetProcessor.processPacket(bb); + packetProcessor.processPacket(channel, bb); } public static final Stats stats = new Stats(); diff --git a/core/src/com/riiablo/net/tcp/TcpEndpoint.java b/core/src/com/riiablo/net/tcp/TcpEndpoint.java index 65ecd105..83593a5a 100644 --- a/core/src/com/riiablo/net/tcp/TcpEndpoint.java +++ b/core/src/com/riiablo/net/tcp/TcpEndpoint.java @@ -34,7 +34,7 @@ public class TcpEndpoint implements Endpoint { @Override public void messageReceived(ChannelHandlerContext ctx, ByteBuf msg) { if (DEBUG_RECEIVE) Gdx.app.debug(TAG, "onMessageReceived"); - packetProcessor.processPacket(msg); + packetProcessor.processPacket(channel, msg); } @Override diff --git a/server/netty/src/com/riiablo/net/reliable/TestClient.java b/server/netty/src/com/riiablo/net/reliable/TestClient.java index 1d8edbb3..11aa4003 100644 --- a/server/netty/src/com/riiablo/net/reliable/TestClient.java +++ b/server/netty/src/com/riiablo/net/reliable/TestClient.java @@ -4,6 +4,7 @@ import com.google.flatbuffers.FlatBufferBuilder; import io.netty.bootstrap.Bootstrap; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; +import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; import io.netty.channel.EventLoopGroup; @@ -92,7 +93,7 @@ public class TestClient extends ApplicationAdapter implements PacketProcessor { } @Override - public void processPacket(ByteBuf bb) { + public void processPacket(Channel ch, ByteBuf bb) { Gdx.app.debug(TAG, "Processing packet..."); Gdx.app.log(TAG, ByteBufUtil.hexDump(bb)); } diff --git a/server/netty/src/com/riiablo/net/reliable/TestServer.java b/server/netty/src/com/riiablo/net/reliable/TestServer.java index 38040178..02c1736a 100644 --- a/server/netty/src/com/riiablo/net/reliable/TestServer.java +++ b/server/netty/src/com/riiablo/net/reliable/TestServer.java @@ -3,6 +3,7 @@ package com.riiablo.net.reliable; import io.netty.bootstrap.Bootstrap; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; +import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelOption; @@ -80,7 +81,7 @@ public class TestServer extends ApplicationAdapter implements PacketProcessor { } @Override - public void processPacket(ByteBuf bb) { + public void processPacket(Channel ch, ByteBuf bb) { Gdx.app.debug(TAG, "Processing packet..."); Gdx.app.log(TAG, ByteBufUtil.hexDump(bb)); diff --git a/server/netty/src/com/riiablo/net/tcp/TestClient.java b/server/netty/src/com/riiablo/net/tcp/TestClient.java index 898b6081..68c32451 100644 --- a/server/netty/src/com/riiablo/net/tcp/TestClient.java +++ b/server/netty/src/com/riiablo/net/tcp/TestClient.java @@ -4,6 +4,7 @@ import com.google.flatbuffers.FlatBufferBuilder; import io.netty.bootstrap.Bootstrap; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; +import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelOption; @@ -94,7 +95,7 @@ public class TestClient extends ApplicationAdapter implements PacketProcessor { } @Override - public void processPacket(ByteBuf bb) { + public void processPacket(Channel ch, ByteBuf bb) { Gdx.app.debug(TAG, "Processing packet..."); Gdx.app.log(TAG, ByteBufUtil.hexDump(bb)); } diff --git a/server/netty/src/com/riiablo/net/tcp/TestServer.java b/server/netty/src/com/riiablo/net/tcp/TestServer.java index 104cdb61..9fef9ece 100644 --- a/server/netty/src/com/riiablo/net/tcp/TestServer.java +++ b/server/netty/src/com/riiablo/net/tcp/TestServer.java @@ -3,6 +3,7 @@ package com.riiablo.net.tcp; import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; +import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelOption; @@ -80,7 +81,7 @@ public class TestServer extends ApplicationAdapter implements PacketProcessor { } @Override - public void processPacket(ByteBuf bb) { + public void processPacket(Channel ch, ByteBuf bb) { Gdx.app.debug(TAG, "Processing packet..."); Gdx.app.log(TAG, " " + ByteBufUtil.hexDump(bb)); }