PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Now just to implement the necessary constructors and constants

Browse Source
This commit is contained in:
md_5
2013-05-30 18:29:59 +10:00
parent 125d3f07f7
commit 9b0c827c37
31 changed files with 97 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy/src/main/java/net/md_5/bungee/ServerConnector.java
View File

@@ -26,6 +26,7 @@ import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.netty.CipherDecoder;
import net.md_5.bungee.netty.CipherEncoder;
import net.md_5.bungee.netty.PacketDecoder;
import net.md_5.bungee.netty.PacketHandler;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.packet.Packet1Login;
import net.md_5.bungee.protocol.packet.Packet9Respawn;
@@ -36,7 +37,6 @@ import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.packet.PacketFCEncryptionResponse;
import net.md_5.bungee.protocol.packet.PacketFDEncryptionRequest;
import net.md_5.bungee.protocol.packet.PacketFFKick;
import net.md_5.bungee.protocol.packet.PacketHandler;
import net.md_5.bungee.protocol.Vanilla;
@RequiredArgsConstructor

6
proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
View File

@@ -13,7 +13,6 @@ import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.event.ChatEvent;
import net.md_5.bungee.api.event.PluginMessageEvent;
import net.md_5.bungee.api.event.ServerKickEvent;
import net.md_5.bungee.api.scoreboard.Objective;
@@ -22,8 +21,8 @@ import net.md_5.bungee.api.scoreboard.Score;
import net.md_5.bungee.api.scoreboard.Scoreboard;
import net.md_5.bungee.api.scoreboard.Team;
import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.netty.PacketHandler;
import net.md_5.bungee.protocol.packet.Packet0KeepAlive;
import net.md_5.bungee.protocol.packet.Packet3Chat;
import net.md_5.bungee.protocol.packet.PacketC9PlayerListItem;
import net.md_5.bungee.protocol.packet.PacketCEScoreboardObjective;
import net.md_5.bungee.protocol.packet.PacketCFScoreboardScore;
@@ -31,7 +30,8 @@ import net.md_5.bungee.protocol.packet.PacketD0DisplayScoreboard;
import net.md_5.bungee.protocol.packet.PacketD1Team;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.packet.PacketFFKick;
import net.md_5.bungee.protocol.packet.PacketHandler;
;
@RequiredArgsConstructor
public class DownstreamBridge extends PacketHandler

2
proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
View File

@@ -34,6 +34,7 @@ import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.netty.CipherDecoder;
import net.md_5.bungee.netty.CipherEncoder;
import net.md_5.bungee.netty.PacketDecoder;
import net.md_5.bungee.netty.PacketHandler;
import net.md_5.bungee.protocol.packet.Packet1Login;
import net.md_5.bungee.protocol.packet.Packet2Handshake;
import net.md_5.bungee.protocol.packet.PacketCDClientStatus;
@@ -42,7 +43,6 @@ import net.md_5.bungee.protocol.packet.PacketFCEncryptionResponse;
import net.md_5.bungee.protocol.packet.PacketFDEncryptionRequest;
import net.md_5.bungee.protocol.packet.PacketFEPing;
import net.md_5.bungee.protocol.packet.PacketFFKick;
import net.md_5.bungee.protocol.packet.PacketHandler;
import net.md_5.bungee.protocol.Vanilla;
@RequiredArgsConstructor

2
proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java
View File

@@ -5,8 +5,8 @@ import net.md_5.bungee.api.Callback;
import net.md_5.bungee.api.ServerPing;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.netty.PacketHandler;
import net.md_5.bungee.protocol.packet.PacketFFKick;
import net.md_5.bungee.protocol.packet.PacketHandler;
@RequiredArgsConstructor
public class PingHandler extends PacketHandler

2
proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
View File

@@ -10,11 +10,11 @@ import net.md_5.bungee.api.event.ChatEvent;
import net.md_5.bungee.api.event.PlayerDisconnectEvent;
import net.md_5.bungee.api.event.PluginMessageEvent;
import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.netty.PacketHandler;
import net.md_5.bungee.protocol.packet.Packet0KeepAlive;
import net.md_5.bungee.protocol.packet.Packet3Chat;
import net.md_5.bungee.protocol.packet.PacketCCSettings;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.packet.PacketHandler;
public class UpstreamBridge extends PacketHandler
{

22
proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
View File

@@ -8,15 +8,13 @@ import java.io.IOException;
import java.util.logging.Level;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.connection.CancelSendSignal;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.packet.PacketHandler;
/**
* This class is a primitive wrapper for {@link PacketHandler} instances tied to
* channels to maintain simple states, and only call the required, adapted
* methods when the channel is connected.
*/
public class HandlerBoss extends ChannelInboundMessageHandlerAdapter<byte[]>
public class HandlerBoss extends ChannelInboundMessageHandlerAdapter<Object>
{
private ChannelWrapper channel;
@@ -50,25 +48,27 @@ public class HandlerBoss extends ChannelInboundMessageHandlerAdapter<byte[]>
}
@Override
public void messageReceived(ChannelHandlerContext ctx, byte[] msg) throws Exception
public void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception
{
if ( handler != null && ctx.channel().isActive() )
{
DefinedPacket packet = DefinedPacket.packet( msg );
boolean sendPacket = true;
if ( packet != null )
if ( msg instanceof PacketWrapper )
{
boolean sendPacket = true;
try
{
packet.handle( handler );
( (PacketWrapper) msg ).packet.handle( handler );
} catch ( CancelSendSignal ex )
{
sendPacket = false;
}
}
if ( sendPacket )
if ( sendPacket )
{
handler.handle( ( (PacketWrapper) msg ).buf );
}
} else
{
handler.handle( msg );
handler.handle( (byte[]) msg );
}
}
}

15
proxy/src/main/java/net/md_5/bungee/netty/PacketDecoder.java
View File

@@ -7,6 +7,8 @@ import io.netty.handler.codec.ReplayingDecoder;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import net.md_5.bungee.protocol.Protocol;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.skip.PacketReader;
/**
@@ -23,7 +25,7 @@ public class PacketDecoder extends ReplayingDecoder<Void>
@Getter
@Setter
private int protocol;
private Protocol protocol;
@Override
protected void decode(ChannelHandlerContext ctx, ByteBuf in, MessageBuf<Object> out) throws Exception
@@ -34,7 +36,7 @@ public class PacketDecoder extends ReplayingDecoder<Void>
// Store our start index
int startIndex = in.readerIndex();
// Run packet through framer
PacketReader.readPacket( in, protocol );
DefinedPacket packet = protocol.read( in.readUnsignedByte(), in );
// If we got this far, it means we have formed a packet, so lets grab the end index
int endIndex = in.readerIndex();
// Allocate a buffer big enough for all bytes we have read
@@ -47,8 +49,15 @@ public class PacketDecoder extends ReplayingDecoder<Void>
in.readerIndex( endIndex );
// Checkpoint our state incase we don't have enough data for another packet
checkpoint();
// Store our decoded message
out.add( buf );
if ( packet != null )
{
out.add( new PacketWrapper( packet, buf ) );
} else
{
out.add( buf );
}
}
}
}

13
proxy/src/main/java/net/md_5/bungee/netty/PacketHandler.java
View File

@@ -1,8 +1,19 @@
package net.md_5.bungee.netty;
public abstract class PacketHandler extends net.md_5.bungee.protocol.packet.PacketHandler
public abstract class PacketHandler extends net.md_5.bungee.protocol.packet.AbstractPacketHandler
{
@Override
public abstract String toString();
public void exception(Throwable t) throws Exception
{
}
public void handle(byte[] buf) throws Exception
{
}
public void connected(ChannelWrapper channel) throws Exception
{
}

16
proxy/src/main/java/net/md_5/bungee/netty/PacketWrapper.java Normal file
View File

@@ -0,0 +1,16 @@
package net.md_5.bungee.netty;
import net.md_5.bungee.protocol.packet.DefinedPacket;
public class PacketWrapper
{
DefinedPacket packet;
byte[] buf;
public PacketWrapper(DefinedPacket packet, byte[] buf)
{
this.packet = packet;
this.buf = buf;
}
}

2
proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
View File

@@ -61,7 +61,7 @@ public class PipelineUtils
ch.pipeline().addLast( "outbound", new OutboundHandler() );
ch.pipeline().addLast( "timer", new ReadTimeoutHandler( BungeeCord.getInstance().config.getTimeout(), TimeUnit.MILLISECONDS ) );
ch.pipeline().addLast( "decoder", new PacketDecoder( Vanilla.VANILLA_PROTOCOL ) );
ch.pipeline().addLast( "decoder", new PacketDecoder( Vanilla.getInstance() ) );
ch.pipeline().addLast( "packet-encoder", packetEncoder );
ch.pipeline().addLast( "array-encoder", arrayEncoder );
ch.pipeline().addLast( "handler", new HandlerBoss() );