Merge pull request TooTallNate#448 from marci4/master

marci4 · web-flow · commit b1689410111e · 2017-03-30T19:59:53.000+02:00
Replaced recursive calls with iterative calls
diff --git a/src/main/java/org/java_websocket/SSLSocketChannel2.java b/src/main/java/org/java_websocket/SSLSocketChannel2.java
@@ -223,58 +223,60 @@ public int write( ByteBuffer src ) throws IOException {
 	/**
 	 * Blocks when in blocking mode until at least one byte has been decoded.<br>
 	 * When not in blocking mode 0 may be returned.
-	 * 
+	 *
 	 * @return the number of bytes read.
 	 **/
-	public int read( ByteBuffer dst ) throws IOException {
-		if( !dst.hasRemaining() )
-			return 0;
-		if( !isHandShakeComplete() ) {
-			if( isBlocking() ) {
-				while ( !isHandShakeComplete() ) {
+	public int read(ByteBuffer dst) throws IOException {
+		while (true) {
+			if (!dst.hasRemaining())
+				return 0;
+			if (!isHandShakeComplete()) {
+				if (isBlocking()) {
+					while (!isHandShakeComplete()) {
+						processHandshake();
+					}
+				} else {
 					processHandshake();
-				}
-			} else {
-				processHandshake();
-				if( !isHandShakeComplete() ) {
-					return 0;
+					if (!isHandShakeComplete()) {
+						return 0;
+					}
 				}
 			}
-		}
-		// assert ( bufferallocations > 1 ); //see #190
-		//if( bufferallocations <= 1 ) {
-		//	createBuffers( sslEngine.getSession() );
-		//}
+			// assert ( bufferallocations > 1 ); //see #190
+			//if( bufferallocations <= 1 ) {
+			//	createBuffers( sslEngine.getSession() );
+			//}
 		/* 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)
 		 */
-		int purged = readRemaining( dst );
-		if( purged != 0 )
-			return purged;
+			int purged = readRemaining(dst);
+			if (purged != 0)
+				return purged;
 
 		/* We only continue when we really need more data from the network.
 		 * Thats the case if inData is empty or inCrypt holds to less data than necessary for decryption
 		 */
-		assert ( inData.position() == 0 );
-		inData.clear();
+			assert (inData.position() == 0);
+			inData.clear();
 
-		if( !inCrypt.hasRemaining() )
-			inCrypt.clear();
-		else
-			inCrypt.compact();
+			if (!inCrypt.hasRemaining())
+				inCrypt.clear();
+			else
+				inCrypt.compact();
 
-		if( isBlocking() || readEngineResult.getStatus() == Status.BUFFER_UNDERFLOW )
-			if( socketChannel.read( inCrypt ) == -1 ) {
-				return -1;
-			}
-		inCrypt.flip();
-		unwrap();
+			if (isBlocking() || readEngineResult.getStatus() == Status.BUFFER_UNDERFLOW)
+				if (socketChannel.read(inCrypt) == -1) {
+					return -1;
+				}
+			inCrypt.flip();
+			unwrap();
 
-		int transfered = transfereTo( inData, dst );
-		if( transfered == 0 && isBlocking() ) {
-			return read( dst ); // "transfered" may be 0 when not enough bytes were received or during rehandshaking
+			int transfered = transfereTo(inData, dst);
+			if (transfered == 0 && isBlocking()) {
+				continue;
+			}
+			return transfered;
 		}
-		return transfered;
 	}
 	/**
 	 * {@link #read(ByteBuffer)} may not be to leave all buffers(inData, inCrypt)
diff --git a/src/main/java/org/java_websocket/drafts/Draft_10.java b/src/main/java/org/java_websocket/drafts/Draft_10.java
@@ -235,55 +235,57 @@ private Opcode toOpcode(byte opcode) throws InvalidFrameException {
 
     @Override
     public List<Framedata> translateFrame(ByteBuffer buffer) throws LimitExedeedException, InvalidDataException {
-        List<Framedata> frames = new LinkedList<Framedata>();
-        Framedata cur;
-
-        if (incompleteframe != null) {
-            // complete an incomplete frame
-            try {
-                buffer.mark();
-                int available_next_byte_count = buffer.remaining();// The number of bytes received
-                int expected_next_byte_count = incompleteframe.remaining();// The number of bytes to complete the incomplete frame
-
-                if (expected_next_byte_count > available_next_byte_count) {
-                    // did not receive enough bytes to complete the frame
-                    incompleteframe.put(buffer.array(), buffer.position(), available_next_byte_count);
-                    buffer.position(buffer.position() + available_next_byte_count);
-                    return Collections.emptyList();
+        while (true) {
+            List<Framedata> frames = new LinkedList<Framedata>();
+            Framedata cur;
+
+            if (incompleteframe != null) {
+                // complete an incomplete frame
+                try {
+                    buffer.mark();
+                    int available_next_byte_count = buffer.remaining();// The number of bytes received
+                    int expected_next_byte_count = incompleteframe.remaining();// The number of bytes to complete the incomplete frame
+
+                    if (expected_next_byte_count > available_next_byte_count) {
+                        // did not receive enough bytes to complete the frame
+                        incompleteframe.put(buffer.array(), buffer.position(), available_next_byte_count);
+                        buffer.position(buffer.position() + available_next_byte_count);
+                        return Collections.emptyList();
+                    }
+                    incompleteframe.put(buffer.array(), buffer.position(), expected_next_byte_count);
+                    buffer.position(buffer.position() + expected_next_byte_count);
+
+                    cur = translateSingleFrame((ByteBuffer) incompleteframe.duplicate().position(0));
+                    frames.add(cur);
+                    incompleteframe = null;
+                } catch (IncompleteException e) {
+                    // extending as much as suggested
+                    int oldsize = incompleteframe.limit();
+                    ByteBuffer extendedframe = ByteBuffer.allocate(checkAlloc(e.getPreferedSize()));
+                    assert (extendedframe.limit() > incompleteframe.limit());
+                    incompleteframe.rewind();
+                    extendedframe.put(incompleteframe);
+                    incompleteframe = extendedframe;
+                    continue;
                 }
-                incompleteframe.put(buffer.array(), buffer.position(), expected_next_byte_count);
-                buffer.position(buffer.position() + expected_next_byte_count);
-
-                cur = translateSingleFrame((ByteBuffer) incompleteframe.duplicate().position(0));
-                frames.add(cur);
-                incompleteframe = null;
-            } catch (IncompleteException e) {
-                // extending as much as suggested
-                int oldsize = incompleteframe.limit();
-                ByteBuffer extendedframe = ByteBuffer.allocate(checkAlloc(e.getPreferedSize()));
-                assert (extendedframe.limit() > incompleteframe.limit());
-                incompleteframe.rewind();
-                extendedframe.put(incompleteframe);
-                incompleteframe = extendedframe;
-                return translateFrame(buffer);
             }
-        }
 
-        while (buffer.hasRemaining()) {// Read as much as possible full frames
-            buffer.mark();
-            try {
-                cur = translateSingleFrame(buffer);
-                frames.add(cur);
-            } catch (IncompleteException e) {
-                // remember the incomplete data
-                buffer.reset();
-                int pref = e.getPreferedSize();
-                incompleteframe = ByteBuffer.allocate(checkAlloc(pref));
-                incompleteframe.put(buffer);
-                break;
+            while (buffer.hasRemaining()) {// Read as much as possible full frames
+                buffer.mark();
+                try {
+                    cur = translateSingleFrame(buffer);
+                    frames.add(cur);
+                } catch (IncompleteException e) {
+                    // remember the incomplete data
+                    buffer.reset();
+                    int pref = e.getPreferedSize();
+                    incompleteframe = ByteBuffer.allocate(checkAlloc(pref));
+                    incompleteframe.put(buffer);
+                    break;
+                }
             }
+            return frames;
         }
-        return frames;
     }
 
     public Framedata translateSingleFrame(ByteBuffer buffer) throws IncompleteException, InvalidDataException {
