geforkt von Mirrors/Velocity
Cleaner and more correct to use ByteBufs directly.
Dieser Commit ist enthalten in:
Ursprung
1e041963f0
Commit
1a2b162353
@ -11,41 +11,42 @@ import java.util.List;
|
|||||||
|
|
||||||
public class MinecraftVarintFrameDecoder extends ByteToMessageDecoder {
|
public class MinecraftVarintFrameDecoder extends ByteToMessageDecoder {
|
||||||
|
|
||||||
private final byte[] lenBuf = new byte[3];
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
|
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
|
||||||
if (!in.isReadable()) {
|
if (!in.isReadable()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Arrays.fill(lenBuf, (byte) 0);
|
ByteBuf lenBuf = ctx.alloc().buffer(3);
|
||||||
int origReaderIndex = in.readerIndex();
|
int origReaderIndex = in.readerIndex();
|
||||||
|
try {
|
||||||
ByteBuf wrappedBuf = Unpooled.wrappedBuffer(lenBuf);
|
for (int i = 0; i < 3; i++) {
|
||||||
for (int i = 0; i < lenBuf.length; i++) {
|
if (!in.isReadable()) {
|
||||||
if (!in.isReadable()) {
|
|
||||||
in.readerIndex(origReaderIndex);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
lenBuf[i] = in.readByte();
|
|
||||||
if (lenBuf[i] > 0) {
|
|
||||||
int packetLength = ProtocolUtils.readVarInt(wrappedBuf);
|
|
||||||
if (packetLength == 0) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (in.readableBytes() < packetLength) {
|
|
||||||
in.readerIndex(origReaderIndex);
|
in.readerIndex(origReaderIndex);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
out.add(in.readRetainedSlice(packetLength));
|
byte read = in.readByte();
|
||||||
return;
|
lenBuf.writeByte(read);
|
||||||
}
|
if (read > 0) {
|
||||||
}
|
int packetLength = ProtocolUtils.readVarInt(lenBuf.slice());
|
||||||
|
if (packetLength == 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
throw new CorruptedFrameException("VarInt too big");
|
if (in.readableBytes() < packetLength) {
|
||||||
|
in.readerIndex(origReaderIndex);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
out.add(in.readRetainedSlice(packetLength));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new CorruptedFrameException("VarInt too big");
|
||||||
|
} finally {
|
||||||
|
lenBuf.release();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren