Changeset 1253

Timestamp:

Oct 22, 2010, 10:47:40 AM (13 years ago)

Author:

Nicklas Nordborg

Message:

Added configuration option for specifying which local address to listen on.

Location:

extensions/net.sf.basedb.torrent/trunk

Files:

• src/main/net/sf/basedb/clients/torrent/service/TorrentService.java (modified) (5 diffs)
• torrent.properties (modified) (1 diff)

extensions/net.sf.basedb.torrent/trunk/src/main/net/sf/basedb/clients/torrent/service/TorrentService.java

@@ -28 +28 @@
 
 import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.util.Properties;
 
@@ -85 +87 @@
 
   private final java.io.File workDir;
+  private final String address;
   private final int port;
   private volatile boolean isRunning;
   private Client btClient;
+  private InetSocketAddress listenAddress;
   
   /**
@@ -100 +104 @@
     }
     this.workDir = new java.io.File(dir);
+    this.address = Values.getStringOrNull(properties.getProperty("torrents.listen-address"));
     this.port = Values.getInt(properties.getProperty("torrents.listen-port"));
   }
@@ -119 +124 @@
     log.info("Starting Bittorrent Download Service");
     log.debug("Working directory: " + workDir);
+    log.debug("Listen address: " + address);
     log.debug("Listen port: " + port);
     
@@ -137 +143 @@
       {
         tmpClient = new Client();
-        tmpClient.startProtocol(port);
+        InetAddress tmpAddress = null;
+        if (address != null) tmpAddress = InetAddress.getByName(address);
+        InetSocketAddress socketAddress = new InetSocketAddress(tmpAddress, port);
+        listenAddress = tmpClient.startProtocol(socketAddress);
+        log.debug("Connected to: " + listenAddress);
       }
       catch (IOException ex)

extensions/net.sf.basedb.torrent/trunk/torrent.properties

@@ -7 +7 @@
 torrents.work-dir = 
 
+# The local address the torrent service will listen on for incoming connections.
+# If not specified it will listen to the wildcard address (0.0.0.0)
+torrents.listen-address = 
+
 # The port the torrent service will listen on for incoming connections.
-torrents.listen-port  = 17777
+# If 0 or not specified the system will select a random free port
+torrents.listen-port  =