AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Log (and discard) duplicate outbound connections to the same peer

Browse Source
This commit is contained in:
catbref 2020-03-23 11:07:08 +00:00
parent e0f024ef5c
commit 4cb2e113cb
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/qortal/network/Handshake.java
View File

@ -62,11 +62,10 @@ public enum Handshake {
// Is this ID already connected inbound or outbound? // Is this ID already connected inbound or outbound?
Peer otherInboundPeer = Network.getInstance().getInboundPeerWithId(peerId); Peer otherInboundPeer = Network.getInstance().getInboundPeerWithId(peerId);
Peer otherOutboundPeer = Network.getInstance().getOutboundHandshakedPeerWithId(peerId);
// Extra checks on inbound peers with known IDs, to prevent ID stealing // Extra checks on inbound peers with known IDs, to prevent ID stealing
if (!peer.isOutbound() && otherInboundPeer != null) { if (!peer.isOutbound() && otherInboundPeer != null) {
Peer otherOutboundPeer = Network.getInstance().getOutboundHandshakedPeerWithId(peerId);
if (otherOutboundPeer == null) { if (otherOutboundPeer == null) {
// We already have an inbound peer with this ID, but no outgoing peer with which to request verification // We already have an inbound peer with this ID, but no outgoing peer with which to request verification
LOGGER.trace(String.format("Discarding inbound peer %s with existing ID", peer)); LOGGER.trace(String.format("Discarding inbound peer %s with existing ID", peer));
@ -86,6 +85,11 @@ public enum Handshake {
// Generate verification codes for later // Generate verification codes for later
peer.generateVerificationCodes(); peer.generateVerificationCodes();
} }
} else if (peer.isOutbound() && otherOutboundPeer != null) {
// We already have an outbound connection to this peer?
LOGGER.info(String.format("We already have another outbound connection to peer %s - discarding", peer));
// Handshake failure - caller will deal with disconnect
return null;
} else { } else {
// Set peer's ID // Set peer's ID
peer.setPeerId(peerId); peer.setPeerId(peerId);
@ -231,7 +235,7 @@ public enum Handshake {
private static void sendProof(Peer peer) { private static void sendProof(Peer peer) {
if (peer.isOutbound()) { if (peer.isOutbound()) {
// For outbound connections we need to generate real proof // For outbound connections we need to generate real proof
new Proof(peer).start(); new Proof(peer).start(); // Calculate & send in a new thread to free up networking processing
} else { } else {
// For incoming connections we only need to send a fake proof message as confirmation // For incoming connections we only need to send a fake proof message as confirmation
Message proofMessage = new ProofMessage(peer.getConnectionTimestamp(), 0, 0); Message proofMessage = new ProofMessage(peer.getConnectionTimestamp(), 0, 0);