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

Only add an entry to directConnectionInfo if one with this peer-signature combination doesn't already exist.

Browse Source
This commit is contained in:
CalDescent 2022-03-09 20:50:03 +00:00
parent 0418c831e6
commit 76b8ba91dd
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileListManager.java
View File

@ -483,7 +483,7 @@ public class ArbitraryDataFileListManager {
// Keep track of the source peer, for direct connections // Keep track of the source peer, for direct connections
if (arbitraryDataFileListMessage.getPeerAddress() != null) { if (arbitraryDataFileListMessage.getPeerAddress() != null) {
ArbitraryDataFileManager.getInstance().directConnectionInfo.add( ArbitraryDataFileManager.getInstance().addDirectConnectionInfoIfUnique(
new ArbitraryDirectConnectionInfo(signature, arbitraryDataFileListMessage.getPeerAddress(), hashes, now)); new ArbitraryDirectConnectionInfo(signature, arbitraryDataFileListMessage.getPeerAddress(), hashes, now));
} }
} }

19
src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileManager.java
View File

@ -53,7 +53,7 @@ public class ArbitraryDataFileManager extends Thread {
/** /**
* List to keep track of peers potentially available for direct connections, based on recent requests * List to keep track of peers potentially available for direct connections, based on recent requests
*/ */
public List<ArbitraryDirectConnectionInfo> directConnectionInfo = Collections.synchronizedList(new ArrayList<>()); private List<ArbitraryDirectConnectionInfo> directConnectionInfo = Collections.synchronizedList(new ArrayList<>());
public static int MAX_FILE_HASH_RESPONSES = 1000; public static int MAX_FILE_HASH_RESPONSES = 1000;
@ -293,6 +293,23 @@ public class ArbitraryDataFileManager extends Thread {
} }
} }
/**
* Add an ArbitraryDirectConnectionInfo item, but only if one with this peer-signature combination
* doesn't already exist.
* @param connectionInfo - the direct connection info to add
*/
public void addDirectConnectionInfoIfUnique(ArbitraryDirectConnectionInfo connectionInfo) {
boolean peerAlreadyExists;
synchronized (directConnectionInfo) {
peerAlreadyExists = directConnectionInfo.stream()
.anyMatch(i -> Arrays.equals(i.getSignature(), connectionInfo.getSignature())
&& Objects.equals(i.getPeerAddress(), connectionInfo.getPeerAddress()));
}
if (!peerAlreadyExists) {
directConnectionInfo.add(connectionInfo);
}
}
private void removeDirectConnectionInfo(ArbitraryDirectConnectionInfo connectionInfo) { private void removeDirectConnectionInfo(ArbitraryDirectConnectionInfo connectionInfo) {
this.directConnectionInfo.remove(connectionInfo); this.directConnectionInfo.remove(connectionInfo);
} }