Mirror/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2026-07-26 09:38:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed race condition in link watchdog timing

Browse Source
This commit is contained in:
Mark Qvist
2026-07-20 16:16:07 +02:00
parent f81b267509
commit fb7479a6f6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RNS/Link.py
+4 -4
View File
@@ -750,13 +750,13 @@ class Link:
if self.initiator and now >= self.last_keepalive + self.keepalive: if self.initiator and now >= self.last_keepalive + self.keepalive:
self.send_keepalive() self.send_keepalive()
if time.time() >= last_inbound + self.stale_time: if now >= last_inbound + self.stale_time:
sleep_time = self.rtt * self.keepalive_timeout_factor + Link.STALE_GRACE sleep_time = self.rtt * self.keepalive_timeout_factor + Link.STALE_GRACE
self.status = Link.STALE self.status = Link.STALE
else: sleep_time = self.keepalive else: sleep_time = self.keepalive
else: sleep_time = (last_inbound + self.keepalive) - time.time() else: sleep_time = (last_inbound + self.keepalive) - now
elif self.status == Link.STALE: elif self.status == Link.STALE:
sleep_time = 0.001 sleep_time = 0.001
@@ -766,9 +766,9 @@ class Link:
self.link_closed() self.link_closed()
if sleep_time == 0: RNS.log("Warning! Link watchdog sleep time of 0!", RNS.LOG_ERROR) if sleep_time == 0: RNS.log(f"Link watchdog sleep time of 0 on {self}", RNS.LOG_ERROR)
if sleep_time == None or sleep_time < 0: if sleep_time == None or sleep_time < 0:
RNS.log("Timing error! Tearing down link "+str(self)+" now.", RNS.LOG_ERROR) RNS.log(f"Timing error, tearing down link {self} now", RNS.LOG_ERROR)
self.teardown() self.teardown()
sleep_time = 0.1 sleep_time = 0.1