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

rewrite SslHandler's flush0 message to match docs

Browse Source
This commit is contained in:
Jeff Pinner 2013-07-11 22:09:47 -07:00 committed by Norman Maurer
parent c77ab7d092
commit be963d4caf
1 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -393,6 +393,12 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH
ctx.read();
}
@Override
public void write(final ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
throws Exception {
pendingUnencryptedWrites.add(new PendingWrite((ByteBuf) msg, promise));
}
@Override
public void flush(ChannelHandlerContext ctx) throws Exception {
// Do not encrypt the first write request if this handler is
@ -415,14 +421,7 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH
flush0(ctx);
}
@Override
public void write(final ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
throws Exception {
pendingUnencryptedWrites.add(new PendingWrite((ByteBuf) msg, promise));
}
private void flush0(ChannelHandlerContext ctx) throws SSLException {
boolean unwrapLater = false;
ByteBuf out = null;
ChannelPromise promise = null;
try {
@ -462,6 +461,13 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH
return;
} else {
switch (result.getHandshakeStatus()) {
case NEED_TASK:
runDelegatedTasks();
break;
case FINISHED:
setHandshakeSuccess();
// deliberate fall-through
case NOT_HANDSHAKING:
case NEED_WRAP:
if (promise != null) {
ctx.writeAndFlush(out, promise);
@ -470,28 +476,12 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH
ctx.writeAndFlush(out);
}
out = ctx.alloc().buffer();
continue;
break;
case NEED_UNWRAP:
unwrapLater = true;
break;
case NEED_TASK:
runDelegatedTasks();
continue;
case FINISHED:
setHandshakeSuccess();
continue;
case NOT_HANDSHAKING:
// Workaround for TLS False Start problem reported at:
// https://github.com/netty/netty/issues/1108#issuecomment-14266970
unwrapLater = true;
break;
return;
default:
throw new IllegalStateException("Unknown handshake status: " + result.getHandshakeStatus());
}
if (result.bytesConsumed() == 0 && result.bytesProduced() == 0) {
break;
}
}
}
} catch (SSLException e) {
@ -512,10 +502,6 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH
out.release();
}
}
if (unwrapLater) {
unwrap(ctx);
}
}
private void flushNonAppData0(ChannelHandlerContext ctx, boolean inUnwrap) throws SSLException {