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

Check for stability whenever connections are closed.

Browse Source
This commit is contained in:
akwizgran
2020-05-08 16:45:52 +01:00
parent f063feedd4
commit 99edb893f7
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothConnectionLimiterImpl.java
View File

@@ -113,14 +113,18 @@ class BluetoothConnectionLimiterImpl implements BluetoothConnectionLimiter {
public void connectionClosed(DuplexTransportConnection conn, public void connectionClosed(DuplexTransportConnection conn,
boolean exception) { boolean exception) {
synchronized (lock) { synchronized (lock) {
int numConnections = connections.size();
Iterator<ConnectionRecord> it = connections.iterator(); Iterator<ConnectionRecord> it = connections.iterator();
while (it.hasNext()) { while (it.hasNext()) {
if (it.next().connection == conn) { if (it.next().connection == conn) {
it.remove(); long now = clock.currentTimeMillis();
if (exception && numConnections > connectionLimit) { if (exception) {
connectionFailedAboveLimit(); if (connections.size() > connectionLimit) {
connectionFailedAboveLimit(now);
}
} else {
considerRaisingConnectionLimit(now);
} }
it.remove();
break; break;
} }
} }
@@ -132,6 +136,7 @@ class BluetoothConnectionLimiterImpl implements BluetoothConnectionLimiter {
@Override @Override
public void bluetoothDisabled() { public void bluetoothDisabled() {
synchronized (lock) { synchronized (lock) {
considerRaisingConnectionLimit(clock.currentTimeMillis());
connections.clear(); connections.clear();
LOG.info("Bluetooth disabled"); LOG.info("Bluetooth disabled");
} }
@@ -173,8 +178,7 @@ class BluetoothConnectionLimiterImpl implements BluetoothConnectionLimiter {
} }
@GuardedBy("lock") @GuardedBy("lock")
private void connectionFailedAboveLimit() { private void connectionFailedAboveLimit(long now) {
long now = clock.currentTimeMillis();
if (now - timeOfLastAttempt < STABILITY_PERIOD_MS) { if (now - timeOfLastAttempt < STABILITY_PERIOD_MS) {
LOG.info("Connection failed above limit, increasing interval"); LOG.info("Connection failed above limit, increasing interval");
attemptInterval = min(attemptInterval * 2, MAX_ATTEMPT_INTERVAL_MS); attemptInterval = min(attemptInterval * 2, MAX_ATTEMPT_INTERVAL_MS);