crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Workaround for Handshaking sometimes not correctly dealing with connect-to-self.

Browse Source
This commit is contained in:
catbref 2019-10-01 13:15:21 +01:00
parent 1016d0ca16
commit 4062bdb7bb
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/qora/network/Handshake.java
View File

@ -45,14 +45,19 @@ public enum Handshake {
if (Arrays.equals(peerId, Network.getInstance().getOurPeerId())) { if (Arrays.equals(peerId, Network.getInstance().getOurPeerId())) {
// Connected to self! // Connected to self!
// If outgoing connection then record destination as self so we don't try again // If outgoing connection then record destination as self so we don't try again
if (peer.isOutbound()) if (peer.isOutbound()) {
Network.getInstance().noteToSelf(peer); Network.getInstance().noteToSelf(peer);
else
// We still need to send our ID so our outbound connection can mark their address as 'self'
sendMyId(peer);
// Handshake failure - caller will deal with disconnect // Handshake failure - caller will deal with disconnect
return null; return null;
} else {
// We still need to send our ID so our outbound connection can mark their address as 'self'
sendMyId(peer);
// We return SELF_CHECK here to prevent us from closing connection, which currently preempts
// remote end from reading any pending messages, specifically the PEER_ID message we just sent above.
// When our 'remote' outbound counterpart reads our message, they will close both connections.
// Failing that, our connection will timeout or a future handshake error will occur.
return SELF_CHECK;
}
} }
// Is this ID already connected inbound or outbound? // Is this ID already connected inbound or outbound?