From 5d9e5b6806bb355f4f045f7c9d6ffb0158b054a9 Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Thu, 2 Oct 2014 03:31:10 +0200 Subject: [PATCH] Added packet colater and descriminator. --- src/ClientTesting.py | 2 +- .../opis/network/rconserver/RConServer.java | 32 ++++++++++++++---- .../network/rconserver/RconMsgColater.java | 33 +++++++++++++++++++ 3 files changed, 59 insertions(+), 8 deletions(-) create mode 100644 src/main/java/mcp/mobius/opis/network/rconserver/RconMsgColater.java diff --git a/src/ClientTesting.py b/src/ClientTesting.py index 3c02134..4906e38 100644 --- a/src/ClientTesting.py +++ b/src/ClientTesting.py @@ -6,7 +6,7 @@ class ClientTest(asyncore.dispatcher): asyncore.dispatcher.__init__(self) self.create_socket(socket.AF_INET, socket.SOCK_STREAM) self.connect( (host, port) ) - self.buffer = "Test" + self.buffer = "\x00\x00\x00\x00\x00" def handle_connect(self): print "handle_connect" diff --git a/src/main/java/mcp/mobius/opis/network/rconserver/RConServer.java b/src/main/java/mcp/mobius/opis/network/rconserver/RConServer.java index 5210dc8..0448700 100644 --- a/src/main/java/mcp/mobius/opis/network/rconserver/RConServer.java +++ b/src/main/java/mcp/mobius/opis/network/rconserver/RConServer.java @@ -1,11 +1,19 @@ package mcp.mobius.opis.network.rconserver; +import java.util.ArrayList; import java.util.HashMap; import net.minecraftforge.common.util.FakePlayer; import mcp.mobius.opis.modOpis; +import mcp.mobius.opis.network.packets.client.PacketReqChunks; +import mcp.mobius.opis.network.packets.client.PacketReqData; +import mcp.mobius.opis.network.packets.server.NetDataCommand; +import mcp.mobius.opis.network.packets.server.NetDataList; +import mcp.mobius.opis.network.packets.server.NetDataValue; +import mcp.mobius.opis.network.packets.server.PacketChunks; import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.ByteBuf; +import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; @@ -19,13 +27,28 @@ import io.netty.util.ReferenceCountUtil; public class RConServer implements Runnable { + class ChannelInit extends ChannelInitializer{ + @Override + protected void initChannel(SocketChannel ch) throws Exception { + ch.pipeline().addLast(new RconMsgColater(), new RConInboundHandler()); + } + } + public final static RConServer instance = new RConServer(); public HashMap fakePlayers = new HashMap(); + public ArrayList packetTypes = new ArrayList(); private int port = -1; private RConServer(){ this.port = modOpis.rconport; + + packetTypes.add(PacketReqChunks.class); + packetTypes.add(PacketReqData.class); + packetTypes.add(NetDataCommand.class); + packetTypes.add(NetDataList.class); + packetTypes.add(NetDataValue.class); + packetTypes.add(PacketChunks.class); } @Override @@ -38,12 +61,7 @@ public class RConServer implements Runnable { ServerBootstrap b = new ServerBootstrap(); b.group(bossGroup, workerGroup) .channel(NioServerSocketChannel.class) - .childHandler(new ChannelInitializer() { - @Override - public void initChannel(SocketChannel ch) throws Exception { - ch.pipeline().addLast(new RConInboundHandler()); - } - }) + .childHandler(new ChannelInit()) .option(ChannelOption.SO_BACKLOG, 128) .childOption(ChannelOption.SO_KEEPALIVE, true); @@ -52,7 +70,7 @@ public class RConServer implements Runnable { f.channel().closeFuture().sync(); } catch (Exception e){ - modOpis.log.severe("Error in Opis remote control server."); + modOpis.log.error("Error in Opis remote control server."); e.printStackTrace(); } finally { workerGroup.shutdownGracefully(); diff --git a/src/main/java/mcp/mobius/opis/network/rconserver/RconMsgColater.java b/src/main/java/mcp/mobius/opis/network/rconserver/RconMsgColater.java new file mode 100644 index 0000000..766ef81 --- /dev/null +++ b/src/main/java/mcp/mobius/opis/network/rconserver/RconMsgColater.java @@ -0,0 +1,33 @@ +package mcp.mobius.opis.network.rconserver; + +import java.util.List; + +import com.google.common.io.ByteStreams; + +import mcp.mobius.opis.modOpis; +import mcp.mobius.opis.network.PacketBase; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.ByteToMessageDecoder; + +public class RconMsgColater extends ByteToMessageDecoder { + + @Override + protected void decode(ChannelHandlerContext ctx, ByteBuf in, List out) throws Exception { + if (in.readableBytes() < 4) { return; } // Packet starts with the size (int) + int packetSize = in.readInt(); // We read the packet size (not including the packet type byte) + if (in.readableBytes() < 1 + packetSize) { return ;} // We check if there is at least packet type + packetSize available bytes + byte packetType = in.readByte(); // We read the header + + // Here we should get a list of potential packets and decode for the corresponding byte + + Class packetClass = RConServer.instance.packetTypes.get(packetType); + modOpis.log.info(String.format("%d %d %s\n", packetSize, packetType, packetClass)); + + PacketBase packet = (PacketBase) packetClass.newInstance(); + if (packetSize > 0) + packet.decode(ByteStreams.newDataInput(in.readBytes(packetSize).array())); + out.add(packet); + } + +}