From c8ece3888943292f70c81aebae02b27b353c1c64 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Fri, 14 Nov 2014 03:01:36 +0100
Subject: [PATCH] Use external IP not internal

---
 .../preferences/network/NetworkPreferencesView.fxml  | 12 ++++++------
 .../network/NetworkPreferencesViewCB.java            |  2 +-
 .../java/io/bitsquare/msg/tomp2p/TomP2PNode.java     |  2 +-
 src/test/java/io/bitsquare/msg/TomP2PTests.java      |  3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesView.fxml b/src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesView.fxml
index e9a326e0dd..f4a1ab37fd 100644
--- a/src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesView.fxml
+++ b/src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesView.fxml
@@ -39,19 +39,19 @@
         </GridPane.margin>
     </Label>
     <TextField fx:id="bitcoinNetwork" GridPane.rowIndex="0" GridPane.columnIndex="1"
-               mouseTransparent="true" editable="false" focusTraversable="false">
-        <GridPane.margin>
+               mouseTransparent="true" focusTraversable="false">
+    <GridPane.margin>
             <Insets top="10"/>
         </GridPane.margin>
     </TextField>
 
     <Label text="P2P network connection:" GridPane.rowIndex="1"/>
     <TextField fx:id="connectionType" GridPane.rowIndex="1" GridPane.columnIndex="1"
-               mouseTransparent="true" editable="false" focusTraversable="false"/>
+               mouseTransparent="true" focusTraversable="false"/>
 
     <Label text="My external visible P2P network address:" GridPane.rowIndex="2"/>
     <TextField fx:id="nodeAddress" GridPane.rowIndex="2" GridPane.columnIndex="1"
-               mouseTransparent="true" editable="false" focusTraversable="false"/>
+               mouseTransparent="true" focusTraversable="false"/>
 
     <Label text="P2P bootstrap node address:" GridPane.rowIndex="3">
         <GridPane.margin>
@@ -59,8 +59,8 @@
         </GridPane.margin>
     </Label>
     <TextField fx:id="bootstrapNodeAddress" GridPane.rowIndex="3" GridPane.columnIndex="1"
-               mouseTransparent="true" editable="false" focusTraversable="false">
-        <GridPane.margin>
+               mouseTransparent="true" focusTraversable="false">
+    <GridPane.margin>
             <Insets bottom="-15"/>
         </GridPane.margin>
     </TextField>
diff --git a/src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesViewCB.java b/src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesViewCB.java
index e86dca40ca..0760efa611 100644
--- a/src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesViewCB.java
@@ -46,9 +46,9 @@ public class NetworkPreferencesViewCB implements Initializable {
     @Override
     public void initialize(URL url, ResourceBundle rb) {
         bitcoinNetwork.setText(bitcoinNetworkValue);
+        connectionType.setText(clientNode.getConnectionType().toString());
         nodeAddress.setText(clientNode.getAddress().toString());
         bootstrapNodeAddress.setText(clientNode.getBootstrapNodeAddress().toString());
-        connectionType.setText(clientNode.getConnectionType().toString());
     }
 }
 
diff --git a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java
index 0b1e0ddc3f..41625a55f4 100644
--- a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java
+++ b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java
@@ -394,7 +394,7 @@ public class TomP2PNode implements ClientNode {
         PeerSocketAddress socketAddress = peerDHT.peerAddress().peerSocketAddress();
         return Node.at(
                 peerDHT.peerID().toString(),
-                socketAddress.inetAddress().getHostAddress(),
+                socketAddress.inetAddress().toString(),
                 socketAddress.tcpPort());
     }
 
diff --git a/src/test/java/io/bitsquare/msg/TomP2PTests.java b/src/test/java/io/bitsquare/msg/TomP2PTests.java
index 64e0954345..ffecce12f0 100644
--- a/src/test/java/io/bitsquare/msg/TomP2PTests.java
+++ b/src/test/java/io/bitsquare/msg/TomP2PTests.java
@@ -478,11 +478,12 @@ public class TomP2PTests {
 
     // The sendDirect operation fails in port forwarding mode because most routers does not support NAT reflections.
     // So if both clients are behind NAT they cannot send direct message to each other.
+    // Seems that in relay mode that is also not working
     // That will probably be fixed in a future version of TomP2P
     @Test
     @Repeat(STRESS_TEST_COUNT)
     public void testSendDirectBetweenLocalPeers() throws Exception {
-        if (FORCED_CONNECTION_TYPE != ConnectionType.NAT && resolvedConnectionType != ConnectionType.RELAY) {
+        if (FORCED_CONNECTION_TYPE == ConnectionType.DIRECT || resolvedConnectionType == ConnectionType.DIRECT) {
             peer1DHT = getDHTPeer(client1Port);
             peer2DHT = getDHTPeer(client2Port);