Changeset 1252

Timestamp:

Oct 22, 2010, 10:45:07 AM (13 years ago)

Author:

Nicklas Nordborg

Message:

Adding support for specifying which local network address to bind to (including the wildcard address). New methods:

• Client.startProtocol(InetSocketAddress)
• NetworkReader.connect(InetSocketAddress)

Location:

extensions/net.sf.basedb.torrent/trunk/src/external/hpbtc/hpbtc/protocol

Files:

• network/NetworkReader.java (modified) (3 diffs)
• processor/Client.java (modified) (2 diffs)

extensions/net.sf.basedb.torrent/trunk/src/external/hpbtc/hpbtc/protocol/network/NetworkReader.java

@@ -13 +13 @@
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
+import java.net.SocketAddress;
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.SelectableChannel;
@@ -38 +39 @@
 
     public void connect(final int port) throws IOException {
+      connect(new InetSocketAddress(InetAddress.getLocalHost(), port));
+    }
+
+    /**
+      Connect the reader to the local address and port.
+      @param address The local network address to bind to, or null to let the system
+        decide
+      @return The port bound to
+    */
+    public InetSocketAddress connect(final InetSocketAddress address) 
+      throws IOException 
+    {
         serverCh = ServerSocketChannel.open();
-        serverCh.socket().bind(new InetSocketAddress(
-                InetAddress.getLocalHost(), port));
+      ServerSocket socket = serverCh.socket();
+      socket.bind(address);
         serverCh.configureBlocking(false);
         super.connect();
+        return (InetSocketAddress)socket.getLocalSocketAddress();
     }
-
+    
     @Override
     protected void registerSelectors(Selector selector)
@@ -55 +69 @@
     @Override
     public int connect() throws IOException {
-        serverCh = ServerSocketChannel.open();
-        ServerSocket s = serverCh.socket();
-        s.bind(null);
-        serverCh.configureBlocking(false);
-        super.connect();
-        return s.getLocalPort();
+      return connect(new InetSocketAddress(InetAddress.getLocalHost(), 0)).getPort();
     }
 

extensions/net.sf.basedb.torrent/trunk/src/external/hpbtc/hpbtc/protocol/processor/Client.java

@@ -15 +15 @@
 import hpbtc.util.TorrentUtil;
 import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
 import java.util.logging.Logger;
 
@@ -76 +78 @@
     }
     
+    public InetSocketAddress startProtocol(InetSocketAddress address)
+      throws IOException
+    {
+        initNetwork();
+        InetSocketAddress connected = netReader.connect(address);
+        this.port = connected.getPort();
+        netWriter.connect();
+        logger.fine("Started client on " + connected);
+        return connected;
+    }
+    
     public void startProtocol(int port) throws IOException {
-        this.port = port;
-        initNetwork();
-        netReader.connect(port);
-        netWriter.connect();
-        logger.fine("Started client on " + InetAddress.getLocalHost() + ":" + port);
+      startProtocol(new InetSocketAddress(InetAddress.getLocalHost(), port));
     }
     
     public int startProtocol() throws IOException {
-        initNetwork();
-        port = netReader.connect();
-        netWriter.connect();
-        logger.fine("Started client on " + InetAddress.getLocalHost() + ":" + port);
-        return port;
+      return startProtocol(new InetSocketAddress(InetAddress.getLocalHost(), 0)).getPort();
     }