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 4ce802ced..31a07c258 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 @@ -3,6 +3,7 @@ package org.briarproject.bramble.api.plugin.duplex; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.keyagreement.KeyAgreementListener; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.bramble.api.plugin.ConnectionHandler; import org.briarproject.bramble.api.plugin.Plugin; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.rendezvous.KeyMaterialSource; @@ -50,7 +51,9 @@ public interface DuplexPlugin extends Plugin { /** * Creates and returns a handler that uses the given key material to - * rendezvous with a pending contact. + * rendezvous with a pending contact and the given connection handler to + * handle incoming connections. */ - RendezvousHandler createRendezvousHandler(KeyMaterialSource k); + RendezvousHandler createRendezvousHandler(KeyMaterialSource k, + ConnectionHandler incoming); } 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 04e54027b..482f8d160 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 @@ -398,7 +398,8 @@ abstract class BluetoothPlugin implements DuplexPlugin, EventListener { } @Override - public RendezvousHandler createRendezvousHandler(KeyMaterialSource k) { + public RendezvousHandler createRendezvousHandler(KeyMaterialSource k, + ConnectionHandler incoming) { throw new UnsupportedOperationException(); } 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 5bc579487..6881637eb 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 @@ -309,7 +309,8 @@ abstract class TcpPlugin implements DuplexPlugin { } @Override - public RendezvousHandler createRendezvousHandler(KeyMaterialSource k) { + public RendezvousHandler createRendezvousHandler(KeyMaterialSource k, + ConnectionHandler incoming) { throw new UnsupportedOperationException(); } diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java index 5cfcf5db4..462e11b5d 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java @@ -613,7 +613,8 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { } @Override - public RendezvousHandler createRendezvousHandler(KeyMaterialSource k) { + public RendezvousHandler createRendezvousHandler(KeyMaterialSource k, + ConnectionHandler incoming) { throw new UnsupportedOperationException(); } diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java index 980db3af9..3c3c18eaf 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java @@ -192,7 +192,8 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback { } @Override - public RendezvousHandler createRendezvousHandler(KeyMaterialSource k) { + public RendezvousHandler createRendezvousHandler(KeyMaterialSource k, + ConnectionHandler incoming) { throw new UnsupportedOperationException(); }