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

* Reverted previous SslHandler fix that doesn't work

Browse Source 
* More strict handshake status check
This commit is contained in:
Trustin Lee 2008-11-16 11:47:35 +00:00
parent ea94ea850b
commit b29b5a8289
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
View File

@ -473,11 +473,15 @@ public class SslHandler extends FrameDecoder {
break;
case FINISHED:
setHandshakeSuccess(channel);
default:
case NOT_HANDSHAKING:
if (result.getStatus() == Status.CLOSED) {
success = false;
}
break loop;
default:
throw new IllegalStateException(
"Unknown handshake status: " +
result.getHandshakeStatus());
}
}
}
@ -572,10 +576,17 @@ public class SslHandler extends FrameDecoder {
switch (result.getHandshakeStatus()) {
case FINISHED:
setHandshakeSuccess(channel);
break;
case NEED_TASK:
runDelegatedTasks();
break;
case NOT_HANDSHAKING:
case NEED_UNWRAP:
case NEED_WRAP:
break;
default:
throw new IllegalStateException(
"Unexpected handshake status: " +
result.getHandshakeStatus());
}
if (result.bytesProduced() == 0) {
@ -621,12 +632,16 @@ public class SslHandler extends FrameDecoder {
runDelegatedTasks();
break;
case FINISHED:
case NOT_HANDSHAKING:
setHandshakeSuccess(channel);
wrap(ctx, channel);
break loop;
default:
case NOT_HANDSHAKING:
wrap(ctx, channel);
break loop;
default:
throw new IllegalStateException(
"Unknown handshake status: " +
result.getHandshakeStatus());
}
}
@ -664,10 +679,6 @@ public class SslHandler extends FrameDecoder {
}
private void setHandshakeSuccess(Channel channel) {
if (!handshaking) {
return;
}
synchronized (handshakeLock) {
handshaking = false;
handshaken = true;