andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[#1534] Finally fix SslHandler to also correctly handle partial data

Browse Source
This commit is contained in:
Norman Maurer 2013-07-11 06:40:04 +02:00
parent 9c49322b9c
commit 4d94f1d1e1
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
handler/src/main/java/io/netty/handler/ssl/SslHandler.java
View File

@ -830,14 +830,21 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH
return;
}
try {
// slice out the whole packet so unwrap will only be called with complete packets
int readerIndex = in.readerIndex();
in.skipBytes(packetLength);
unwrap(ctx, in.nioBuffer(readerIndex, packetLength), out);
} finally {
this.packetLength = 0;
}
// Slice out the whole packet so unwrap will only be called with complete packets.
// Also directly reset the packetLength. This is needed as unwrap(..) may trigger
// decode(...) again via:
// 1) unwrap(..) is called
// 2) wrap(...) is called from within unwrap(...)
// 3) wrap(...) calls unwrapLater(...)
// 4) unwrapLater(...) calls decode(...)
//
// See https://github.com/netty/netty/issues/1534
int readerIndex = in.readerIndex();
in.skipBytes(packetLength);
ByteBuffer buffer = in.nioBuffer(readerIndex, packetLength);
this.packetLength = 0;
unwrap(ctx, buffer, out);
}
private void unwrap(ChannelHandlerContext ctx, ByteBuffer packet, List<Object> out) throws SSLException {