lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated Netty library.

Browse Source
This commit is contained in:
MobiusDev
2017-08-07 00:33:38 +00:00
parent 5bcfc9ed76
commit bcee886363
44 changed files with 108 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
L2J_Mobius_Classic/java/com/l2jmobius/commons/network/PacketReader.java
View File

@@ -56,7 +56,7 @@ public final class PacketReader
*/
public int readH()
{
return _buf.readUnsignedShort();
return _buf.readUnsignedShortLE();
}
/**
@@ -66,7 +66,7 @@ public final class PacketReader
*/
public int readD()
{
return _buf.readInt();
return _buf.readIntLE();
}
/**
@@ -76,7 +76,7 @@ public final class PacketReader
*/
public long readQ()
{
return _buf.readLong();
return _buf.readLongLE();
}
/**
@@ -86,7 +86,7 @@ public final class PacketReader
*/
public float readE()
{
return _buf.readFloat();
return Float.intBitsToFloat(_buf.readIntLE());
}
/**
@@ -96,7 +96,7 @@ public final class PacketReader
*/
public double readF()
{
return _buf.readDouble();
return Double.longBitsToDouble(_buf.readLongLE());
}
/**
@@ -108,7 +108,7 @@ public final class PacketReader
{
final StringBuilder sb = new StringBuilder();
char chr;
while ((chr = _buf.readChar()) != 0)
while ((chr = Character.reverseBytes(_buf.readChar())) != 0)
{
sb.append(chr);
}
@@ -123,7 +123,7 @@ public final class PacketReader
public String readString()
{
final StringBuilder sb = new StringBuilder();
final int stringLength = _buf.readShort();
final int stringLength = _buf.readShortLE();
if ((stringLength * 2) > getReadableBytes())
{
throw new IndexOutOfBoundsException("readerIndex(" + _buf.readerIndex() + ") + length(" + (stringLength * 2) + ") exceeds writerIndex(" + _buf.writerIndex() + "): " + _buf);
@@ -131,7 +131,7 @@ public final class PacketReader
for (int i = 0; i < stringLength; i++)
{
sb.append(_buf.readChar());
sb.append(Character.reverseBytes(_buf.readChar()));
}
return sb.toString();
}

16
L2J_Mobius_Classic/java/com/l2jmobius/commons/network/PacketWriter.java
View File

@@ -54,7 +54,7 @@ public final class PacketWriter
*/
public void writeH(int value)
{
_buf.writeShort(value);
_buf.writeShortLE(value);
}
/**
@@ -63,7 +63,7 @@ public final class PacketWriter
*/
public void writeD(int value)
{
_buf.writeInt(value);
_buf.writeIntLE(value);
}
/**
@@ -72,7 +72,7 @@ public final class PacketWriter
*/
public void writeQ(long value)
{
_buf.writeLong(value);
_buf.writeLongLE(value);
}
/**
@@ -81,7 +81,7 @@ public final class PacketWriter
*/
public void writeE(float value)
{
_buf.writeFloat(value);
_buf.writeIntLE(Float.floatToIntBits(value));
}
/**
@@ -90,7 +90,7 @@ public final class PacketWriter
*/
public void writeF(double value)
{
_buf.writeDouble(value);
_buf.writeLongLE(Double.doubleToLongBits(value));
}
/**
@@ -103,7 +103,7 @@ public final class PacketWriter
{
for (int i = 0; i < value.length(); i++)
{
_buf.writeChar(value.charAt(i));
_buf.writeChar(Character.reverseBytes(value.charAt(i)));
}
}
@@ -118,10 +118,10 @@ public final class PacketWriter
{
if (value != null)
{
_buf.writeShort(value.length());
_buf.writeShortLE(value.length());
for (int i = 0; i < value.length(); i++)
{
_buf.writeChar(value.charAt(i));
_buf.writeChar(Character.reverseBytes(value.charAt(i)));
}
}
else

3
L2J_Mobius_Classic/java/com/l2jmobius/commons/network/codecs/LengthFieldBasedFrameEncoder.java
View File

@@ -16,7 +16,6 @@
*/
package com.l2jmobius.commons.network.codecs;
import java.nio.ByteOrder;
import java.util.List;
import io.netty.buffer.ByteBuf;
@@ -35,7 +34,7 @@ public class LengthFieldBasedFrameEncoder extends MessageToMessageEncoder<ByteBu
{
final ByteBuf buf = ctx.alloc().buffer(2);
final short length = (short) (msg.readableBytes() + 2);
buf.writeShort(buf.order() != ByteOrder.LITTLE_ENDIAN ? Short.reverseBytes(length) : length);
buf.writeShortLE(length);
out.add(buf);
out.add(msg.retain());
}

10
L2J_Mobius_Classic/java/com/l2jmobius/commons/network/codecs/PacketDecoder.java
View File

@@ -16,7 +16,6 @@
*/
package com.l2jmobius.commons.network.codecs;
import java.nio.ByteOrder;
import java.util.List;
import java.util.logging.Logger;
@@ -37,13 +36,11 @@ public class PacketDecoder<T>extends ByteToMessageDecoder
{
private static final Logger LOGGER = Logger.getLogger(PacketDecoder.class.getName());
private final ByteOrder _byteOrder;
private final IIncomingPackets<T>[] _incomingPackets;
private final T _client;
public PacketDecoder(ByteOrder byteOrder, IIncomingPackets<T>[] incomingPackets, T client)
public PacketDecoder(IIncomingPackets<T>[] incomingPackets, T client)
{
_byteOrder = byteOrder;
_incomingPackets = incomingPackets;
_client = client;
}
@@ -56,11 +53,6 @@ public class PacketDecoder<T>extends ByteToMessageDecoder
return;
}
if (in.order() != _byteOrder)
{
in = in.order(_byteOrder);
}
try
{
final short packetId = in.readUnsignedByte();

10
L2J_Mobius_Classic/java/com/l2jmobius/commons/network/codecs/PacketEncoder.java
View File

@@ -16,7 +16,6 @@
*/
package com.l2jmobius.commons.network.codecs;
import java.nio.ByteOrder;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -36,24 +35,17 @@ public class PacketEncoder extends MessageToByteEncoder<IOutgoingPacket>
{
private static final Logger LOGGER = Logger.getLogger(PacketEncoder.class.getName());
private final ByteOrder _byteOrder;
private final int _maxPacketSize;
public PacketEncoder(ByteOrder byteOrder, int maxPacketSize)
public PacketEncoder(int maxPacketSize)
{
super();
_byteOrder = byteOrder;
_maxPacketSize = maxPacketSize;
}
@Override
protected void encode(ChannelHandlerContext ctx, IOutgoingPacket packet, ByteBuf out)
{
if (out.order() != _byteOrder)
{
out = out.order(_byteOrder);
}
try
{
if (packet.write(new PacketWriter(out)))

4
L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/ClientInitializer.java
View File

@@ -33,7 +33,7 @@ import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
public class ClientInitializer extends ChannelInitializer<SocketChannel>
{
private static final LengthFieldBasedFrameEncoder LENGTH_ENCODER = new LengthFieldBasedFrameEncoder();
private static final PacketEncoder PACKET_ENCODER = new PacketEncoder(ByteOrder.LITTLE_ENDIAN, 0x8000 - 2);
private static final PacketEncoder PACKET_ENCODER = new PacketEncoder(0x8000 - 2);
@Override
protected void initChannel(SocketChannel ch)
@@ -43,7 +43,7 @@ public class ClientInitializer extends ChannelInitializer<SocketChannel>
ch.pipeline().addLast("length-encoder", LENGTH_ENCODER);
ch.pipeline().addLast("crypt-codec", new CryptCodec(client.getCrypt()));
// ch.pipeline().addLast(new LoggingHandler(LogLevel.INFO));
ch.pipeline().addLast("packet-decoder", new PacketDecoder<>(ByteOrder.LITTLE_ENDIAN, IncomingPackets.PACKET_ARRAY, client));
ch.pipeline().addLast("packet-decoder", new PacketDecoder<>(IncomingPackets.PACKET_ARRAY, client));
ch.pipeline().addLast("packet-encoder", PACKET_ENCODER);
ch.pipeline().addLast(client);
}

2
L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/L2GameClient.java
View File

@@ -155,7 +155,7 @@ public final class L2GameClient extends ChannelInboundHandler<L2GameClient>
}
@Override
protected void messageReceived(ChannelHandlerContext ctx, IIncomingPacket<L2GameClient> packet)
protected void channelRead0(ChannelHandlerContext ctx, IIncomingPacket<L2GameClient> packet)
{
try
{

2
L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/loginserver/LoginServerHandler.java
View File

@@ -27,7 +27,7 @@ import io.netty.channel.ChannelHandlerContext;
public class LoginServerHandler extends ChannelInboundHandler<LoginServerHandler>
{
@Override
protected void messageReceived(ChannelHandlerContext ctx, IIncomingPacket<LoginServerHandler> msg) throws Exception
protected void channelRead0(ChannelHandlerContext ctx, IIncomingPacket<LoginServerHandler> msg) throws Exception
{
msg.run(this);
}

4
L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/loginserver/LoginServerInitializer.java
View File

@@ -32,7 +32,7 @@ import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
public class LoginServerInitializer extends ChannelInitializer<SocketChannel>
{
private static final LengthFieldBasedFrameEncoder LENGTH_ENCODER = new LengthFieldBasedFrameEncoder();
private static final PacketEncoder PACKET_ENCODER = new PacketEncoder(ByteOrder.LITTLE_ENDIAN, 0x8000 - 2);
private static final PacketEncoder PACKET_ENCODER = new PacketEncoder(0x8000 - 2);
@Override
protected void initChannel(SocketChannel ch)
@@ -41,7 +41,7 @@ public class LoginServerInitializer extends ChannelInitializer<SocketChannel>
ch.pipeline().addLast("length-decoder", new LengthFieldBasedFrameDecoder(ByteOrder.LITTLE_ENDIAN, 0x8000 - 2, 0, 2, -2, 2, false));
ch.pipeline().addLast("length-encoder", LENGTH_ENCODER);
// ch.pipeline().addLast(new LoggingHandler(LogLevel.INFO));
ch.pipeline().addLast("packet-decoder", new PacketDecoder<>(ByteOrder.LITTLE_ENDIAN, IncomingPackets.PACKET_ARRAY, loginServerHandler));
ch.pipeline().addLast("packet-decoder", new PacketDecoder<>(IncomingPackets.PACKET_ARRAY, loginServerHandler));
ch.pipeline().addLast("packet-encoder", PACKET_ENCODER);
ch.pipeline().addLast(loginServerHandler);
}

16
L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/telnet/TelnetServerHandler.java
View File

@@ -27,15 +27,15 @@ import com.l2jmobius.Config;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandler.Sharable;
import io.netty.channel.ChannelHandlerAdapter;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.util.AttributeKey;
/**
* @author UnAfraid
*/
@Sharable
public class TelnetServerHandler extends ChannelHandlerAdapter
public class TelnetServerHandler extends ChannelInboundHandlerAdapter
{
private static final Pattern COMMAND_ARGS_PATTERN = Pattern.compile("\"([^\"]*)\"|([^\\s]+)");
private static final AttributeKey<Boolean> AUTHORIZED = AttributeKey.valueOf(TelnetServerHandler.class, "AUTHORIZED");
@@ -58,7 +58,7 @@ public class TelnetServerHandler extends ChannelHandlerAdapter
}
@Override
public void channelActive(ChannelHandlerContext ctx)
public void handlerAdded(ChannelHandlerContext ctx)
{
String ip = ctx.channel().remoteAddress().toString();
ip = ip.substring(1, ip.lastIndexOf(':')); // Trim out /127.0.0.1:14013
@@ -79,12 +79,12 @@ public class TelnetServerHandler extends ChannelHandlerAdapter
{
// Ask password
ctx.write("Password:");
ctx.attr(AUTHORIZED).set(Boolean.FALSE);
ctx.channel().attr(AUTHORIZED).set(Boolean.FALSE);
}
else
{
ctx.write("Type 'help' to see all available commands." + Config.EOL);
ctx.attr(AUTHORIZED).set(Boolean.TRUE);
ctx.channel().attr(AUTHORIZED).set(Boolean.TRUE);
}
ctx.flush();
}
@@ -100,11 +100,11 @@ public class TelnetServerHandler extends ChannelHandlerAdapter
String response = null;
boolean close = false;
if (Boolean.FALSE.equals(ctx.attr(AUTHORIZED).get()))
if (Boolean.FALSE.equals(ctx.channel().attr(AUTHORIZED).get()))
{
if (Config.TELNET_PASSWORD.equals(request))
{
ctx.attr(AUTHORIZED).set(Boolean.TRUE);
ctx.channel().attr(AUTHORIZED).set(Boolean.TRUE);
request = "";
}
else
@@ -114,7 +114,7 @@ public class TelnetServerHandler extends ChannelHandlerAdapter
}
}
if (Boolean.TRUE.equals(ctx.attr(AUTHORIZED).get()))
if (Boolean.TRUE.equals(ctx.channel().attr(AUTHORIZED).get()))
{
if (request.isEmpty())
{