Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity

Poll Tor plugin infrequently once our HS is reachable.

Browse Source
This commit is contained in:
akwizgran
2020-01-23 17:43:18 +00:00
parent 94f8f68336
commit 98e5d892a4
6 changed files with 117 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/JavaTorPlugin.java
View File

@@ -26,11 +26,13 @@ abstract class JavaTorPlugin extends TorPlugin {
BatteryManager batteryManager,
TorRendezvousCrypto torRendezvousCrypto,
PluginCallback callback, String architecture, int maxLatency,
int maxIdleTime, int pollingInterval, File torDirectory) {
int maxIdleTime, int initialPollingInterval,
int stablePollingInterval, File torDirectory) {
super(ioExecutor, networkManager, locationUtils, torSocketFactory,
clock, resourceProvider, circumventionProvider, batteryManager,
torRendezvousCrypto, callback, architecture, maxLatency,
maxIdleTime, pollingInterval, torDirectory);
maxIdleTime, initialPollingInterval, stablePollingInterval,
torDirectory);
}
@Override

8
bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPlugin.java
View File

@@ -26,11 +26,13 @@ class UnixTorPlugin extends JavaTorPlugin {
BatteryManager batteryManager,
TorRendezvousCrypto torRendezvousCrypto,
PluginCallback callback, String architecture, int maxLatency,
int maxIdleTime, int pollingInterval, File torDirectory) {
int maxIdleTime, int initialPollingInterval,
int stablePollingInterval, File torDirectory) {
super(ioExecutor, networkManager, locationUtils, torSocketFactory,
clock, resourceProvider, circumventionProvider, batteryManager,
torRendezvousCrypto, callback, architecture, maxLatency,
maxIdleTime, pollingInterval, torDirectory);
torRendezvousCrypto, callback, architecture,
maxLatency, maxIdleTime, initialPollingInterval,
stablePollingInterval, torDirectory);
}
@Override

18
bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java
View File

@@ -34,7 +34,20 @@ public class UnixTorPluginFactory implements DuplexPluginFactory {
private static final int MAX_LATENCY = (int) SECONDS.toMillis(30);
private static final int MAX_IDLE_TIME = (int) SECONDS.toMillis(30);
private static final int POLLING_INTERVAL = (int) MINUTES.toMillis(1);
/**
* How often to poll before our hidden service becomes reachable.
*/
private static final int INITIAL_POLLING_INTERVAL =
(int) MINUTES.toMillis(1);
/**
* How often to poll when our hidden service is reachable. Our contacts
* will poll when they come online, so our polling is just a fallback in
* case of repeated connection failures.
*/
private static final int STABLE_POLLING_INTERVAL =
(int) MINUTES.toMillis(15);
private final Executor ioExecutor;
private final NetworkManager networkManager;
@@ -95,7 +108,8 @@ public class UnixTorPluginFactory implements DuplexPluginFactory {
locationUtils, torSocketFactory, clock, resourceProvider,
circumventionProvider, batteryManager, torRendezvousCrypto,
callback, architecture, MAX_LATENCY, MAX_IDLE_TIME,
POLLING_INTERVAL, torDirectory);
INITIAL_POLLING_INTERVAL, STABLE_POLLING_INTERVAL,
torDirectory);
eventBus.addListener(plugin);
return plugin;
}