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

Additional logging in In/out DuplexSyncConnection

Browse Source
This commit is contained in:
ameba23
2021-04-27 13:06:55 +02:00
parent 7ecd952f49
commit 68f135adad
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingDuplexSyncConnection.java
View File

@@ -50,6 +50,7 @@ class IncomingDuplexSyncConnection extends DuplexSyncConnection
@Override @Override
public void run() { public void run() {
LOG.info("Running IncomingDuplexSyncConnection");
// Read and recognise the tag // Read and recognise the tag
StreamContext ctx = recogniseTag(reader, transportId); StreamContext ctx = recogniseTag(reader, transportId);
if (ctx == null) { if (ctx == null) {
@@ -127,6 +128,7 @@ class IncomingDuplexSyncConnection extends DuplexSyncConnection
} }
private boolean performHandshake(StreamContext ctxIn, ContactId contactId) { private boolean performHandshake(StreamContext ctxIn, ContactId contactId) {
LOG.info("Performing handshake (Incoming)");
// Allocate the outgoing stream context // Allocate the outgoing stream context
StreamContext ctxOut = StreamContext ctxOut =
allocateStreamContext(contactId, transportId); allocateStreamContext(contactId, transportId);
@@ -146,6 +148,7 @@ class IncomingDuplexSyncConnection extends DuplexSyncConnection
handshakeManager.handshake(contactId, in, out); handshakeManager.handshake(contactId, in, out);
keyManager.addRotationKeys(contactId, result.getMasterKey(), keyManager.addRotationKeys(contactId, result.getMasterKey(),
TIMESTAMP, result.isAlice(), true); TIMESTAMP, result.isAlice(), true);
LOG.info("Rotation keys added");
return true; return true;
} catch (IOException | DbException e) { } catch (IOException | DbException e) {
logException(LOG, WARNING, e); logException(LOG, WARNING, e);

3
bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingDuplexSyncConnection.java
View File

@@ -61,6 +61,7 @@ class OutgoingDuplexSyncConnection extends DuplexSyncConnection
@Override @Override
public void run() { public void run() {
LOG.info("Running OutgoingDuplexSyncConnection");
// Allocate a stream context // Allocate a stream context
StreamContext ctx = allocateStreamContext(contactId, transportId); StreamContext ctx = allocateStreamContext(contactId, transportId);
if (ctx == null) { if (ctx == null) {
@@ -153,6 +154,7 @@ class OutgoingDuplexSyncConnection extends DuplexSyncConnection
} }
private boolean performHandshake(StreamContext ctxOut) { private boolean performHandshake(StreamContext ctxOut) {
LOG.info("Performing handshake (Outgoing)");
// Flush the output stream to send the outgoing stream header // Flush the output stream to send the outgoing stream header
StreamWriter out; StreamWriter out;
try { try {
@@ -193,6 +195,7 @@ class OutgoingDuplexSyncConnection extends DuplexSyncConnection
handshakeManager.handshake(contactId, in, out); handshakeManager.handshake(contactId, in, out);
keyManager.addRotationKeys(contactId, result.getMasterKey(), keyManager.addRotationKeys(contactId, result.getMasterKey(),
TIMESTAMP, result.isAlice(), true); TIMESTAMP, result.isAlice(), true);
LOG.info("Rotation keys added");
return true; return true;
} catch (IOException | DbException e) { } catch (IOException | DbException e) {
logException(LOG, WARNING, e); logException(LOG, WARNING, e);