the WebSocketFactory's channel wrapping method now takes a (Socketchannel's) SelectionKey instead of the channel itself

Davidiusdadi · Davidiusdadi · commit 9e762ad9514f · 2012-08-21T18:26:18.000+02:00
diff --git a/src/org/java_websocket/WebSocketFactory.java b/src/org/java_websocket/WebSocketFactory.java
@@ -3,13 +3,20 @@
 import java.io.IOException;
 import java.net.Socket;
 import java.nio.channels.ByteChannel;
-import java.nio.channels.SocketChannel;
+import java.nio.channels.SelectionKey;
 import java.util.List;
 
 import org.java_websocket.drafts.Draft;
 
 public interface WebSocketFactory {
 	public WebSocket createWebSocket( WebSocketAdapter a, Draft d, Socket s );
 	public WebSocket createWebSocket( WebSocketAdapter a, List<Draft> drafts, Socket s );
-	public ByteChannel wrapChannel( SocketChannel c ) throws IOException;
+	/**
+	 * Allows to wrap the Socketchannel( key.channel() ) to insert a protocol layer( like ssl or proxy authentication) beyond the ws layer.
+	 * 
+	 * @param key
+	 *            a SelectionKey of an open SocketChannel.
+	 * @return The channel on which the read and write operations will be performed.<br>
+	 */
+	public ByteChannel wrapChannel( SelectionKey key ) throws IOException;
 }
diff --git a/src/org/java_websocket/client/WebSocketClient.java b/src/org/java_websocket/client/WebSocketClient.java
@@ -83,8 +83,8 @@ public WebSocket createWebSocket( WebSocketAdapter a, List<Draft> d, Socket s )
 		}
 
 		@Override
-		public SocketChannel wrapChannel( SocketChannel c ) {
-			return c;
+		public ByteChannel wrapChannel( SelectionKey c ) {
+			return (ByteChannel) c.channel();
 		}
 	};
 
@@ -247,7 +247,7 @@ private final void interruptableRun() {
 					}
 					if( key.isConnectable() ) {
 						try {
-							finishConnect();
+							finishConnect( key );
 						} catch ( InterruptedException e ) {
 							conn.close( CloseFrame.NEVERCONNECTED );// report error to only
 							break;
@@ -272,13 +272,13 @@ private int getPort() {
 		return port == -1 ? WebSocket.DEFAULT_PORT : port;
 	}
 
-	private void finishConnect() throws IOException , InvalidHandshakeException , InterruptedException {
+	private void finishConnect( SelectionKey key ) throws IOException , InvalidHandshakeException , InterruptedException {
 		if( channel.isConnectionPending() ) {
 			channel.finishConnect();
 		}
-		wrappedchannel = wf.wrapChannel( channel );
+		wrappedchannel = wf.wrapChannel( key );
 		// Now that we're connected, re-register for only 'READ' keys.
-		channel.register( selector, SelectionKey.OP_READ );
+		key.interestOps( SelectionKey.OP_READ );
 
 		sendHandshake();
 	}
diff --git a/src/org/java_websocket/server/WebSocketServer.java b/src/org/java_websocket/server/WebSocketServer.java
@@ -86,8 +86,8 @@ public WebSocketImpl createWebSocket( WebSocketAdapter a, List<Draft> d, Socket
 		}
 
 		@Override
-		public SocketChannel wrapChannel( SocketChannel c ) {
-			return c;
+		public SocketChannel wrapChannel( SelectionKey c ) {
+			return (SocketChannel) c.channel();
 		}
 	};
 
@@ -262,11 +262,11 @@ public void run() {
 						if( key.isAcceptable() ) {
 							SocketChannel channel = server.accept();
 							channel.configureBlocking( false );
-							WebSocketImpl c = wsf.createWebSocket( this, drafts, channel.socket() );
-							c.key = channel.register( selector, SelectionKey.OP_READ, c );
-							c.channel = wsf.wrapChannel( channel );
+							WebSocketImpl w = wsf.createWebSocket( this, drafts, channel.socket() );
+							w.key = channel.register( selector, SelectionKey.OP_READ, w );
+							w.channel = wsf.wrapChannel( w.key );
 							i.remove();
-							allocateBuffers( c );
+							allocateBuffers( w );
 							continue;
 						}
 
@@ -293,7 +293,7 @@ public void run() {
 							conn = (WebSocketImpl) key.attachment();
 							if( SocketChannelIOHelper.batch( conn, (ByteChannel) conn.channel ) ) {
 								if( key.isValid() )
-									key.channel().register( selector, SelectionKey.OP_READ, key.attachment() );
+									key.interestOps( SelectionKey.OP_READ );
 							}
 						}
 					}

Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,8 @@ public WebSocket createWebSocket( WebSocketAdapter a, List<Draft> d, Socket s )`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`@Override`
`86`		`- public SocketChannel wrapChannel( SocketChannel c ) {`
`87`		`- return c;`
	`86`	`+ public ByteChannel wrapChannel( SelectionKey c ) {`
	`87`	`+ return (ByteChannel) c.channel();`
`88`	`88`	`}`
`89`	`89`	`};`
`90`	`90`
`@@ -247,7 +247,7 @@ private final void interruptableRun() {`
`247`	`247`	`}`
`248`	`248`	`if( key.isConnectable() ) {`
`249`	`249`	`try {`
`250`		`- finishConnect();`
	`250`	`+ finishConnect( key );`
`251`	`251`	`} catch ( InterruptedException e ) {`
`252`	`252`	`conn.close( CloseFrame.NEVERCONNECTED );// report error to only`
`253`	`253`	`break;`
`@@ -272,13 +272,13 @@ private int getPort() {`
`272`	`272`	`return port == -1 ? WebSocket.DEFAULT_PORT : port;`
`273`	`273`	`}`
`274`	`274`
`275`		`- private void finishConnect() throws IOException , InvalidHandshakeException , InterruptedException {`
	`275`	`+ private void finishConnect( SelectionKey key ) throws IOException , InvalidHandshakeException , InterruptedException {`
`276`	`276`	`if( channel.isConnectionPending() ) {`
`277`	`277`	`channel.finishConnect();`
`278`	`278`	`}`
`279`		`- wrappedchannel = wf.wrapChannel( channel );`
	`279`	`+ wrappedchannel = wf.wrapChannel( key );`
`280`	`280`	`// Now that we're connected, re-register for only 'READ' keys.`
`281`		`- channel.register( selector, SelectionKey.OP_READ );`
	`281`	`+ key.interestOps( SelectionKey.OP_READ );`
`282`	`282`
`283`	`283`	`sendHandshake();`
`284`	`284`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,8 @@ public WebSocketImpl createWebSocket( WebSocketAdapter a, List<Draft> d, Socket`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`@Override`
`89`		`- public SocketChannel wrapChannel( SocketChannel c ) {`
`90`		`- return c;`
	`89`	`+ public SocketChannel wrapChannel( SelectionKey c ) {`
	`90`	`+ return (SocketChannel) c.channel();`
`91`	`91`	`}`
`92`	`92`	`};`
`93`	`93`
`@@ -262,11 +262,11 @@ public void run() {`
`262`	`262`	`if( key.isAcceptable() ) {`
`263`	`263`	`SocketChannel channel = server.accept();`
`264`	`264`	`channel.configureBlocking( false );`
`265`		`- WebSocketImpl c = wsf.createWebSocket( this, drafts, channel.socket() );`
`266`		`- c.key = channel.register( selector, SelectionKey.OP_READ, c );`
`267`		`- c.channel = wsf.wrapChannel( channel );`
	`265`	`+ WebSocketImpl w = wsf.createWebSocket( this, drafts, channel.socket() );`
	`266`	`+ w.key = channel.register( selector, SelectionKey.OP_READ, w );`
	`267`	`+ w.channel = wsf.wrapChannel( w.key );`
`268`	`268`	`i.remove();`
`269`		`- allocateBuffers( c );`
	`269`	`+ allocateBuffers( w );`
`270`	`270`	`continue;`
`271`	`271`	`}`
`272`	`272`
`@@ -293,7 +293,7 @@ public void run() {`
`293`	`293`	`conn = (WebSocketImpl) key.attachment();`
`294`	`294`	`if( SocketChannelIOHelper.batch( conn, (ByteChannel) conn.channel ) ) {`
`295`	`295`	`if( key.isValid() )`
`296`		`- key.channel().register( selector, SelectionKey.OP_READ, key.attachment() );`
	`296`	`+ key.interestOps( SelectionKey.OP_READ );`
`297`	`297`	`}`
`298`	`298`	`}`
`299`	`299`	`}`