mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 01:41:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

custom torrc file available

Browse Source
This commit is contained in:
Florian Reimair 2018-11-07 10:07:28 +01:00
parent 73fc35413b
commit a46328fa41
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java
View File

@ -32,6 +32,7 @@ import org.berndpruenster.netlayer.tor.NativeTor;
import org.berndpruenster.netlayer.tor.Tor;
import org.berndpruenster.netlayer.tor.TorCtlException;
import org.berndpruenster.netlayer.tor.TorSocket;
import org.berndpruenster.netlayer.tor.Torrc;
import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
@ -51,6 +52,7 @@ import java.net.Socket;
import java.nio.file.Paths;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.Date;
@ -242,8 +244,21 @@ public class TorNetworkNode extends NetworkNode {
ListenableFuture<Void> future = executorService.submit(() -> {
try {
long ts1 = new Date().getTime();
Torrc override = null;
// check if the user wants to provide his own torrc file
String torrcfile = System.getProperty("torrcfile");
if(null != torrcfile) {
try {
override = new Torrc(new FileInputStream(new File(torrcfile)));
} catch(IOException e) {
log.error("custom torrc file not found (" + torrcfile + "). Proceeding with defaults.");
}
}
log.info("Starting tor");
Tor.setDefault(new NativeTor(torDir, bridgeEntries));
Tor.setDefault(new NativeTor(torDir, bridgeEntries, override));
log.info("\n################################################################\n" +
"Tor started after {} ms. Start publishing hidden service.\n" +
"################################################################",