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

Made the invitation protocol symmetrical.

Browse Source 
Both devices try to make outgoing connections and accept incoming
connections simultaneously. This should lead to faster connection
establishment when there are asymmetrical connectivity problems, such as
devices that are unable to receive LAN multicast packets or make
themselves discoverable via Bluetooth.
This commit is contained in:
akwizgran
2013-06-13 12:53:44 +01:00
parent bebaf4f84b
commit e1ec17f4b6
13 changed files with 52 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
briar-api/src/net/sf/briar/api/plugins/duplex/DuplexPlugin.java
View File

@@ -18,14 +18,10 @@ public interface DuplexPlugin extends Plugin {
boolean supportsInvitations();
/**
* Starts the invitation process from the inviter's side. Returns null if
* no connection can be established within the given timeout.
* Attempts to create and return an invitation connection to the remote
* peer. Returns null if no connection can be established within the given
* time.
*/
DuplexTransportConnection sendInvitation(PseudoRandom r, long timeout);
/**
* Starts the invitation process from the invitee's side. Returns null if
* no connection can be established within the given timeout.
*/
DuplexTransportConnection acceptInvitation(PseudoRandom r, long timeout);
DuplexTransportConnection createInvitationConnection(PseudoRandom r,
long timeout);
}

10
briar-core/src/net/sf/briar/invitation/AliceConnector.java
View File

@@ -2,7 +2,6 @@ package net.sf.briar.invitation;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.api.invitation.InvitationConstants.CONNECTION_TIMEOUT;
import java.io.IOException;
import java.io.InputStream;
@@ -57,13 +56,8 @@ class AliceConnector extends Connector {
@Override
public void run() {
// Try an outgoing connection first, then an incoming connection
long halfTime = clock.currentTimeMillis() + CONNECTION_TIMEOUT;
DuplexTransportConnection conn = makeOutgoingConnection();
if(conn == null) {
waitForHalfTime(halfTime);
conn = acceptIncomingConnection();
}
// Create an incoming or outgoing connection
DuplexTransportConnection conn = createInvitationConnection();
if(conn == null) return;
if(LOG.isLoggable(INFO)) LOG.info(pluginName + " connected");
// Don't proceed with more than one connection

10
briar-core/src/net/sf/briar/invitation/BobConnector.java
View File

@@ -2,7 +2,6 @@ package net.sf.briar.invitation;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.api.invitation.InvitationConstants.CONNECTION_TIMEOUT;
import java.io.IOException;
import java.io.InputStream;
@@ -57,13 +56,8 @@ class BobConnector extends Connector {
@Override
public void run() {
// Try an incoming connection first, then an outgoing connection
long halfTime = clock.currentTimeMillis() + CONNECTION_TIMEOUT;
DuplexTransportConnection conn = acceptIncomingConnection();
if(conn == null) {
waitForHalfTime(halfTime);
conn = makeOutgoingConnection();
}
// Create an incoming or outgoing connection
DuplexTransportConnection conn = createInvitationConnection();
if(conn == null) return;
if(LOG.isLoggable(INFO)) LOG.info(pluginName + " connected");
// Carry out the key agreement protocol

27
briar-core/src/net/sf/briar/invitation/Connector.java
View File

@@ -112,31 +112,10 @@ abstract class Connector extends Thread {
messageDigest = crypto.getMessageDigest();
}
protected DuplexTransportConnection acceptIncomingConnection() {
protected DuplexTransportConnection createInvitationConnection() {
if(LOG.isLoggable(INFO))
LOG.info(pluginName + " accepting incoming connection");
return plugin.acceptInvitation(random, CONNECTION_TIMEOUT);
}
protected DuplexTransportConnection makeOutgoingConnection() {
if(LOG.isLoggable(INFO))
LOG.info(pluginName + " making outgoing connection");
return plugin.sendInvitation(random, CONNECTION_TIMEOUT);
}
protected void waitForHalfTime(long halfTime) {
long now = clock.currentTimeMillis();
if(now < halfTime) {
if(LOG.isLoggable(INFO))
LOG.info(pluginName + " sleeping until half-time");
try {
clock.sleep(halfTime - now);
} catch(InterruptedException e) {
if(LOG.isLoggable(INFO)) LOG.info("Interrupted while sleeping");
Thread.currentThread().interrupt();
return;
}
}
LOG.info(pluginName + " creating invitation connection");
return plugin.createInvitationConnection(random, CONNECTION_TIMEOUT);
}
protected void sendPublicKeyHash(Writer w) throws IOException {

42
briar-core/src/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
View File

@@ -166,13 +166,15 @@ class BluetoothPlugin implements DuplexPlugin {
tryToClose(ss);
return;
}
BluetoothTransportConnection conn =
new BluetoothTransportConnection(this, s);
callback.incomingConnectionCreated(conn);
callback.incomingConnectionCreated(wrapSocket(s));
if(!running) return;
}
}
private DuplexTransportConnection wrapSocket(StreamConnection s) {
return new BluetoothTransportConnection(this, s);
}
public void stop() {
running = false;
tryToClose(socket);
@@ -202,11 +204,8 @@ class BluetoothPlugin implements DuplexPlugin {
public void run() {
if(!running) return;
StreamConnection s = connect(makeUrl(address, uuid));
if(s != null) {
callback.outgoingConnectionCreated(c,
new BluetoothTransportConnection(
BluetoothPlugin.this, s));
}
if(s != null)
callback.outgoingConnectionCreated(c, wrapSocket(s));
}
});
}
@@ -239,7 +238,7 @@ class BluetoothPlugin implements DuplexPlugin {
return true;
}
public DuplexTransportConnection sendInvitation(PseudoRandom r,
public DuplexTransportConnection createInvitationConnection(PseudoRandom r,
long timeout) {
if(!running) return null;
// Use the invitation codes to generate the UUID
@@ -282,7 +281,6 @@ class BluetoothPlugin implements DuplexPlugin {
private void makeDeviceDiscoverable() {
// Try to make the device discoverable (requires root on Linux)
if(!running) return;
try {
localDevice.setDiscoverable(GIAC);
} catch(BluetoothStateException e) {
@@ -290,12 +288,6 @@ class BluetoothPlugin implements DuplexPlugin {
}
}
public DuplexTransportConnection acceptInvitation(PseudoRandom r,
long timeout) {
// FIXME
return sendInvitation(r, timeout);
}
private class DiscoveryThread extends Thread {
private final LatchedReference<StreamConnection> socketLatch;
@@ -325,18 +317,16 @@ class BluetoothPlugin implements DuplexPlugin {
new InvitationListener(discoveryAgent, uuid);
discoveryAgent.startInquiry(GIAC, listener);
String url = listener.waitForUrl();
if(url != null) {
StreamConnection s = connect(url);
if(s == null) return;
if(url == null) continue;
StreamConnection s = connect(url);
if(s == null) continue;
if(LOG.isLoggable(INFO)) LOG.info("Outgoing connection");
if(!socketLatch.set(s)) {
if(LOG.isLoggable(INFO))
LOG.info("Outgoing connection");
if(!socketLatch.set(s)) {
if(LOG.isLoggable(INFO))
LOG.info("Closing redundant connection");
tryToClose(s);
}
return;
LOG.info("Closing redundant connection");
tryToClose(s);
}
return;
} catch(BluetoothStateException e) {
if(LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e);

23
briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java
View File

@@ -217,13 +217,15 @@ class DroidtoothPlugin implements DuplexPlugin {
tryToClose(ss);
return;
}
DroidtoothTransportConnection conn =
new DroidtoothTransportConnection(this, s);
callback.incomingConnectionCreated(conn);
callback.incomingConnectionCreated(wrapSocket(s));
if(!running) return;
}
}
private DuplexTransportConnection wrapSocket(BluetoothSocket s) {
return new DroidtoothTransportConnection(this, s);
}
public void stop() {
running = false;
// Disable Bluetooth if we enabled it at startup
@@ -277,11 +279,8 @@ class DroidtoothPlugin implements DuplexPlugin {
public void run() {
if(!running) return;
BluetoothSocket s = connect(address, uuid);
if(s != null) {
callback.outgoingConnectionCreated(c,
new DroidtoothTransportConnection(
DroidtoothPlugin.this, s));
}
if(s != null)
callback.outgoingConnectionCreated(c, wrapSocket(s));
}
});
}
@@ -343,7 +342,7 @@ class DroidtoothPlugin implements DuplexPlugin {
return true;
}
public DuplexTransportConnection sendInvitation(PseudoRandom r,
public DuplexTransportConnection createInvitationConnection(PseudoRandom r,
long timeout) {
if(!running) return null;
// Use the invitation codes to generate the UUID
@@ -379,12 +378,6 @@ class DroidtoothPlugin implements DuplexPlugin {
return null;
}
public DuplexTransportConnection acceptInvitation(PseudoRandom r,
long timeout) {
// FIXME
return sendInvitation(r, timeout);
}
private static class BluetoothStateReceiver extends BroadcastReceiver {
private final CountDownLatch finished = new CountDownLatch(1);

7
briar-core/src/net/sf/briar/plugins/modem/ModemPlugin.java
View File

@@ -219,12 +219,7 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback {
return false;
}
public DuplexTransportConnection sendInvitation(PseudoRandom r,
long timeout) {
throw new UnsupportedOperationException();
}
public DuplexTransportConnection acceptInvitation(PseudoRandom r,
public DuplexTransportConnection createInvitationConnection(PseudoRandom r,
long timeout) {
throw new UnsupportedOperationException();
}

19
briar-core/src/net/sf/briar/plugins/tcp/DroidLanTcpPlugin.java
View File

@@ -25,7 +25,7 @@ class DroidLanTcpPlugin extends LanTcpPlugin {
}
@Override
public DuplexTransportConnection sendInvitation(PseudoRandom r,
public DuplexTransportConnection createInvitationConnection(PseudoRandom r,
long timeout) {
WifiManager wifi =
(WifiManager) appContext.getSystemService(WIFI_SERVICE);
@@ -33,22 +33,7 @@ class DroidLanTcpPlugin extends LanTcpPlugin {
MulticastLock lock = wifi.createMulticastLock("invitation");
lock.acquire();
try {
return super.sendInvitation(r, timeout);
} finally {
lock.release();
}
}
@Override
public DuplexTransportConnection acceptInvitation(PseudoRandom r,
long timeout) {
WifiManager wifi =
(WifiManager) appContext.getSystemService(WIFI_SERVICE);
if(wifi == null || !wifi.isWifiEnabled()) return null;
MulticastLock lock = wifi.createMulticastLock("invitation");
lock.acquire();
try {
return super.acceptInvitation(r, timeout);
return super.createInvitationConnection(r, timeout);
} finally {
lock.release();
}

8
briar-core/src/net/sf/briar/plugins/tcp/LanTcpPlugin.java
View File

@@ -119,7 +119,7 @@ class LanTcpPlugin extends TcpPlugin {
return true;
}
public DuplexTransportConnection sendInvitation(PseudoRandom r,
public DuplexTransportConnection createInvitationConnection(PseudoRandom r,
long timeout) {
if(!running) return null;
// Use the invitation codes to generate the group address and port
@@ -244,12 +244,6 @@ class LanTcpPlugin extends TcpPlugin {
ms.close();
}
public DuplexTransportConnection acceptInvitation(PseudoRandom r,
long timeout) {
// FIXME
return sendInvitation(r, timeout);
}
private class MulticastListenerThread extends Thread {
private final LatchedReference<Socket> socketLatch;

7
briar-core/src/net/sf/briar/plugins/tcp/WanTcpPlugin.java
View File

@@ -125,12 +125,7 @@ class WanTcpPlugin extends TcpPlugin {
return false;
}
public DuplexTransportConnection sendInvitation(PseudoRandom r,
long timeout) {
throw new UnsupportedOperationException();
}
public DuplexTransportConnection acceptInvitation(PseudoRandom r,
public DuplexTransportConnection createInvitationConnection(PseudoRandom r,
long timeout) {
throw new UnsupportedOperationException();
}

7
briar-core/src/net/sf/briar/plugins/tor/TorPlugin.java
View File

@@ -513,12 +513,7 @@ class TorPlugin implements DuplexPlugin, EventHandler {
return false;
}
public DuplexTransportConnection sendInvitation(PseudoRandom r,
long timeout) {
throw new UnsupportedOperationException();
}
public DuplexTransportConnection acceptInvitation(PseudoRandom r,
public DuplexTransportConnection createInvitationConnection(PseudoRandom r,
long timeout) {
throw new UnsupportedOperationException();
}

21
briar-tests/src/net/sf/briar/plugins/DuplexClientTest.java
View File

@@ -8,6 +8,7 @@ import java.util.Map;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
@@ -35,23 +36,13 @@ public abstract class DuplexClientTest extends DuplexTest {
receiveChallengeSendResponse(d);
}
if(!plugin.supportsInvitations()) {
System.out.println("Skipping invitation tests");
System.out.println("Skipping invitation test");
return;
}
// Try to send an invitation
System.out.println("Sending invitation");
d = plugin.sendInvitation(getPseudoRandom(123), CONNECTION_TIMEOUT);
if(d == null) {
System.out.println("Connection failed");
return;
} else {
System.out.println("Connection created");
receiveChallengeSendResponse(d);
}
// Try to accept an invitation
System.out.println("Accepting invitation");
d = plugin.acceptInvitation(getPseudoRandom(456),
CONNECTION_TIMEOUT);
// Try to create an invitation connection
System.out.println("Creating invitation connection");
PseudoRandom r = getPseudoRandom(123);
d = plugin.createInvitationConnection(r, CONNECTION_TIMEOUT);
if(d == null) {
System.out.println("Connection failed");
return;

18
briar-tests/src/net/sf/briar/plugins/DuplexServerTest.java
View File

@@ -33,23 +33,13 @@ public abstract class DuplexServerTest extends DuplexTest {
return;
}
if(!plugin.supportsInvitations()) {
System.out.println("Skipping invitation tests");
System.out.println("Skipping invitation test");
return;
}
// Try to accept an invitation
System.out.println("Accepting invitation");
DuplexTransportConnection d = plugin.acceptInvitation(
// Try to create an invitation connection
System.out.println("Creating invitation connection");
DuplexTransportConnection d = plugin.createInvitationConnection(
getPseudoRandom(123), CONNECTION_TIMEOUT);
if(d == null) {
System.out.println("Connection failed");
return;
} else {
System.out.println("Connection created");
sendChallengeReceiveResponse(d);
}
// Try to send an invitation
System.out.println("Sending invitation");
d = plugin.sendInvitation(getPseudoRandom(456), CONNECTION_TIMEOUT);
if(d == null) {
System.out.println("Connection failed");
return;