src/main/java/moe/nekojimi/chords/Chords.java

@@ -108,17 +108,12 @@ public final class Chords extends ListenerAdapter
 
         if (settings.getLocalAddr() != null)
         {
-            // make local binding socket factory
+            final WebSocketFactory webSocketFactory = new WebSocketFactory();
             final LocalBindSocketFactory localBindSocketFactory = new LocalBindSocketFactory();
-            localBindSocketFactory.setLocalAddress(InetAddress.getByName(settings.getLocalAddr()));
-
-            // install local socket factory for HTTP
             OkHttpClient.Builder httpBuilder = IOUtil.newHttpClientBuilder();
             httpBuilder.socketFactory(localBindSocketFactory);
-            builder.setHttpClientBuilder(httpBuilder);
 
-            // install local socket factory for websockets
-            final WebSocketFactory webSocketFactory = new WebSocketFactory();
+            localBindSocketFactory.setLocalAddress(InetAddress.getByName(settings.getLocalAddr()));
             webSocketFactory.setSocketFactory(localBindSocketFactory);
             builder.setWebsocketFactory(webSocketFactory);
         }

src/main/java/moe/nekojimi/chords/LocalBindSocketFactory.java

@@ -17,7 +17,10 @@
 package moe.nekojimi.chords;
 
 import java.io.IOException;
-import java.net.*;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.UnknownHostException;
 import javax.net.SocketFactory;
 
 /**
@@ -39,18 +42,6 @@ public class LocalBindSocketFactory extends SocketFactory
         this.localAddress = localAddress;
     }
 
-    @Override
-    public Socket createSocket() throws IOException
-    {
-        return new LocalBoundSocket();
-//        throw new RuntimeException("Trying to create an empty socket!");
-    }
-
-    private InetSocketAddress findFreeSocketAddress()
-    {
-        return new InetSocketAddress(localAddress, findFreePort(localAddress));
-    }
-
     @Override
     public Socket createSocket(String remoteAddr, int remotePort) throws IOException, UnknownHostException
     {
@@ -72,10 +63,7 @@ public class LocalBindSocketFactory extends SocketFactory
     @Override
     public Socket createSocket(InetAddress remoteAddr, int remotePort, InetAddress x, int localPort) throws IOException
     {
-        System.out.println("Requested socket; " + localAddress + ":" + localPort + " -> " + remoteAddr + ":" + remotePort);
-        Socket socket = new Socket(remoteAddr, remotePort, localAddress, localPort);
-        System.out.println("Returned socket; " + socket.getLocalSocketAddress() + ":" + socket.getLocalPort() + " -> " + socket.getRemoteSocketAddress() + ":" + socket.getPort());
-        return socket;
+        return new Socket(remoteAddr, remotePort, localAddress, localPort);
     }
 
     private static int findFreePort(InetAddress localAddr)
@@ -97,16 +85,4 @@ public class LocalBindSocketFactory extends SocketFactory
         throw new RuntimeException("Could not find a free port");
     }
 
-    private class LocalBoundSocket extends Socket
-    {
-
-        @Override
-        public void bind(SocketAddress bindpoint) throws IOException
-        {
-            InetSocketAddress localAddress = findFreeSocketAddress();
-            System.err.println("LocalBoundSocket NOT binding to " + bindpoint + ", using " + localAddress + " instead!");
-            super.bind(localAddress);
-        }
-    }
-
 }