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

Register outgoing duplex connection after reading tag.

Browse Source 
This prevents the connection from being registered until the contact responds, which ensures we're actually connected to the contact.
This commit is contained in:
akwizgran
2016-04-06 09:51:57 +01:00
parent 4e3835d2fe
commit d5bf7194f6
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
briar-core/src/org/briarproject/plugins/ConnectionManagerImpl.java
View File

@@ -191,7 +191,7 @@ class ConnectionManagerImpl implements ConnectionManager {
}
if (ctx == null) {
LOG.warning("Could not allocate stream context");
disposeWriter(false);
disposeWriter(true);
return;
}
connectionRegistry.registerConnection(contactId, transportId);
@@ -286,7 +286,7 @@ class ConnectionManagerImpl implements ConnectionManager {
}
if (ctx == null) {
LOG.warning("Could not allocate stream context");
disposeWriter(false);
disposeWriter(true);
return;
}
try {
@@ -351,10 +351,9 @@ class ConnectionManagerImpl implements ConnectionManager {
}
if (ctx == null) {
LOG.warning("Could not allocate stream context");
disposeWriter(false);
disposeWriter(true);
return;
}
connectionRegistry.registerConnection(contactId, transportId);
// Start the incoming session on another thread
ioExecutor.execute(new Runnable() {
public void run() {
@@ -369,8 +368,6 @@ class ConnectionManagerImpl implements ConnectionManager {
} catch (IOException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
disposeWriter(true);
} finally {
connectionRegistry.unregisterConnection(contactId, transportId);
}
}
@@ -382,17 +379,17 @@ class ConnectionManagerImpl implements ConnectionManager {
ctx = keyManager.getStreamContext(transportId, tag);
} catch (IOException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
disposeReader(true, true);
disposeReader(true, false);
return;
} catch (DbException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
disposeReader(true, true);
disposeReader(true, false);
return;
}
// Unrecognised tags are suspicious in this case
if (ctx == null) {
LOG.warning("Unrecognised tag for returning stream");
disposeReader(true, true);
disposeReader(true, false);
return;
}
// Check that the stream comes from the expected contact
@@ -401,6 +398,7 @@ class ConnectionManagerImpl implements ConnectionManager {
disposeReader(true, true);
return;
}
connectionRegistry.registerConnection(contactId, transportId);
try {
// Create and run the incoming session
incomingSession = createIncomingSession(ctx, reader);
@@ -409,6 +407,8 @@ class ConnectionManagerImpl implements ConnectionManager {
} catch (IOException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
disposeReader(true, true);
} finally {
connectionRegistry.unregisterConnection(contactId, transportId);
}
}