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

Pass incoming connection handler to plugins.

Browse Source
This commit is contained in:
akwizgran
2019-05-27 15:46:33 +01:00
parent a650d812fa
commit ab90e1de04
5 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexPlugin.java
View File

@@ -3,6 +3,7 @@ package org.briarproject.bramble.api.plugin.duplex;
import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.data.BdfList;
import org.briarproject.bramble.api.keyagreement.KeyAgreementListener; import org.briarproject.bramble.api.keyagreement.KeyAgreementListener;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault; 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.plugin.Plugin;
import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.properties.TransportProperties;
import org.briarproject.bramble.api.rendezvous.KeyMaterialSource; 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 * 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);
} }

3
bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java
View File

@@ -398,7 +398,8 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
} }
@Override @Override
public RendezvousHandler createRendezvousHandler(KeyMaterialSource k) { public RendezvousHandler createRendezvousHandler(KeyMaterialSource k,
ConnectionHandler incoming) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }

3
bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java
View File

@@ -309,7 +309,8 @@ abstract class TcpPlugin implements DuplexPlugin {
} }
@Override @Override
public RendezvousHandler createRendezvousHandler(KeyMaterialSource k) { public RendezvousHandler createRendezvousHandler(KeyMaterialSource k,
ConnectionHandler incoming) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }

3
bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
View File

@@ -613,7 +613,8 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
} }
@Override @Override
public RendezvousHandler createRendezvousHandler(KeyMaterialSource k) { public RendezvousHandler createRendezvousHandler(KeyMaterialSource k,
ConnectionHandler incoming) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }

3
bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java
View File

@@ -192,7 +192,8 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback {
} }
@Override @Override
public RendezvousHandler createRendezvousHandler(KeyMaterialSource k) { public RendezvousHandler createRendezvousHandler(KeyMaterialSource k,
ConnectionHandler incoming) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }