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

Renamed ConnectionManager to ConnectionDispatcher.

Browse Source 
Because that's what it does.
This commit is contained in:
akwizgran
2014-11-05 19:47:54 +00:00
parent 4ca83842d1
commit c202b6f0ac
11 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-core/src/org/briarproject/invitation/AliceConnector.java
View File

@@ -21,7 +21,7 @@ import org.briarproject.api.crypto.PseudoRandom;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.messaging.GroupFactory;
import org.briarproject.api.plugins.ConnectionDispatcher;
import org.briarproject.api.plugins.ConnectionManager;
import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.serial.Reader;
@@ -45,14 +45,14 @@ class AliceConnector extends Connector {
StreamReaderFactory streamReaderFactory,
StreamWriterFactory streamWriterFactory,
AuthorFactory authorFactory, GroupFactory groupFactory,
KeyManager keyManager, ConnectionDispatcher connectionDispatcher,
KeyManager keyManager, ConnectionManager connectionManager,
Clock clock, boolean reuseConnection, ConnectorGroup group,
DuplexPlugin plugin, LocalAuthor localAuthor,
Map<TransportId, TransportProperties> localProps,
PseudoRandom random) {
super(crypto, db, readerFactory, writerFactory, streamReaderFactory,
streamWriterFactory, authorFactory, groupFactory,
keyManager, connectionDispatcher, clock, reuseConnection, group,
keyManager, connectionManager, clock, reuseConnection, group,
plugin, localAuthor, localProps, random);
}

6
briar-core/src/org/briarproject/invitation/BobConnector.java
View File

@@ -21,7 +21,7 @@ import org.briarproject.api.crypto.PseudoRandom;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.messaging.GroupFactory;
import org.briarproject.api.plugins.ConnectionDispatcher;
import org.briarproject.api.plugins.ConnectionManager;
import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.serial.Reader;
@@ -45,14 +45,14 @@ class BobConnector extends Connector {
StreamReaderFactory streamReaderFactory,
StreamWriterFactory streamWriterFactory,
AuthorFactory authorFactory, GroupFactory groupFactory,
KeyManager keyManager, ConnectionDispatcher connectionDispatcher,
KeyManager keyManager, ConnectionManager connectionManager,
Clock clock, boolean reuseConnection, ConnectorGroup group,
DuplexPlugin plugin, LocalAuthor localAuthor,
Map<TransportId, TransportProperties> localProps,
PseudoRandom random) {
super(crypto, db, readerFactory, writerFactory, streamReaderFactory,
streamWriterFactory, authorFactory, groupFactory,
keyManager, connectionDispatcher, clock, reuseConnection, group,
keyManager, connectionManager, clock, reuseConnection, group,
plugin, localAuthor, localProps, random);
}

12
briar-core/src/org/briarproject/invitation/Connector.java
View File

@@ -43,7 +43,7 @@ import org.briarproject.api.db.NoSuchTransportException;
import org.briarproject.api.invitation.InvitationConstants;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.GroupFactory;
import org.briarproject.api.plugins.ConnectionDispatcher;
import org.briarproject.api.plugins.ConnectionManager;
import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.serial.Reader;
@@ -69,7 +69,7 @@ abstract class Connector extends Thread {
protected final AuthorFactory authorFactory;
protected final GroupFactory groupFactory;
protected final KeyManager keyManager;
protected final ConnectionDispatcher connectionDispatcher;
protected final ConnectionManager connectionManager;
protected final Clock clock;
protected final boolean reuseConnection;
protected final ConnectorGroup group;
@@ -90,7 +90,7 @@ abstract class Connector extends Thread {
StreamReaderFactory streamReaderFactory,
StreamWriterFactory streamWriterFactory,
AuthorFactory authorFactory, GroupFactory groupFactory,
KeyManager keyManager, ConnectionDispatcher connectionDispatcher,
KeyManager keyManager, ConnectionManager connectionManager,
Clock clock, boolean reuseConnection, ConnectorGroup group,
DuplexPlugin plugin, LocalAuthor localAuthor,
Map<TransportId, TransportProperties> localProps,
@@ -105,7 +105,7 @@ abstract class Connector extends Thread {
this.authorFactory = authorFactory;
this.groupFactory = groupFactory;
this.keyManager = keyManager;
this.connectionDispatcher = connectionDispatcher;
this.connectionManager = connectionManager;
this.clock = clock;
this.reuseConnection = reuseConnection;
this.group = group;
@@ -323,8 +323,8 @@ abstract class Connector extends Thread {
if(contactId == null) throw new IllegalStateException();
TransportId t = plugin.getId();
if(alice)
connectionDispatcher.dispatchOutgoingConnection(contactId, t, conn);
else connectionDispatcher.dispatchIncomingConnection(t, conn);
connectionManager.manageOutgoingConnection(contactId, t, conn);
else connectionManager.manageIncomingConnection(t, conn);
}
private static class TransportIdComparator

12
briar-core/src/org/briarproject/invitation/ConnectorGroup.java
View File

@@ -27,7 +27,7 @@ import org.briarproject.api.invitation.InvitationListener;
import org.briarproject.api.invitation.InvitationState;
import org.briarproject.api.invitation.InvitationTask;
import org.briarproject.api.messaging.GroupFactory;
import org.briarproject.api.plugins.ConnectionDispatcher;
import org.briarproject.api.plugins.ConnectionManager;
import org.briarproject.api.plugins.PluginManager;
import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.serial.ReaderFactory;
@@ -51,7 +51,7 @@ class ConnectorGroup extends Thread implements InvitationTask {
private final AuthorFactory authorFactory;
private final GroupFactory groupFactory;
private final KeyManager keyManager;
private final ConnectionDispatcher connectionDispatcher;
private final ConnectionManager connectionManager;
private final Clock clock;
private final PluginManager pluginManager;
private final AuthorId localAuthorId;
@@ -78,7 +78,7 @@ class ConnectorGroup extends Thread implements InvitationTask {
StreamReaderFactory streamReaderFactory,
StreamWriterFactory streamWriterFactory,
AuthorFactory authorFactory, GroupFactory groupFactory,
KeyManager keyManager, ConnectionDispatcher connectionDispatcher,
KeyManager keyManager, ConnectionManager connectionManager,
Clock clock, PluginManager pluginManager, AuthorId localAuthorId,
int localInvitationCode, int remoteInvitationCode,
boolean reuseConnection) {
@@ -92,7 +92,7 @@ class ConnectorGroup extends Thread implements InvitationTask {
this.authorFactory = authorFactory;
this.groupFactory = groupFactory;
this.keyManager = keyManager;
this.connectionDispatcher = connectionDispatcher;
this.connectionManager = connectionManager;
this.clock = clock;
this.pluginManager = pluginManager;
this.localAuthorId = localAuthorId;
@@ -177,7 +177,7 @@ class ConnectorGroup extends Thread implements InvitationTask {
remoteInvitationCode);
return new AliceConnector(crypto, db, readerFactory, writerFactory,
streamReaderFactory, streamWriterFactory, authorFactory,
groupFactory, keyManager, connectionDispatcher, clock,
groupFactory, keyManager, connectionManager, clock,
reuseConnection, this, plugin, localAuthor, localProps, random);
}
@@ -188,7 +188,7 @@ class ConnectorGroup extends Thread implements InvitationTask {
localInvitationCode);
return new BobConnector(crypto, db, readerFactory, writerFactory,
streamReaderFactory, streamWriterFactory, authorFactory,
groupFactory, keyManager, connectionDispatcher, clock,
groupFactory, keyManager, connectionManager, clock,
reuseConnection, this, plugin, localAuthor, localProps, random);
}

14
briar-core/src/org/briarproject/invitation/InvitationTaskFactoryImpl.java
View File

@@ -10,7 +10,7 @@ import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.invitation.InvitationTask;
import org.briarproject.api.invitation.InvitationTaskFactory;
import org.briarproject.api.messaging.GroupFactory;
import org.briarproject.api.plugins.ConnectionDispatcher;
import org.briarproject.api.plugins.ConnectionManager;
import org.briarproject.api.plugins.PluginManager;
import org.briarproject.api.serial.ReaderFactory;
import org.briarproject.api.serial.WriterFactory;
@@ -29,7 +29,7 @@ class InvitationTaskFactoryImpl implements InvitationTaskFactory {
private final AuthorFactory authorFactory;
private final GroupFactory groupFactory;
private final KeyManager keyManager;
private final ConnectionDispatcher connectionDispatcher;
private final ConnectionManager connectionManager;
private final Clock clock;
private final PluginManager pluginManager;
@@ -39,7 +39,7 @@ class InvitationTaskFactoryImpl implements InvitationTaskFactory {
StreamReaderFactory streamReaderFactory,
StreamWriterFactory streamWriterFactory,
AuthorFactory authorFactory, GroupFactory groupFactory,
KeyManager keyManager, ConnectionDispatcher connectionDispatcher,
KeyManager keyManager, ConnectionManager connectionManager,
Clock clock, PluginManager pluginManager) {
this.crypto = crypto;
this.db = db;
@@ -50,7 +50,7 @@ class InvitationTaskFactoryImpl implements InvitationTaskFactory {
this.authorFactory = authorFactory;
this.groupFactory = groupFactory;
this.keyManager = keyManager;
this.connectionDispatcher = connectionDispatcher;
this.connectionManager = connectionManager;
this.clock = clock;
this.pluginManager = pluginManager;
}
@@ -58,9 +58,9 @@ class InvitationTaskFactoryImpl implements InvitationTaskFactory {
public InvitationTask createTask(AuthorId localAuthorId, int localCode,
int remoteCode, boolean reuseConnection) {
return new ConnectorGroup(crypto, db, readerFactory, writerFactory,
streamReaderFactory, streamWriterFactory,
authorFactory, groupFactory, keyManager, connectionDispatcher,
clock, pluginManager, localAuthorId, localCode, remoteCode,
streamReaderFactory, streamWriterFactory, authorFactory,
groupFactory, keyManager, connectionManager, clock,
pluginManager, localAuthorId, localCode, remoteCode,
reuseConnection);
}
}