Qortal/qortal
1
0
Fork 1
mirror of https://github.com/Qortal/qortal.git synced 2025-11-14 15:37:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

update peerData timestamps on close, open, etc

Browse Source
This commit is contained in:
Jürg Schulthess
2025-10-12 13:08:52 +02:00
parent ce0d3bb531
commit affe0d7d36
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/qortal/network/RNS.java
View File

@@ -582,6 +582,14 @@ public class RNS {
//network.addHandshakedPeer(peer);
}
public void removePeer(ReticulumPeer peer) {
if (peer.isInitiator) {
removeLinkedPeer(peer);
} else {
removeIncomingPeer(peer);
}
}
public void removeLinkedPeer(ReticulumPeer peer) {
//if (nonNull(peer.getPeerBuffer())) {
// peer.getPeerBuffer().close();

13
src/main/java/org/qortal/network/ReticulumPeer.java
View File

@@ -370,6 +370,9 @@ public class ReticulumPeer implements Peer {
log.info("peerLink {} established (link: {}) with peer: hash - {}, link destination hash: {}",
encodeHexString(peerLink.getLinkId()), encodeHexString(link.getLinkId()), encodeHexString(destinationHash),
encodeHexString(link.getDestination().getHash()));
var ntpNow = NTP.getTime();
this.peerData.setLastConnected(ntpNow);
//this.peerData.setLastAttempted(ntpNow);
if (isInitiator) {
startPings();
var network = Network.getInstance();
@@ -398,6 +401,7 @@ public class ReticulumPeer implements Peer {
} else {
log.info("Link closed callback");
}
RNS.getInstance().removePeer(this);
if (isInitiator) {
var network = Network.getInstance();
network.removeOutboundHandshakedPeer(this);
@@ -410,6 +414,7 @@ public class ReticulumPeer implements Peer {
if (msgText.equals("ping")) {
log.info("received ping on link");
this.lastLinkProbeTimestamp = Instant.now();
this.peerData.setLastAttempted(NTP.getTime());
} else if (msgText.startsWith("close::")) {
var targetPeerHash = subarray(message, 7, message.length);
log.info("peer dest hash: {}, target hash: {}",
@@ -423,15 +428,21 @@ public class ReticulumPeer implements Peer {
}
this.peerLink.teardown();
}
if (isInitiator) {
var network = Network.getInstance();
network.removeOutboundHandshakedPeer(this);
network.removeConnectedPeer(this);
}
} else if (msgText.startsWith("open::")) {
var targetPeerHash = subarray(message, 7, message.length);
log.info("peer dest hash: {}, target hash: {}",
encodeHexString(destinationHash),
encodeHexString(targetPeerHash));
if (Arrays.equals(destinationHash, targetPeerHash)) {
log.info("closing link: {}", peerLink.getDestination().getHexHash());
log.info("re-opening existing link: {}", peerLink.getDestination().getHexHash());
getOrInitPeerLink();
}
this.peerData.setLastConnected(NTP.getTime());
}
}