Merge pull request #1330 from blabno/feature/configurable-address-in-…

…localp2p-mode Configurable hostname in localhost p2p mode.
bisq-network · Feb 6, 2018 · fb28766 · fb28766
2 parents 1bd222c + c12fb0c
commit fb28766
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/network/src/main/java/io/bisq/network/p2p/NetworkNodeProvider.java b/network/src/main/java/io/bisq/network/p2p/NetworkNodeProvider.java
@@ -37,10 +37,11 @@ public class NetworkNodeProvider implements Provider<NetworkNode> {
     public NetworkNodeProvider(NetworkProtoResolver networkProtoResolver,
                                BridgeAddressProvider bridgeAddressProvider,
                                @Named(NetworkOptionKeys.USE_LOCALHOST_FOR_P2P) boolean useLocalhostForP2P,
+                               @Named(NetworkOptionKeys.MY_ADDRESS) String address,
                                @Named(NetworkOptionKeys.PORT_KEY) int port,
                                @Named(NetworkOptionKeys.TOR_DIR) File torDir) {
         networkNode = useLocalhostForP2P ?
-                new LocalhostNetworkNode(port, networkProtoResolver) :
+                new LocalhostNetworkNode(address, port, networkProtoResolver) :
                 new TorNetworkNode(port, torDir, networkProtoResolver, bridgeAddressProvider);
     }
 

diff --git a/network/src/main/java/io/bisq/network/p2p/network/LocalhostNetworkNode.java b/network/src/main/java/io/bisq/network/p2p/network/LocalhostNetworkNode.java
@@ -20,6 +20,8 @@ public class LocalhostNetworkNode extends NetworkNode {
     private static int simulateTorDelayTorNode = 500;
     private static int simulateTorDelayHiddenService = 500;
 
+    private String address;
+
     public static void setSimulateTorDelayTorNode(int simulateTorDelayTorNode) {
         LocalhostNetworkNode.simulateTorDelayTorNode = simulateTorDelayTorNode;
     }
@@ -33,8 +35,15 @@ public static void setSimulateTorDelayHiddenService(int simulateTorDelayHiddenSe
     // Constructor
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public LocalhostNetworkNode(int port, NetworkProtoResolver networkProtoResolver) {
+    public LocalhostNetworkNode(String address, int port, NetworkProtoResolver networkProtoResolver) {
         super(port, networkProtoResolver);
+        if (null != address && !address.trim().isEmpty()) {
+            this.address = address;
+        }
+    }
+
+    public LocalhostNetworkNode(int port, NetworkProtoResolver networkProtoResolver) {
+        this(null, port, networkProtoResolver);
     }
 
     @Override
@@ -59,7 +68,10 @@ public void start(@Nullable SetupListener setupListener) {
                     log.error("Exception at startServer: " + e.getMessage());
                 }
 
-                nodeAddressProperty.set(new NodeAddress("localhost", servicePort));
+                final NodeAddress nodeAddress;
+                if (null == address) nodeAddress = new NodeAddress("localhost", servicePort);
+                else nodeAddress = new NodeAddress(address);
+                nodeAddressProperty.set(nodeAddress);
                 setupListeners.stream().forEach(SetupListener::onHiddenServicePublished);
             }, simulateTorDelayTorNode, TimeUnit.MILLISECONDS);
         }, simulateTorDelayHiddenService, TimeUnit.MILLISECONDS);