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

Unregister connection if sending stream header fails.

Browse Source
This commit is contained in:
akwizgran
2019-06-04 14:20:57 +01:00
parent 0b764a01dd
commit 9ffd1ec2c2
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bramble-core/src/main/java/org/briarproject/bramble/plugin/ConnectionManagerImpl.java
View File

@@ -553,21 +553,14 @@ class ConnectionManagerImpl implements ConnectionManager {
onError(true); onError(true);
return; return;
} }
// Flush the output stream to send the outgoing stream header
StreamWriter out;
try {
out = streamWriterFactory.createStreamWriter(
writer.getOutputStream(), ctxOut);
out.getOutputStream().flush();
} catch (IOException e) {
logException(LOG, WARNING, e);
onError(true);
return;
}
// Handshake and exchange contacts // Handshake and exchange contacts
try { try {
InputStream in = streamReaderFactory.createStreamReader( InputStream in = streamReaderFactory.createStreamReader(
reader.getInputStream(), ctxIn); reader.getInputStream(), ctxIn);
// Flush the output stream to send the outgoing stream header
StreamWriter out = streamWriterFactory.createStreamWriter(
writer.getOutputStream(), ctxOut);
out.getOutputStream().flush();
HandshakeResult result = handshakeManager.handshake( HandshakeResult result = handshakeManager.handshake(
pendingContactId, in, out); pendingContactId, in, out);
Contact contact = contactExchangeManager.exchangeContacts( Contact contact = contactExchangeManager.exchangeContacts(
@@ -671,7 +664,7 @@ class ConnectionManagerImpl implements ConnectionManager {
onError(); onError();
return; return;
} }
// Create and run the handshake session // Handshake and exchange contacts
try { try {
InputStream in = streamReaderFactory.createStreamReader( InputStream in = streamReaderFactory.createStreamReader(
reader.getInputStream(), ctxIn); reader.getInputStream(), ctxIn);