mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-25 07:27:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use external IP not internal

Browse source
This commit is contained in:
Manfred Karrer 2014-11-14 03:01:36 +01:00
parent 745cba983d
commit c8ece38889
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesView.fxml
View file

@ -39,19 +39,19 @@
</GridPane.margin> </GridPane.margin>
</Label> </Label>
<TextField fx:id="bitcoinNetwork" GridPane.rowIndex="0" GridPane.columnIndex="1" <TextField fx:id="bitcoinNetwork" GridPane.rowIndex="0" GridPane.columnIndex="1"
mouseTransparent="true" editable="false" focusTraversable="false"> mouseTransparent="true" focusTraversable="false">
<GridPane.margin> <GridPane.margin>
<Insets top="10"/> <Insets top="10"/>
</GridPane.margin> </GridPane.margin>
</TextField> </TextField>
<Label text="P2P network connection:" GridPane.rowIndex="1"/> <Label text="P2P network connection:" GridPane.rowIndex="1"/>
<TextField fx:id="connectionType" GridPane.rowIndex="1" GridPane.columnIndex="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"/> <Label text="My external visible P2P network address:" GridPane.rowIndex="2"/>
<TextField fx:id="nodeAddress" GridPane.rowIndex="2" GridPane.columnIndex="1" <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"> <Label text="P2P bootstrap node address:" GridPane.rowIndex="3">
<GridPane.margin> <GridPane.margin>
@ -59,8 +59,8 @@
</GridPane.margin> </GridPane.margin>
</Label> </Label>
<TextField fx:id="bootstrapNodeAddress" GridPane.rowIndex="3" GridPane.columnIndex="1" <TextField fx:id="bootstrapNodeAddress" GridPane.rowIndex="3" GridPane.columnIndex="1"
mouseTransparent="true" editable="false" focusTraversable="false"> mouseTransparent="true" focusTraversable="false">
<GridPane.margin> <GridPane.margin>
<Insets bottom="-15"/> <Insets bottom="-15"/>
</GridPane.margin> </GridPane.margin>
</TextField> </TextField>

2
src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesViewCB.java
View file

@ -46,9 +46,9 @@ public class NetworkPreferencesViewCB implements Initializable {
@Override @Override
public void initialize(URL url, ResourceBundle rb) { public void initialize(URL url, ResourceBundle rb) {
bitcoinNetwork.setText(bitcoinNetworkValue); bitcoinNetwork.setText(bitcoinNetworkValue);
connectionType.setText(clientNode.getConnectionType().toString());
nodeAddress.setText(clientNode.getAddress().toString()); nodeAddress.setText(clientNode.getAddress().toString());
bootstrapNodeAddress.setText(clientNode.getBootstrapNodeAddress().toString()); bootstrapNodeAddress.setText(clientNode.getBootstrapNodeAddress().toString());
connectionType.setText(clientNode.getConnectionType().toString());
} }
} }

2
src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java
View file

@ -394,7 +394,7 @@ public class TomP2PNode implements ClientNode {
PeerSocketAddress socketAddress = peerDHT.peerAddress().peerSocketAddress(); PeerSocketAddress socketAddress = peerDHT.peerAddress().peerSocketAddress();
return Node.at( return Node.at(
peerDHT.peerID().toString(), peerDHT.peerID().toString(),
socketAddress.inetAddress().getHostAddress(), socketAddress.inetAddress().toString(),
socketAddress.tcpPort()); socketAddress.tcpPort());
} }

3
src/test/java/io/bitsquare/msg/TomP2PTests.java
View file

@ -478,11 +478,12 @@ public class TomP2PTests {
// The sendDirect operation fails in port forwarding mode because most routers does not support NAT reflections. // 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. // 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 // That will probably be fixed in a future version of TomP2P
@Test @Test
@Repeat(STRESS_TEST_COUNT) @Repeat(STRESS_TEST_COUNT)
public void testSendDirectBetweenLocalPeers() throws Exception { 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); peer1DHT = getDHTPeer(client1Port);
peer2DHT = getDHTPeer(client2Port); peer2DHT = getDHTPeer(client2Port);