William/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2024-11-22 21:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved link stale process and timeout calculations

Browse Source
This commit is contained in:
Mark Qvist 2022-05-26 16:49:02 +02:00
parent 49616a36cf
commit 33fac728f8
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
RNS/Link.py
View File

@ -71,16 +71,32 @@ class Link:
ESTABLISHMENT_TIMEOUT_PER_HOP = RNS.Reticulum.DEFAULT_PER_HOP_TIMEOUT ESTABLISHMENT_TIMEOUT_PER_HOP = RNS.Reticulum.DEFAULT_PER_HOP_TIMEOUT
""" """
Default timeout for link establishment in seconds per hop to destination. Timeout for link establishment in seconds per hop to destination.
""" """
TRAFFIC_TIMEOUT_FACTOR = 6 TRAFFIC_TIMEOUT_FACTOR = 6
KEEPALIVE_TIMEOUT_FACTOR = 4 KEEPALIVE_TIMEOUT_FACTOR = 4
"""
RTT timeout factor used in link timeout calculation.
"""
STALE_GRACE = 2 STALE_GRACE = 2
KEEPALIVE = 360 """
Grace period in seconds used in link timeout calculation.
"""
# TODO: Reset
# KEEPALIVE = 360
KEEPALIVE = 10
""" """
Interval for sending keep-alive packets on established links in seconds. Interval for sending keep-alive packets on established links in seconds.
""" """
STALE_TIME = 2*KEEPALIVE
"""
If no traffic or keep-alive packets are received within this period, the
link will be marked as stale, and a final keep-alive packet will be sent.
If after this no traffic or keep-alive packets are received within ``RTT`` *
``KEEPALIVE_TIMEOUT_FACTOR`` + ``STALE_GRACE``, the link is considered timed out,
and will be torn down.
"""
PENDING = 0x00 PENDING = 0x00
HANDSHAKE = 0x01 HANDSHAKE = 0x01
@ -145,6 +161,7 @@ class Link:
self.traffic_timeout_factor = Link.TRAFFIC_TIMEOUT_FACTOR self.traffic_timeout_factor = Link.TRAFFIC_TIMEOUT_FACTOR
self.keepalive_timeout_factor = Link.KEEPALIVE_TIMEOUT_FACTOR self.keepalive_timeout_factor = Link.KEEPALIVE_TIMEOUT_FACTOR
self.keepalive = Link.KEEPALIVE self.keepalive = Link.KEEPALIVE
self.stale_time = Link.STALE_TIME
self.watchdog_lock = False self.watchdog_lock = False
self.status = Link.PENDING self.status = Link.PENDING
self.activated_at = None self.activated_at = None
@ -503,15 +520,32 @@ 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(self.last_inbound, activated_at)
if time.time() >= last_inbound + self.keepalive: if time.time() >= last_inbound + self.keepalive:
sleep_time = self.rtt * self.keepalive_timeout_factor + Link.STALE_GRACE # TODO: Remove
self.status = Link.STALE RNS.log(str(self)+" keepalive interval passed", RNS.LOG_DEBUG)
if self.initiator: if self.initiator:
# TODO: Remove
ss = self.stale_time - (time.time() - last_inbound)
RNS.log(str(self)+" sending keepalive, "+str(ss)+"s to stale", RNS.LOG_DEBUG)
self.send_keepalive() self.send_keepalive()
if time.time() >= last_inbound + self.stale_time:
sleep_time = self.rtt * self.keepalive_timeout_factor + Link.STALE_GRACE
self.status = Link.STALE
# TODO: Remove
RNS.log("Link "+str(self)+" became stale", RNS.LOG_DEBUG)
else:
sleep_time = self.keepalive
else: else:
sleep_time = (last_inbound + self.keepalive) - time.time() sleep_time = (last_inbound + self.keepalive) - time.time()
elif self.status == Link.STALE: elif self.status == Link.STALE:
# TODO: Remove
RNS.log(str(self)+" closed stale link")
sleep_time = 0.001 sleep_time = 0.001
self.status = Link.CLOSED self.status = Link.CLOSED
self.teardown_reason = Link.TIMEOUT self.teardown_reason = Link.TIMEOUT

2
RNS/Transport.py
View File

@ -68,7 +68,7 @@ class Transport:
PATH_REQUEST_GRACE = 0.35 # Grace time before a path announcement is made, allows directly reachable peers to respond first PATH_REQUEST_GRACE = 0.35 # Grace time before a path announcement is made, allows directly reachable peers to respond first
PATH_REQUEST_RW = 2 # Path request random window PATH_REQUEST_RW = 2 # Path request random window
LINK_TIMEOUT = RNS.Link.KEEPALIVE * 2 LINK_TIMEOUT = RNS.Link.STALE_TIME * 1.25
REVERSE_TIMEOUT = 30*60 # Reverse table entries are removed after max 30 minutes REVERSE_TIMEOUT = 30*60 # Reverse table entries are removed after max 30 minutes
DESTINATION_TIMEOUT = PATHFINDER_E # Destination table entries are removed if unused for one week DESTINATION_TIMEOUT = PATHFINDER_E # Destination table entries are removed if unused for one week
MAX_RECEIPTS = 1024 # Maximum number of receipts to keep track of MAX_RECEIPTS = 1024 # Maximum number of receipts to keep track of