fix for TooTallNate#190

Davidiusdadi · Davidiusdadi · commit c17693e474b7 · 2013-08-06T19:37:20.000+02:00
Create buffers according to maximum net and application data.
Added a few asserts for better understanding.
diff --git a/src/main/java/org/java_websocket/SSLSocketChannel2.java b/src/main/java/org/java_websocket/SSLSocketChannel2.java
@@ -56,6 +56,8 @@ public class SSLSocketChannel2 implements ByteChannel, WrappedByteChannel {
 	protected SSLEngineResult readEngineResult;
 	protected SSLEngineResult writeEngineResult;
 
+	protected int bufferallocations = 0;
+
 	public SSLSocketChannel2( SocketChannel channel , SSLEngine sslEngine , ExecutorService exec , SelectionKey key ) throws IOException {
 		if( channel == null || sslEngine == null || exec == null )
 			throw new IllegalArgumentException( "parameter must not be null" );
@@ -127,21 +129,21 @@ private synchronized void processHandshake() throws IOException {
 			}
 			inData.compact();
 			unwrap();
-			if( sslEngine.getHandshakeStatus() == HandshakeStatus.FINISHED ) {
+			if( readEngineResult.getHandshakeStatus() == HandshakeStatus.FINISHED ) {
 				createBuffers( sslEngine.getSession() );
 				return;
 			}
 		}
 		consumeDelegatedTasks();
-		assert ( sslEngine.getHandshakeStatus() != HandshakeStatus.NOT_HANDSHAKING );
 		if( tasks.isEmpty() || sslEngine.getHandshakeStatus() == SSLEngineResult.HandshakeStatus.NEED_WRAP ) {
 			socketChannel.write( wrap( emptybuffer ) );
-			if( sslEngine.getHandshakeStatus() == HandshakeStatus.FINISHED ) {
+			if( writeEngineResult.getHandshakeStatus() == HandshakeStatus.FINISHED ) {
 				createBuffers( sslEngine.getSession() );
+				return;
 			}
 		}
+		assert ( sslEngine.getHandshakeStatus() != HandshakeStatus.NOT_HANDSHAKING );// this function could only leave NOT_HANDSHAKING after createBuffers was called
 	}
-
 	private synchronized ByteBuffer wrap( ByteBuffer b ) throws SSLException {
 		outCrypt.compact();
 		writeEngineResult = sslEngine.wrap( b, outCrypt );
@@ -192,13 +194,15 @@ protected void createBuffers( SSLSession session ) {
 		inCrypt.flip();
 		outCrypt.rewind();
 		outCrypt.flip();
+		bufferallocations++;
 	}
 
 	public int write( ByteBuffer src ) throws IOException {
 		if( !isHandShakeComplete() ) {
 			processHandshake();
 			return 0;
 		}
+		assert ( bufferallocations > 1 );
 		int num = socketChannel.write( wrap( src ) );
 		return num;
 
@@ -225,6 +229,7 @@ public int read( ByteBuffer dst ) throws IOException {
 				}
 			}
 		}
+		assert ( bufferallocations > 1 );
 		/* 1. When "dst" is smaller than "inData" readRemaining will fill "dst" with data decoded in a previous read call.
 		 * 2. When "inCrypt" contains more data than "inData" has remaining space, unwrap has to be called on more time(readRemaining)
 		 */
@@ -256,7 +261,6 @@ public int read( ByteBuffer dst ) throws IOException {
 		}
 		return transfered;
 	}
-
 	/**
 	 * {@link #read(ByteBuffer)} may not be to leave all buffers(inData, inCrypt)
 	 **/

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@ public class SSLSocketChannel2 implements ByteChannel, WrappedByteChannel {`
`56`	`56`	`protected SSLEngineResult readEngineResult;`
`57`	`57`	`protected SSLEngineResult writeEngineResult;`
`58`	`58`
	`59`	`+ protected int bufferallocations = 0;`
	`60`	`+`
`59`	`61`	`public SSLSocketChannel2( SocketChannel channel , SSLEngine sslEngine , ExecutorService exec , SelectionKey key ) throws IOException {`
`60`	`62`	`if( channel == null \|\| sslEngine == null \|\| exec == null )`
`61`	`63`	`throw new IllegalArgumentException( "parameter must not be null" );`
`@@ -127,21 +129,21 @@ private synchronized void processHandshake() throws IOException {`
`127`	`129`	`}`
`128`	`130`	`inData.compact();`
`129`	`131`	`unwrap();`
`130`		`- if( sslEngine.getHandshakeStatus() == HandshakeStatus.FINISHED ) {`
	`132`	`+ if( readEngineResult.getHandshakeStatus() == HandshakeStatus.FINISHED ) {`
`131`	`133`	`createBuffers( sslEngine.getSession() );`
`132`	`134`	`return;`
`133`	`135`	`}`
`134`	`136`	`}`
`135`	`137`	`consumeDelegatedTasks();`
`136`		`- assert ( sslEngine.getHandshakeStatus() != HandshakeStatus.NOT_HANDSHAKING );`
`137`	`138`	`if( tasks.isEmpty() \|\| sslEngine.getHandshakeStatus() == SSLEngineResult.HandshakeStatus.NEED_WRAP ) {`
`138`	`139`	`socketChannel.write( wrap( emptybuffer ) );`
`139`		`- if( sslEngine.getHandshakeStatus() == HandshakeStatus.FINISHED ) {`
	`140`	`+ if( writeEngineResult.getHandshakeStatus() == HandshakeStatus.FINISHED ) {`
`140`	`141`	`createBuffers( sslEngine.getSession() );`
	`142`	`+ return;`
`141`	`143`	`}`
`142`	`144`	`}`
	`145`	`+ assert ( sslEngine.getHandshakeStatus() != HandshakeStatus.NOT_HANDSHAKING );// this function could only leave NOT_HANDSHAKING after createBuffers was called`
`143`	`146`	`}`
`144`		`-`
`145`	`147`	`private synchronized ByteBuffer wrap( ByteBuffer b ) throws SSLException {`
`146`	`148`	`outCrypt.compact();`
`147`	`149`	`writeEngineResult = sslEngine.wrap( b, outCrypt );`
`@@ -192,13 +194,15 @@ protected void createBuffers( SSLSession session ) {`
`192`	`194`	`inCrypt.flip();`
`193`	`195`	`outCrypt.rewind();`
`194`	`196`	`outCrypt.flip();`
	`197`	`+ bufferallocations++;`
`195`	`198`	`}`
`196`	`199`
`197`	`200`	`public int write( ByteBuffer src ) throws IOException {`
`198`	`201`	`if( !isHandShakeComplete() ) {`
`199`	`202`	`processHandshake();`
`200`	`203`	`return 0;`
`201`	`204`	`}`
	`205`	`+ assert ( bufferallocations > 1 );`
`202`	`206`	`int num = socketChannel.write( wrap( src ) );`
`203`	`207`	`return num;`
`204`	`208`
`@@ -225,6 +229,7 @@ public int read( ByteBuffer dst ) throws IOException {`
`225`	`229`	`}`
`226`	`230`	`}`
`227`	`231`	`}`
	`232`	`+ assert ( bufferallocations > 1 );`
`228`	`233`	`/* 1. When "dst" is smaller than "inData" readRemaining will fill "dst" with data decoded in a previous read call.`
`229`	`234`	`* 2. When "inCrypt" contains more data than "inData" has remaining space, unwrap has to be called on more time(readRemaining)`
`230`	`235`	`*/`
`@@ -256,7 +261,6 @@ public int read( ByteBuffer dst ) throws IOException {`
`256`	`261`	`}`
`257`	`262`	`return transfered;`
`258`	`263`	`}`
`259`		`-`
`260`	`264`	`/**`
`261`	`265`	`* {@link #read(ByteBuffer)} may not be to leave all buffers(inData, inCrypt)`
`262`	`266`	`**/`