diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
index 67e48d3da0865ad1aa7c3bbd72855092bf289b9f..7ccaa9a2797a4a96b92429996553be31f5f3e252 100644
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
@@ -614,7 +614,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
@Override
public DuplexTransportConnection createKeyAgreementConnection(
- byte[] commitment, BdfList descriptor, long timeout) {
+ byte[] commitment, BdfList descriptor) {
throw new UnsupportedOperationException();
}
diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementListener.java b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementListener.java
index 42fda82f9f858eb0bf360b0ee6a60042a77f951a..8c520b47e7c71b05c0e5ee4c3092e011e042a96c 100644
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementListener.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementListener.java
@@ -2,7 +2,7 @@ package org.briarproject.bramble.api.keyagreement;
import org.briarproject.bramble.api.data.BdfList;
-import java.util.concurrent.Callable;
+import java.io.IOException;
/**
* An class for managing a particular key agreement listener.
@@ -24,11 +24,11 @@ public abstract class KeyAgreementListener {
}
/**
- * Starts listening for incoming connections, and returns a Callable that
- * will return a KeyAgreementConnection when an incoming connection is
- * received.
+ * Blocks until an incoming connection is received and returns it.
+ *
+ * @throws IOException if an error occurs or {@link #close()} is called.
*/
- public abstract Callable<KeyAgreementConnection> listen();
+ public abstract KeyAgreementConnection accept() throws IOException;
/**
* Closes the underlying server socket.
diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexPlugin.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexPlugin.java
index 83fc642487260d3401fbbd26fb14a5cccd3ac1ad..8ab6c4fe445f09b0d15494b21c6637bc22c27f81 100644
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexPlugin.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexPlugin.java
@@ -36,9 +36,9 @@ public interface DuplexPlugin extends Plugin {
/**
* Attempts to connect to the remote peer specified in the given descriptor.
- * Returns null if no connection can be established within the given time.
+ * Returns null if no connection can be established.
*/
@Nullable
DuplexTransportConnection createKeyAgreementConnection(
- byte[] remoteCommitment, BdfList descriptor, long timeout);
+ byte[] remoteCommitment, BdfList descriptor);
}
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/ConnectionChooser.java b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/ConnectionChooser.java
new file mode 100644
index 0000000000000000000000000000000000000000..3aa58bc5079c60d4b6160ee920ed134dc143541c
--- /dev/null
+++ b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/ConnectionChooser.java
@@ -0,0 +1,36 @@
+package org.briarproject.bramble.keyagreement;
+
+import org.briarproject.bramble.api.keyagreement.KeyAgreementConnection;
+
+import java.util.concurrent.Callable;
+
+import javax.annotation.Nullable;
+
+interface ConnectionChooser {
+
+ /**
+ * Submits a connection task to the chooser.
+ */
+ void submit(Callable<KeyAgreementConnection> task);
+
+ /**
+ * Returns a connection returned by any of the tasks submitted to the
+ * chooser, waiting up to the given amount of time for a connection if
+ * necessary. Returns null if the time elapses without a connection
+ * becoming available.
+ *
+ * @param timeout the timeout in milliseconds
+ * @throws InterruptedException if the thread is interrupted while waiting
+ * for a connection to become available
+ */
+ @Nullable
+ KeyAgreementConnection poll(long timeout) throws InterruptedException;
+
+ /**
+ * Stops the chooser. Any connections already returned to the chooser are
+ * closed unless they have been removed from the chooser by calling
+ * {@link #poll(long)}. Any connections subsequently returned to the
+ * chooser will also be closed.
+ */
+ void stop();
+}
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/ConnectionChooserImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/ConnectionChooserImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..5b69243e1ddc7387f172b4928d0002998195c041
--- /dev/null
+++ b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/ConnectionChooserImpl.java
@@ -0,0 +1,112 @@
+package org.briarproject.bramble.keyagreement;
+
+import org.briarproject.bramble.api.keyagreement.KeyAgreementConnection;
+import org.briarproject.bramble.api.lifecycle.IoExecutor;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
+import org.briarproject.bramble.api.system.Clock;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executor;
+import java.util.logging.Logger;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.ThreadSafe;
+import javax.inject.Inject;
+
+import static java.util.logging.Level.INFO;
+
+@NotNullByDefault
+@ThreadSafe
+class ConnectionChooserImpl implements ConnectionChooser {
+
+ private static final Logger LOG =
+ Logger.getLogger(ConnectionChooserImpl.class.getName());
+
+ private final Clock clock;
+ private final Executor ioExecutor;
+ private final Object lock = new Object();
+
+ // The following are locking: lock
+ private boolean stopped = false;
+ private final Queue<KeyAgreementConnection> results = new LinkedList<>();
+
+ @Inject
+ ConnectionChooserImpl(Clock clock, @IoExecutor Executor ioExecutor) {
+ this.clock = clock;
+ this.ioExecutor = ioExecutor;
+ }
+
+ @Override
+ public void submit(Callable<KeyAgreementConnection> task) {
+ ioExecutor.execute(() -> {
+ try {
+ KeyAgreementConnection c = task.call();
+ if (c != null) addResult(c);
+ } catch (Exception e) {
+ if (LOG.isLoggable(INFO)) LOG.info(e.toString());
+ }
+ });
+ }
+
+ @Nullable
+ @Override
+ public KeyAgreementConnection poll(long timeout)
+ throws InterruptedException {
+ long now = clock.currentTimeMillis();
+ long end = now + timeout;
+ synchronized (lock) {
+ while (!stopped && results.isEmpty() && now < end) {
+ lock.wait(end - now);
+ now = clock.currentTimeMillis();
+ }
+ return results.poll();
+ }
+ }
+
+ @Override
+ public void stop() {
+ List<KeyAgreementConnection> unused;
+ synchronized (lock) {
+ unused = new ArrayList<>(results);
+ results.clear();
+ stopped = true;
+ lock.notifyAll();
+ }
+ if (LOG.isLoggable(INFO))
+ LOG.info("Closing " + unused.size() + " unused connections");
+ for (KeyAgreementConnection c : unused) tryToClose(c.getConnection());
+ }
+
+ private void addResult(KeyAgreementConnection c) {
+ if (LOG.isLoggable(INFO))
+ LOG.info("Got connection for " + c.getTransportId());
+ boolean close = false;
+ synchronized (lock) {
+ if (stopped) {
+ close = true;
+ } else {
+ results.add(c);
+ lock.notifyAll();
+ }
+ }
+ if (close) {
+ LOG.info("Already stopped");
+ tryToClose(c.getConnection());
+ }
+ }
+
+ private void tryToClose(DuplexTransportConnection conn) {
+ try {
+ conn.getReader().dispose(false, true);
+ conn.getWriter().dispose(false);
+ } catch (IOException e) {
+ if (LOG.isLoggable(INFO)) LOG.info(e.toString());
+ }
+ }
+}
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementConnector.java b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementConnector.java
index 89bf01ee0d8fd0d88cbb8b4c14103b5b752d1ed0..079b9225317c4a8107d735685f0b02cbabdfe891 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementConnector.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementConnector.java
@@ -13,23 +13,19 @@ import org.briarproject.bramble.api.plugin.PluginManager;
import org.briarproject.bramble.api.plugin.TransportId;
import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
-import org.briarproject.bramble.api.system.Clock;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.Future;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
import javax.annotation.Nullable;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static org.briarproject.bramble.api.keyagreement.KeyAgreementConstants.CONNECTION_TIMEOUT;
@@ -45,29 +41,27 @@ class KeyAgreementConnector {
Logger.getLogger(KeyAgreementConnector.class.getName());
private final Callbacks callbacks;
- private final Clock clock;
private final KeyAgreementCrypto keyAgreementCrypto;
private final PluginManager pluginManager;
- private final CompletionService<KeyAgreementConnection> connect;
+ private final ConnectionChooser connectionChooser;
- private final List<KeyAgreementListener> listeners = new ArrayList<>();
- private final List<Future<KeyAgreementConnection>> pending =
- new ArrayList<>();
+ private final List<KeyAgreementListener> listeners =
+ new CopyOnWriteArrayList<>();
+ private final CountDownLatch aliceLatch = new CountDownLatch(1);
+ private final AtomicBoolean waitingSent = new AtomicBoolean(false);
- private volatile boolean connecting = false;
- private volatile boolean alice = false;
+ private volatile boolean alice = false, stopped = false;
- KeyAgreementConnector(Callbacks callbacks, Clock clock,
+ KeyAgreementConnector(Callbacks callbacks,
KeyAgreementCrypto keyAgreementCrypto, PluginManager pluginManager,
- Executor ioExecutor) {
+ ConnectionChooser connectionChooser) {
this.callbacks = callbacks;
- this.clock = clock;
this.keyAgreementCrypto = keyAgreementCrypto;
this.pluginManager = pluginManager;
- connect = new ExecutorCompletionService<>(ioExecutor);
+ this.connectionChooser = connectionChooser;
}
- public Payload listen(KeyPair localKeyPair) {
+ Payload listen(KeyPair localKeyPair) {
LOG.info("Starting BQP listeners");
// Derive commitment
byte[] commitment = keyAgreementCrypto.deriveKeyCommitment(
@@ -80,8 +74,9 @@ class KeyAgreementConnector {
if (l != null) {
TransportId id = plugin.getId();
descriptors.add(new TransportDescriptor(id, l.getDescriptor()));
- pending.add(connect.submit(new ReadableTask(l.listen())));
+ if (LOG.isLoggable(INFO)) LOG.info("Listening via " + id);
listeners.add(l);
+ connectionChooser.submit(new ReadableTask(l::accept));
}
}
return new Payload(commitment, descriptors);
@@ -89,125 +84,92 @@ class KeyAgreementConnector {
void stopListening() {
LOG.info("Stopping BQP listeners");
- for (KeyAgreementListener l : listeners) {
- l.close();
- }
- listeners.clear();
+ stopped = true;
+ aliceLatch.countDown();
+ for (KeyAgreementListener l : listeners) l.close();
+ connectionChooser.stop();
}
@Nullable
- public KeyAgreementTransport connect(Payload remotePayload,
- boolean alice) {
- // Let the listeners know if we are Alice
- this.connecting = true;
+ public KeyAgreementTransport connect(Payload remotePayload, boolean alice) {
+ // Let the ReadableTasks know if we are Alice
this.alice = alice;
- long end = clock.currentTimeMillis() + CONNECTION_TIMEOUT;
+ aliceLatch.countDown();
// Start connecting over supported transports
- LOG.info("Starting outgoing BQP connections");
+ if (LOG.isLoggable(INFO)) {
+ LOG.info("Starting outgoing BQP connections as "
+ + (alice ? "Alice" : "Bob"));
+ }
for (TransportDescriptor d : remotePayload.getTransportDescriptors()) {
Plugin p = pluginManager.getPlugin(d.getId());
if (p instanceof DuplexPlugin) {
+ if (LOG.isLoggable(INFO))
+ LOG.info("Connecting via " + d.getId());
DuplexPlugin plugin = (DuplexPlugin) p;
- pending.add(connect.submit(new ReadableTask(
- new ConnectorTask(plugin, remotePayload.getCommitment(),
- d.getDescriptor(), end))));
+ byte[] commitment = remotePayload.getCommitment();
+ BdfList descriptor = d.getDescriptor();
+ connectionChooser.submit(new ReadableTask(
+ new ConnectorTask(plugin, commitment, descriptor)));
}
}
// Get chosen connection
- KeyAgreementConnection chosen = null;
try {
- long now = clock.currentTimeMillis();
- Future<KeyAgreementConnection> f =
- connect.poll(end - now, MILLISECONDS);
- if (f == null)
- return null; // No task completed within the timeout.
- chosen = f.get();
+ KeyAgreementConnection chosen =
+ connectionChooser.poll(CONNECTION_TIMEOUT);
+ if (chosen == null) return null;
return new KeyAgreementTransport(chosen);
} catch (InterruptedException e) {
LOG.info("Interrupted while waiting for connection");
Thread.currentThread().interrupt();
return null;
- } catch (ExecutionException | IOException e) {
+ } catch (IOException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
return null;
} finally {
stopListening();
- // Close all other connections
- closePending(chosen);
- }
- }
-
- private void closePending(@Nullable KeyAgreementConnection chosen) {
- for (Future<KeyAgreementConnection> f : pending) {
- try {
- if (f.cancel(true)) {
- LOG.info("Cancelled task");
- } else if (!f.isCancelled()) {
- KeyAgreementConnection c = f.get();
- if (c != null && c != chosen)
- tryToClose(c.getConnection(), false);
- }
- } catch (InterruptedException e) {
- LOG.info("Interrupted while closing sockets");
- Thread.currentThread().interrupt();
- return;
- } catch (ExecutionException e) {
- if (LOG.isLoggable(INFO)) LOG.info(e.toString());
- }
}
}
- private void tryToClose(DuplexTransportConnection conn, boolean exception) {
- try {
- if (LOG.isLoggable(INFO))
- LOG.info("Closing connection, exception: " + exception);
- conn.getReader().dispose(exception, true);
- conn.getWriter().dispose(exception);
- } catch (IOException e) {
- if (LOG.isLoggable(INFO)) LOG.info(e.toString());
- }
+ private void waitingForAlice() {
+ if (!waitingSent.getAndSet(true)) callbacks.connectionWaiting();
}
private class ConnectorTask implements Callable<KeyAgreementConnection> {
private final byte[] commitment;
private final BdfList descriptor;
- private final long end;
private final DuplexPlugin plugin;
private ConnectorTask(DuplexPlugin plugin, byte[] commitment,
- BdfList descriptor, long end) {
+ BdfList descriptor) {
this.plugin = plugin;
this.commitment = commitment;
this.descriptor = descriptor;
- this.end = end;
}
+ @Nullable
@Override
public KeyAgreementConnection call() throws Exception {
- // Repeat attempts until we connect, get interrupted, or time out
- while (true) {
- long now = clock.currentTimeMillis();
- if (now > end) throw new IOException();
+ // Repeat attempts until we connect, get stopped, or get interrupted
+ while (!stopped) {
DuplexTransportConnection conn =
plugin.createKeyAgreementConnection(commitment,
- descriptor, end - now);
+ descriptor);
if (conn != null) {
if (LOG.isLoggable(INFO))
- LOG.info(plugin.getId().getString() +
- ": Outgoing connection");
+ LOG.info(plugin.getId() + ": Outgoing connection");
return new KeyAgreementConnection(conn, plugin.getId());
}
// Wait 2s before retry (to circumvent transient failures)
Thread.sleep(2000);
}
+ return null;
}
}
- private class ReadableTask
- implements Callable<KeyAgreementConnection> {
+ private class ReadableTask implements Callable<KeyAgreementConnection> {
private final Callable<KeyAgreementConnection> connectionTask;
@@ -215,24 +177,23 @@ class KeyAgreementConnector {
this.connectionTask = connectionTask;
}
+ @Nullable
@Override
public KeyAgreementConnection call() throws Exception {
KeyAgreementConnection c = connectionTask.call();
+ if (c == null) return null;
+ aliceLatch.await();
+ if (alice || stopped) return c;
+ // Bob waits here for Alice to scan his QR code, determine her
+ // role, and send her key
InputStream in = c.getConnection().getReader().getInputStream();
- boolean waitingSent = false;
- while (!alice && in.available() == 0) {
- if (!waitingSent && connecting && !alice) {
- // Bob waits here until Alice obtains his payload.
- callbacks.connectionWaiting();
- waitingSent = true;
- }
- if (LOG.isLoggable(INFO)) {
- LOG.info(c.getTransportId().getString() +
- ": Waiting for connection");
- }
- Thread.sleep(1000);
+ while (!stopped && in.available() == 0) {
+ if (LOG.isLoggable(INFO))
+ LOG.info(c.getTransportId() + ": Waiting for data");
+ waitingForAlice();
+ Thread.sleep(500);
}
- if (!alice && LOG.isLoggable(INFO))
+ if (!stopped && LOG.isLoggable(INFO))
LOG.info(c.getTransportId().getString() + ": Data available");
return c;
}
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementModule.java b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementModule.java
index e7ec82dabb1b8b010c73e5188ef00f8d536714d3..819832820bf2f10de655d6179e22662bf9ccb422 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementModule.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementModule.java
@@ -27,4 +27,10 @@ public class KeyAgreementModule {
PayloadParser providePayloadParser(BdfReaderFactory bdfReaderFactory) {
return new PayloadParserImpl(bdfReaderFactory);
}
+
+ @Provides
+ ConnectionChooser provideConnectionChooser(
+ ConnectionChooserImpl connectionChooser) {
+ return connectionChooser;
+ }
}
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementProtocol.java b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementProtocol.java
index ab5ea4f921ea361774d3b65395a8cc4f90503480..5825c95005019b95841df93db55504a5341438f2 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementProtocol.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementProtocol.java
@@ -99,7 +99,8 @@ class KeyAgreementProtocol {
PublicKey theirPublicKey;
if (alice) {
sendKey();
- // Alice waits here until Bob obtains her payload.
+ // Alice waits here for Bob to scan her QR code, determine his
+ // role, receive her key and respond with his key
callbacks.connectionWaiting();
theirPublicKey = receiveKey();
} else {
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementTaskImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementTaskImpl.java
index e0d97313dc9ed6b1e8dc76427b1ea76502ebf50e..f5dfa0dc1b53e2497fd7cd551ef204959a56661e 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementTaskImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementTaskImpl.java
@@ -15,14 +15,11 @@ import org.briarproject.bramble.api.keyagreement.event.KeyAgreementFinishedEvent
import org.briarproject.bramble.api.keyagreement.event.KeyAgreementListeningEvent;
import org.briarproject.bramble.api.keyagreement.event.KeyAgreementStartedEvent;
import org.briarproject.bramble.api.keyagreement.event.KeyAgreementWaitingEvent;
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
import org.briarproject.bramble.api.plugin.PluginManager;
-import org.briarproject.bramble.api.system.Clock;
import java.io.IOException;
-import java.util.concurrent.Executor;
import java.util.logging.Logger;
import javax.inject.Inject;
@@ -31,9 +28,8 @@ import static java.util.logging.Level.WARNING;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
-class KeyAgreementTaskImpl extends Thread implements
- KeyAgreementTask, KeyAgreementConnector.Callbacks,
- KeyAgreementProtocol.Callbacks {
+class KeyAgreementTaskImpl extends Thread implements KeyAgreementTask,
+ KeyAgreementProtocol.Callbacks, KeyAgreementConnector.Callbacks {
private static final Logger LOG =
Logger.getLogger(KeyAgreementTaskImpl.class.getName());
@@ -49,17 +45,17 @@ class KeyAgreementTaskImpl extends Thread implements
private Payload remotePayload;
@Inject
- KeyAgreementTaskImpl(Clock clock, CryptoComponent crypto,
+ KeyAgreementTaskImpl(CryptoComponent crypto,
KeyAgreementCrypto keyAgreementCrypto, EventBus eventBus,
PayloadEncoder payloadEncoder, PluginManager pluginManager,
- @IoExecutor Executor ioExecutor) {
+ ConnectionChooser connectionChooser) {
this.crypto = crypto;
this.keyAgreementCrypto = keyAgreementCrypto;
this.eventBus = eventBus;
this.payloadEncoder = payloadEncoder;
localKeyPair = crypto.generateAgreementKeyPair();
- connector = new KeyAgreementConnector(this, clock, keyAgreementCrypto,
- pluginManager, ioExecutor);
+ connector = new KeyAgreementConnector(this, keyAgreementCrypto,
+ pluginManager, connectionChooser);
}
@Override
@@ -73,10 +69,8 @@ class KeyAgreementTaskImpl extends Thread implements
@Override
public synchronized void stopListening() {
if (localPayload != null) {
- if (remotePayload == null)
- connector.stopListening();
- else
- interrupt();
+ if (remotePayload == null) connector.stopListening();
+ else interrupt();
}
}
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java
index ce43261a40d3c0eba7c54c2b3980f0aa132878f7..8c9ed0646d1edc4840dc518f7ce3d4dbf050e2d9 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java
@@ -28,7 +28,6 @@ import java.util.Collection;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
-import java.util.concurrent.Callable;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
@@ -343,7 +342,7 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
@Override
public DuplexTransportConnection createKeyAgreementConnection(
- byte[] commitment, BdfList descriptor, long timeout) {
+ byte[] commitment, BdfList descriptor) {
if (!isRunning()) return null;
String address;
try {
@@ -406,13 +405,10 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
}
@Override
- public Callable<KeyAgreementConnection> listen() {
- return () -> {
- DuplexTransportConnection conn = acceptConnection(ss);
- if (LOG.isLoggable(INFO))
- LOG.info(ID.getString() + ": Incoming connection");
- return new KeyAgreementConnection(conn, ID);
- };
+ public KeyAgreementConnection accept() throws IOException {
+ DuplexTransportConnection conn = acceptConnection(ss);
+ if (LOG.isLoggable(INFO)) LOG.info(ID + ": Incoming connection");
+ return new KeyAgreementConnection(conn, ID);
}
@Override
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPlugin.java
index 37c5935f949f4199b5e977728ca4cb8492171a2e..450367381a4562ebfd0d590fc1c67c5ffc7dd0df 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPlugin.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPlugin.java
@@ -25,7 +25,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import java.util.concurrent.Callable;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
@@ -224,7 +223,7 @@ class LanTcpPlugin extends TcpPlugin {
@Override
public DuplexTransportConnection createKeyAgreementConnection(
- byte[] commitment, BdfList descriptor, long timeout) {
+ byte[] commitment, BdfList descriptor) {
if (!isRunning()) return null;
InetSocketAddress remote;
try {
@@ -283,14 +282,11 @@ class LanTcpPlugin extends TcpPlugin {
}
@Override
- public Callable<KeyAgreementConnection> listen() {
- return () -> {
- Socket s = ss.accept();
- if (LOG.isLoggable(INFO))
- LOG.info(ID.getString() + ": Incoming connection");
- return new KeyAgreementConnection(
- new TcpTransportConnection(LanTcpPlugin.this, s), ID);
- };
+ public KeyAgreementConnection accept() throws IOException {
+ Socket s = ss.accept();
+ if (LOG.isLoggable(INFO)) LOG.info(ID + ": Incoming connection");
+ return new KeyAgreementConnection(new TcpTransportConnection(
+ LanTcpPlugin.this, s), ID);
}
@Override
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java
index af6922793ce3103f1fb0dd0359f986aeebec02bb..9b686fc86d6571f2854389eee4ba72c3b743781b 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java
@@ -297,7 +297,7 @@ abstract class TcpPlugin implements DuplexPlugin {
@Override
public DuplexTransportConnection createKeyAgreementConnection(
- byte[] commitment, BdfList descriptor, long timeout) {
+ byte[] commitment, BdfList descriptor) {
throw new UnsupportedOperationException();
}
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginTest.java b/bramble-core/src/test/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginTest.java
index ede3df810f2c646728e9f23715e5d53723d5e7b5..b5449ed3461739bf159f16ded0e5ce3afdd3055d 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginTest.java
@@ -2,7 +2,6 @@ package org.briarproject.bramble.plugin.tcp;
import org.briarproject.bramble.api.contact.ContactId;
import org.briarproject.bramble.api.data.BdfList;
-import org.briarproject.bramble.api.keyagreement.KeyAgreementConnection;
import org.briarproject.bramble.api.keyagreement.KeyAgreementListener;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.plugin.Backoff;
@@ -26,11 +25,9 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.Hashtable;
import java.util.Map;
-import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
-import java.util.concurrent.FutureTask;
import java.util.concurrent.atomic.AtomicBoolean;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -195,9 +192,16 @@ public class LanTcpPluginTest extends BrambleTestCase {
KeyAgreementListener kal =
plugin.createKeyAgreementListener(new byte[COMMIT_LENGTH]);
assertNotNull(kal);
- Callable<KeyAgreementConnection> c = kal.listen();
- FutureTask<KeyAgreementConnection> f = new FutureTask<>(c);
- new Thread(f).start();
+ CountDownLatch latch = new CountDownLatch(1);
+ AtomicBoolean error = new AtomicBoolean(false);
+ new Thread(() -> {
+ try {
+ kal.accept();
+ latch.countDown();
+ } catch (IOException e) {
+ error.set(true);
+ }
+ }).start();
// The plugin should have bound a socket and stored the port number
BdfList descriptor = kal.getDescriptor();
assertEquals(3, descriptor.size());
@@ -213,10 +217,12 @@ public class LanTcpPluginTest extends BrambleTestCase {
InetSocketAddress socketAddr = new InetSocketAddress(addr, port);
Socket s = new Socket();
s.connect(socketAddr, 100);
- assertNotNull(f.get(5, SECONDS));
+ // Check that the connection was accepted
+ assertTrue(latch.await(5, SECONDS));
+ assertFalse(error.get());
+ // Clean up
s.close();
kal.close();
- // Stop the plugin
plugin.stop();
}
@@ -262,7 +268,7 @@ public class LanTcpPluginTest extends BrambleTestCase {
descriptor.add(local.getPort());
// Connect to the port
DuplexTransportConnection d = plugin.createKeyAgreementConnection(
- new byte[COMMIT_LENGTH], descriptor, 5000);
+ new byte[COMMIT_LENGTH], descriptor);
assertNotNull(d);
// Check that the connection was accepted
assertTrue(latch.await(5, SECONDS));
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java b/bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java
index 269e7feacdc23c679eb4be3ececf693dc7a33577..340b27c8ee66e02c7946ea889f062e5af6cc57df 100644
--- a/bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java
+++ b/bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java
@@ -177,7 +177,7 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback {
@Override
public DuplexTransportConnection createKeyAgreementConnection(
- byte[] commitment, BdfList descriptor, long timeout) {
+ byte[] commitment, BdfList descriptor) {
throw new UnsupportedOperationException();
}