Merge pull request TooTallNate#529 from marci4/master

Added setter for SO_REUSEADDR

Author: marci4

src/main/java/org/java_websocket/AbstractWebSocket.java

@@ -43,7 +43,12 @@ public abstract class AbstractWebSocket extends WebSocketAdapter {
      */
     private boolean tcpNoDelay;
 
-    /**
+	/**
+	 * Attribute which allows you to enable/disable the SO_REUSEADDR socket option.
+	 */
+	private boolean reuseAddr;
+
+	/**
      * Attribute for a timer allowing to check for lost connections
      */
     private Timer connectionLostTimer;
@@ -174,4 +179,24 @@ public void setTcpNoDelay( boolean tcpNoDelay ) {
         this.tcpNoDelay = tcpNoDelay;
     }
 
+	/**
+	 * Tests Tests if SO_REUSEADDR is enabled.
+	 *
+	 * @return a boolean indicating whether or not SO_REUSEADDR is enabled.
+	 */
+	public boolean isReuseAddr() {
+		return reuseAddr;
+	}
+
+	/**
+	 * Setter for soReuseAddr
+	 * <p>
+	 * Enable/disable SO_REUSEADDR for the socket
+	 *
+	 * @param reuseAddr whether to enable or disable SO_REUSEADDR
+	 */
+	public void setReuseAddr( boolean reuseAddr ) {
+		this.reuseAddr = reuseAddr;
+	}
+
 }

src/main/java/org/java_websocket/client/WebSocketClient.java

@@ -130,6 +130,7 @@ public WebSocketClient( URI serverUri , Draft protocolDraft , Map<String,String>
 		this.headers = httpHeaders;
 		this.connectTimeout = connectTimeout;
 		setTcpNoDelay( false );
+		setReuseAddr( false );
 		this.engine = new WebSocketImpl( this, protocolDraft );
 	}
 
@@ -240,9 +241,9 @@ public void run() {
 			}
 
 			socket.setTcpNoDelay( isTcpNoDelay() );
+			socket.setReuseAddress( isReuseAddr() );
 
 			if( !socket.isBound() ) {
-
 				socket.connect( new InetSocketAddress( uri.getHost(), getPort() ), connectTimeout );
 			}
 

src/main/java/org/java_websocket/drafts/Draft_6455.java

@@ -35,7 +35,6 @@
 import org.java_websocket.framing.Framedata;
 import org.java_websocket.framing.FramedataImpl1;
 import org.java_websocket.handshake.*;
-import org.java_websocket.util.Charsetfunctions;
 
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
@@ -177,6 +176,8 @@ public Draft copyInstance() {
 	@Override
 	public ByteBuffer createBinaryFrame( Framedata framedata ) {
 		getExtension().encodeFrame( framedata );
+		if( WebSocketImpl.DEBUG )
+			System.out.println( "afterEnconding(" + framedata.getPayloadData().remaining() + "): {" + ( framedata.getPayloadData().remaining() > 1000 ? "too big to display" : new String( framedata.getPayloadData().array() ) ) + "}" );
 		return super.createBinaryFrame( framedata );
 	}
 
@@ -262,7 +263,7 @@ public Framedata translateSingleFrame( ByteBuffer buffer ) throws IncompleteExce
 		getExtension().isFrameValid( frame );
 		getExtension().decodeFrame( frame );
 		if( WebSocketImpl.DEBUG )
-			System.out.println( "Decode Payload after: " + Arrays.toString( Charsetfunctions.utf8Bytes( new String( frame.getPayloadData().array() ) ) ) );
+			System.out.println( "afterDecoding(" + frame.getPayloadData().remaining() + "): {" + ( frame.getPayloadData().remaining() > 1000 ? "too big to display" : new String( frame.getPayloadData().array() ) ) + "}" );
 		frame.isValid();
 		return frame;
 	}

src/main/java/org/java_websocket/framing/FramedataImpl1.java

@@ -157,7 +157,7 @@ public void append(Framedata nextframe) {
 
     @Override
     public String toString() {
-        return "Framedata{ optcode:" + getOpcode() + ", fin:" + isFin() + ", rsv1:" + isRSV1() + ", rsv2:" + isRSV2() + ", rsv3:" + isRSV3() + ", payloadlength:[pos:" + unmaskedpayload.position() + ", len:" + unmaskedpayload.remaining() + "], payload:" + Arrays.toString(Charsetfunctions.utf8Bytes(new String(unmaskedpayload.array()))) + "}";
+        return "Framedata{ optcode:" + getOpcode() + ", fin:" + isFin() + ", rsv1:" + isRSV1() + ", rsv2:" + isRSV2() + ", rsv3:" + isRSV3() + ", payloadlength:[pos:" + unmaskedpayload.position() + ", len:" + unmaskedpayload.remaining() + "], payload:" + ( unmaskedpayload.remaining() > 1000 ? "(too big to display)" : new String( unmaskedpayload.array() ) ) + "}";
     }
 
     /**

src/main/java/org/java_websocket/server/WebSocketServer.java

@@ -201,6 +201,7 @@ public WebSocketServer( InetSocketAddress address , int decodercount , List<Draf
 		this.address = address;
 		this.connections = connectionscontainer;
 		setTcpNoDelay(false);
+		setReuseAddr(false);
 		iqueue = new LinkedList<WebSocketImpl>();
 
 		decoders = new ArrayList<WebSocketWorker>( decodercount );
@@ -318,6 +319,7 @@ public void run() {
 			server.configureBlocking( false );
 			ServerSocket socket = server.socket();
 			socket.setReceiveBufferSize( WebSocketImpl.RCVBUF );
+			socket.setReuseAddress( isReuseAddr() );
 			socket.bind( address );
 			selector = Selector.open();
 			server.register( selector, server.validOps() );