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

Merge branch 'netlayer' of https://github.com/mrosseel/bisq-exchange into mrosseel-netlayer

Browse source
This commit is contained in:
Manfred Karrer 2017-11-03 11:51:26 -05:00
commit 0cd9f7448b
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gui/src/main/java/io/bisq/gui/main/overlays/windows/AddBridgeEntriesWindow.java
View file

@ -117,7 +117,7 @@ public class AddBridgeEntriesWindow extends Overlay<AddBridgeEntriesWindow> {
HBox.setHgrow(spacer, Priority.ALWAYS); HBox.setHgrow(spacer, Priority.ALWAYS);
GridPane.setHalignment(hBox, HPos.RIGHT); GridPane.setHalignment(hBox, HPos.RIGHT);
GridPane.setRowIndex(hBox, rowIndex); GridPane.setRowIndex(hBox, ++rowIndex);
GridPane.setColumnSpan(hBox, 2); GridPane.setColumnSpan(hBox, 2);
GridPane.setMargin(hBox, new Insets(buttonDistance, 0, 0, 0)); GridPane.setMargin(hBox, new Insets(buttonDistance, 0, 0, 0));
gridPane.getChildren().add(hBox); gridPane.getChildren().add(hBox);
@ -158,7 +158,7 @@ public class AddBridgeEntriesWindow extends Overlay<AddBridgeEntriesWindow> {
GridPane.setColumnIndex(label, 0); GridPane.setColumnIndex(label, 0);
GridPane.setColumnSpan(label, 2); GridPane.setColumnSpan(label, 2);
GridPane.setHalignment(label, HPos.LEFT); GridPane.setHalignment(label, HPos.LEFT);
Tuple2<Label, TextArea> labelTextAreaTuple2 = addLabelTextArea(gridPane, rowIndex, "Bridge entries:", ""); Tuple2<Label, TextArea> labelTextAreaTuple2 = addLabelTextArea(gridPane, ++rowIndex, "Bridge entries:", "");
bridgeEntriesTextArea = labelTextAreaTuple2.second; bridgeEntriesTextArea = labelTextAreaTuple2.second;
} }

2
network/src/main/java/io/bisq/network/p2p/network/TorNetworkNode.java
View file

@ -205,11 +205,13 @@ public class TorNetworkNode extends NetworkNode {
private void createTorAndHiddenService(final File torDir, int localPort, int servicePort, List<String> bridgeLines) { private void createTorAndHiddenService(final File torDir, int localPort, int servicePort, List<String> bridgeLines) {
Log.traceCall(); Log.traceCall();
log.debug("Using bridges: {}", bridgeLines.stream().collect(Collectors.joining(","))); log.debug("Using bridges: {}", bridgeLines.stream().collect(Collectors.joining(",")));
/*
if(restartCounter == 0) { if(restartCounter == 0) {
log.error("Doing fake restart to get to the bridges"); log.error("Doing fake restart to get to the bridges");
restartTor("error message here..."); restartTor("error message here...");
return; return;
} }
*/
ListenableFuture<Object> future = (ListenableFuture<Object>) executorService.submit(() -> { ListenableFuture<Object> future = (ListenableFuture<Object>) executorService.submit(() -> {
try { try {
Tor.setDefault(new NativeTor(torDir, bridgeLines)); Tor.setDefault(new NativeTor(torDir, bridgeLines));