William
/
Reticulum
mirror of https://github.com/markqvist/Reticulum.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed received link packet proofs not resetting watchdog stale timer

This commit is contained in:
Mark Qvist 2023-05-11 16:22:44 +02:00
parent 523fc7b8f9
commit 1542c5f4fe
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RNS/Link.py
View File

@ -148,6 +148,7 @@ class Link:
self.pending_requests = [] self.pending_requests = []
self.last_inbound = 0 self.last_inbound = 0
self.last_outbound = 0 self.last_outbound = 0
self.last_proof = 0
self.tx = 0 self.tx = 0
self.rx = 0 self.rx = 0
self.txbytes = 0 self.txbytes = 0
@ -277,6 +278,7 @@ class Link:
self.__remote_identity = self.destination.identity self.__remote_identity = self.destination.identity
self.status = Link.ACTIVE self.status = Link.ACTIVE
self.activated_at = time.time() self.activated_at = time.time()
self.last_proof = self.activated_at
RNS.Transport.activate_link(self) RNS.Transport.activate_link(self)
RNS.log("Link "+str(self)+" established with "+str(self.destination)+", RTT is "+str(round(self.rtt, 3))+"s", RNS.LOG_VERBOSE) RNS.log("Link "+str(self)+" established with "+str(self.destination)+", RTT is "+str(round(self.rtt, 3))+"s", RNS.LOG_VERBOSE)
@ -527,7 +529,7 @@ class Link:
elif self.status == Link.ACTIVE: elif self.status == Link.ACTIVE:
activated_at = self.activated_at if self.activated_at != None else 0 activated_at = self.activated_at if self.activated_at != None else 0
last_inbound = max(self.last_inbound, activated_at) last_inbound = max(max(self.last_inbound, self.last_proof), activated_at)
if time.time() >= last_inbound + self.keepalive: if time.time() >= last_inbound + self.keepalive:
if self.initiator: if self.initiator:

1
RNS/Packet.py
View File

@ -400,6 +400,7 @@ class PacketReceipt:
self.proved = True self.proved = True
self.concluded_at = time.time() self.concluded_at = time.time()
self.proof_packet = proof_packet self.proof_packet = proof_packet
link.last_proof = self.concluded_at
if self.callbacks.delivery != None: if self.callbacks.delivery != None:
try: try: