Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 03:39:05 +01:00
Code Issues Projects Releases Wiki Activity

Use the same maximum frame length for all transports.

Browse Source
This commit is contained in:
akwizgran
2015-01-05 16:24:44 +00:00
parent 358166bc12
commit d3bf2d59a1
60 changed files with 194 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
View File

@@ -69,7 +69,7 @@ class DroidtoothPlugin implements DuplexPlugin {
private final SecureRandom secureRandom;
private final Clock clock;
private final DuplexPluginCallback callback;
private final int maxFrameLength, maxLatency, pollingInterval;
private final int maxLatency, pollingInterval;
private volatile boolean running = false;
private volatile boolean wasDisabled = false;
@@ -81,7 +81,7 @@ class DroidtoothPlugin implements DuplexPlugin {
DroidtoothPlugin(Executor ioExecutor, AndroidExecutor androidExecutor,
Context appContext, SecureRandom secureRandom, Clock clock,
DuplexPluginCallback callback, int maxFrameLength, int maxLatency,
DuplexPluginCallback callback, int maxLatency,
int pollingInterval) {
this.ioExecutor = ioExecutor;
this.androidExecutor = androidExecutor;
@@ -89,7 +89,6 @@ class DroidtoothPlugin implements DuplexPlugin {
this.secureRandom = secureRandom;
this.clock = clock;
this.callback = callback;
this.maxFrameLength = maxFrameLength;
this.maxLatency = maxLatency;
this.pollingInterval = pollingInterval;
}
@@ -98,10 +97,6 @@ class DroidtoothPlugin implements DuplexPlugin {
return ID;
}
public int getMaxFrameLength() {
return maxFrameLength;
}
public int getMaxLatency() {
return maxLatency;
}

4
briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPluginFactory.java
View File

@@ -15,7 +15,6 @@ import android.content.Context;
public class DroidtoothPluginFactory implements DuplexPluginFactory {
private static final int MAX_FRAME_LENGTH = 1024;
private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
private static final int POLLING_INTERVAL = 3 * 60 * 1000; // 3 minutes
@@ -41,7 +40,6 @@ public class DroidtoothPluginFactory implements DuplexPluginFactory {
public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
return new DroidtoothPlugin(ioExecutor, androidExecutor, appContext,
secureRandom, clock, callback, MAX_FRAME_LENGTH, MAX_LATENCY,
POLLING_INTERVAL);
secureRandom, clock, callback, MAX_LATENCY, POLLING_INTERVAL);
}
}

8
briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothTransportConnection.java
View File

@@ -39,10 +39,6 @@ class DroidtoothTransportConnection implements DuplexTransportConnection {
private class Reader implements TransportConnectionReader {
public int getMaxFrameLength() {
return plugin.getMaxFrameLength();
}
public long getMaxLatency() {
return plugin.getMaxLatency();
}
@@ -60,10 +56,6 @@ class DroidtoothTransportConnection implements DuplexTransportConnection {
private class Writer implements TransportConnectionWriter {
public int getMaxFrameLength() {
return plugin.getMaxFrameLength();
}
public int getMaxLatency() {
return plugin.getMaxLatency();
}