fixed getPort method. Additionally WebSocketFactory has now 2 specializations. One for the client and one for the server side.

Davidiusdadi · Davidiusdadi · commit 587ef3ff6f44 · 2012-09-06T22:55:39.000+02:00
diff --git a/src/org/java_websocket/WebSocket.java b/src/org/java_websocket/WebSocket.java
@@ -30,6 +30,8 @@ public enum Role {
 	 */
 	public static final int DEFAULT_PORT = 80;
 
+	public static final int DEFAULT_WSS_PORT = 443;
+
 	/**
 	 * sends the closing handshake.
 	 * may be send in response to an other handshake.
diff --git a/src/org/java_websocket/WebSocketFactory.java b/src/org/java_websocket/WebSocketFactory.java
@@ -1,22 +1,12 @@
 package org.java_websocket;
 
-import java.io.IOException;
 import java.net.Socket;
-import java.nio.channels.ByteChannel;
-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 );
-	/**
-	 * 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
@@ -72,7 +72,7 @@ public abstract class WebSocketClient extends WebSocketAdapter implements Runnab
 
 	private Map<String,String> headers;
 
-	WebSocketFactory wf = new WebSocketFactory() {
+	WebSocketClientFactory wf = new WebSocketClientFactory() {
 		@Override
 		public WebSocket createWebSocket( WebSocketAdapter a, Draft d, Socket s ) {
 			return new WebSocketImpl( WebSocketClient.this, d, s );
@@ -84,7 +84,7 @@ public WebSocket createWebSocket( WebSocketAdapter a, List<Draft> d, Socket s )
 		}
 
 		@Override
-		public ByteChannel wrapChannel( SelectionKey c ) {
+		public ByteChannel wrapChannel( SelectionKey c, String host, int port ) {
 			return (ByteChannel) c.channel();
 		}
 	};
@@ -286,7 +286,19 @@ private final void interruptableRun() {
 
 	private int getPort() {
 		int port = uri.getPort();
-		return port == -1 ? WebSocket.DEFAULT_PORT : port;
+		if( port == -1 ) {
+			String scheme = uri.getScheme();
+			if( scheme.equals( "wss" ) ) {
+				return WebSocket.DEFAULT_WSS_PORT;
+			}
+			else if( scheme.equals( "ws" ) ) {
+				return WebSocket.DEFAULT_PORT;
+			}
+			else{
+				throw new RuntimeException( "unkonow scheme" + scheme );
+			}
+		}
+		return port;
 	}
 
 	private void finishConnect( SelectionKey key ) throws IOException , InvalidHandshakeException , InterruptedException {
@@ -296,7 +308,7 @@ private void finishConnect( SelectionKey key ) throws IOException , InvalidHands
 		// Now that we're connected, re-register for only 'READ' keys.
 		key.interestOps( SelectionKey.OP_READ | SelectionKey.OP_WRITE );
 
-		wrappedchannel = wf.wrapChannel( key );
+		wrappedchannel = wf.wrapChannel( key, uri.getHost(), getPort() );
 		sendHandshake();
 	}
 
@@ -395,7 +407,7 @@ public WebSocket getConnection() {
 		return conn;
 	}
 
-	public final void setWebSocketFactory( WebSocketFactory wsf ) {
+	public final void setWebSocketFactory( WebSocketClientFactory wsf ) {
 		this.wf = wsf;
 	}
 
@@ -410,4 +422,10 @@ public final WebSocketFactory getWebSocketFactory() {
 	public abstract void onError( Exception ex );
 	public void onMessage( ByteBuffer bytes ) {
 	};
+
+	public interface WebSocketClientFactory extends WebSocketFactory {
+		public ByteChannel wrapChannel( SelectionKey key, String host, int port ) throws IOException;
+	}
 }
+
+
diff --git a/src/org/java_websocket/server/WebSocketServer.java b/src/org/java_websocket/server/WebSocketServer.java
@@ -532,5 +532,14 @@ public interface WebSocketServerFactory extends WebSocketFactory {
 		public WebSocketImpl createWebSocket( WebSocketAdapter a, Draft d, Socket s );
 
 		public WebSocketImpl createWebSocket( WebSocketAdapter a, List<Draft> drafts, Socket s );
+
+		/**
+		 * 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;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -532,5 +532,14 @@ public interface WebSocketServerFactory extends WebSocketFactory {`
`532`	`532`	`public WebSocketImpl createWebSocket( WebSocketAdapter a, Draft d, Socket s );`
`533`	`533`
`534`	`534`	`public WebSocketImpl createWebSocket( WebSocketAdapter a, List<Draft> drafts, Socket s );`
	`535`	`+`
	`536`	`+ /**`
	`537`	`+ * Allows to wrap the Socketchannel( key.channel() ) to insert a protocol layer( like ssl or proxy authentication) beyond the ws layer.`
	`538`	`+ *`
	`539`	`+ * @param key`
	`540`	`+ * a SelectionKey of an open SocketChannel.`
	`541`	`+ * @return The channel on which the read and write operations will be performed.<br>`
	`542`	`+ */`
	`543`	`+ public ByteChannel wrapChannel( SelectionKey key ) throws IOException;`
`535`	`544`	`}`
`536`	`545`	`}`