Merge pull request TooTallNate#462 from marci4/master

marci4 · web-flow · commit 2ee31968000e · 2017-04-26T08:51:38.000+02:00
Make TCP_NODELAY accessible
diff --git a/src/main/java/org/java_websocket/client/WebSocketClient.java b/src/main/java/org/java_websocket/client/WebSocketClient.java
@@ -58,6 +58,11 @@ public abstract class WebSocketClient extends WebSocketAdapter implements Runnab
 
 	private int connectTimeout = 0;
 
+	/**
+	 * Attribute which allows you to deactivate the Nagle's algorithm
+	 */
+	private boolean tcpNoDelay;
+
 	/**
 	 * Constructs a WebSocketClient instance and sets it to the connect to the
 	 * specified URI. The channel does not attampt to connect automatically. The connection
@@ -99,6 +104,7 @@ public WebSocketClient( URI serverUri , Draft protocolDraft , Map<String,String>
 		this.draft = protocolDraft;
 		this.headers = httpHeaders;
 		this.connectTimeout = connectTimeout;
+		this.tcpNoDelay = false;
 		this.engine = new WebSocketImpl( this, protocolDraft );
 	}
 
@@ -127,6 +133,24 @@ public Socket getSocket() {
 		return socket;
 	}
 
+	/**
+	 * Tests if TCP_NODELAY is enabled.
+	 * @return a boolean indicating whether or not TCP_NODELAY is enabled for new connections.
+	 */
+	public boolean isTcpNoDelay() {
+		return tcpNoDelay;
+	}
+
+	/**
+	 * Setter for tcpNoDelay
+	 *
+	 * Enable/disable TCP_NODELAY (disable/enable Nagle's algorithm) for new connections
+	 * @param tcpNoDelay true to enable TCP_NODELAY, false to disable.
+	 */
+	public void setTcpNoDelay( boolean tcpNoDelay ) {
+		this.tcpNoDelay = tcpNoDelay;
+	}
+
 	/**
 	 * Initiates the websocket connection. This method does not block.
 	 */
@@ -193,6 +217,7 @@ public void run() {
 			} else if( socket.isClosed() ) {
 				throw new IOException();
 			}
+			socket.setTcpNoDelay( tcpNoDelay );
 			if( !socket.isBound() )
 				socket.connect( new InetSocketAddress( uri.getHost(), getPort() ), connectTimeout );
 			istream = socket.getInputStream();
diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
@@ -88,6 +88,11 @@ public abstract class WebSocketServer extends WebSocketAdapter implements Runnab
 
 	private WebSocketServerFactory wsf = new DefaultWebSocketServerFactory();
 
+	/**
+	 * Attribute which allows you to deactivate the Nagle's algorithm
+	 */
+	private boolean tcpNoDelay;
+
 	/**
 	 * Creates a WebSocketServer that will attempt to
 	 * listen on port <var>WebSocket.DEFAULT_PORT</var>.
@@ -181,7 +186,7 @@ public WebSocketServer( InetSocketAddress address , int decodercount , List<Draf
 
 		this.address = address;
 		this.connections = connectionscontainer;
-
+		tcpNoDelay = false;
 		iqueue = new LinkedList<WebSocketImpl>();
 
 		decoders = new ArrayList<WebSocketWorker>( decodercount );
@@ -193,6 +198,25 @@ public WebSocketServer( InetSocketAddress address , int decodercount , List<Draf
 		}
 	}
 
+	/**
+	 * Tests if TCP_NODELAY is enabled.
+	 * @return a boolean indicating whether or not TCP_NODELAY is enabled for new connections.
+	 */
+	public boolean isTcpNoDelay() {
+		return tcpNoDelay;
+	}
+
+	/**
+	 * Setter for tcpNoDelay
+	 *
+	 * Enable/disable TCP_NODELAY (disable/enable Nagle's algorithm) for new connections
+	 * @param tcpNoDelay true to enable TCP_NODELAY, false to disable.
+	 */
+	public void setTcpNoDelay( boolean tcpNoDelay ) {
+		this.tcpNoDelay = tcpNoDelay;
+	}
+
+
 	/**
 	 * Starts the server selectorthread that binds to the currently set port number and
 	 * listeners for WebSocket connection requests. Creates a fixed thread pool with the size {@link WebSocketServer#DECODERS}<br>
@@ -335,7 +359,9 @@ public void run() {
 								continue;
 							}
 							channel.configureBlocking( false );
-							WebSocketImpl w = wsf.createWebSocket( this, drafts, channel.socket() );
+							Socket socket = channel.socket();
+							socket.setTcpNoDelay( tcpNoDelay );
+							WebSocketImpl w = wsf.createWebSocket( this, drafts, socket );
 							w.key = channel.register( selector, SelectionKey.OP_READ, w );
 							try {
 								w.channel = wsf.wrapChannel( channel, w.key );
