jacob.eva/Reticulum
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added docstrings. Added request size to receipts. Fixed link stale time calculation on newly created links with no actual activity.

Browse Source
This commit is contained in:
Mark Qvist 2022-05-24 20:13:11 +02:00
parent c24233845e
commit 30f71857ae
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
RNS/Link.py
View File

@ -334,7 +334,8 @@ class Link:
response_callback = response_callback, response_callback = response_callback,
failed_callback = failed_callback, failed_callback = failed_callback,
progress_callback = progress_callback, progress_callback = progress_callback,
timeout = timeout timeout = timeout,
request_size = len(packed_request),
) )
else: else:
@ -348,7 +349,8 @@ class Link:
response_callback = response_callback, response_callback = response_callback,
failed_callback = failed_callback, failed_callback = failed_callback,
progress_callback = progress_callback, progress_callback = progress_callback,
timeout = timeout timeout = timeout,
request_size = len(packed_request),
) )
@ -383,7 +385,9 @@ class Link:
""" """
:returns: The time in seconds since last inbound packet on the link. :returns: The time in seconds since last inbound packet on the link.
""" """
return time.time() - self.last_inbound activated_at = self.activated_at if self.activated_at != None else 0
last_inbound = max(self.last_inbound, activated_at)
return time.time() - last_inbound
def no_outbound_for(self): def no_outbound_for(self):
""" """
@ -497,13 +501,15 @@ class Link:
sleep_time = 0.001 sleep_time = 0.001
elif self.status == Link.ACTIVE: elif self.status == Link.ACTIVE:
if time.time() >= self.last_inbound + self.keepalive: activated_at = self.activated_at if self.activated_at != None else 0
last_inbound = max(self.last_inbound, activated_at)
if time.time() >= last_inbound + self.keepalive:
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
if self.initiator: if self.initiator:
self.send_keepalive() self.send_keepalive()
else: else:
sleep_time = (self.last_inbound + self.keepalive) - time.time() sleep_time = (last_inbound + self.keepalive) - time.time()
elif self.status == Link.STALE: elif self.status == Link.STALE:
sleep_time = 0.001 sleep_time = 0.001
@ -543,7 +549,7 @@ class Link:
allowed = False allowed = False
if not allow == RNS.Destination.ALLOW_NONE: if not allow == RNS.Destination.ALLOW_NONE:
if allow == RNS.Destination.ALLOW_LIST: if allow == RNS.Destination.ALLOW_LIST:
if self.__remote_identity.hash in allowed_list: if self.__remote_identity != None and self.__remote_identity.hash in allowed_list:
allowed = True allowed = True
elif allow == RNS.Destination.ALLOW_ALL: elif allow == RNS.Destination.ALLOW_ALL:
allowed = True allowed = True
@ -814,6 +820,12 @@ class Link:
self.callbacks.link_established = callback self.callbacks.link_established = callback
def set_link_closed_callback(self, callback): def set_link_closed_callback(self, callback):
"""
Registers a function to be called when a link has been
torn down.
:param callback: A function or method with the signature *callback(link)* to be called.
"""
self.callbacks.link_closed = callback self.callbacks.link_closed = callback
def set_packet_callback(self, callback): def set_packet_callback(self, callback):
@ -922,7 +934,7 @@ class RequestReceipt():
RECEIVING = 0x03 RECEIVING = 0x03
READY = 0x04 READY = 0x04
def __init__(self, link, packet_receipt = None, resource = None, response_callback = None, failed_callback = None, progress_callback = None, timeout = None): def __init__(self, link, packet_receipt = None, resource = None, response_callback = None, failed_callback = None, progress_callback = None, timeout = None, request_size = None):
self.packet_receipt = packet_receipt self.packet_receipt = packet_receipt
self.resource = resource self.resource = resource
self.started_at = None self.started_at = None
@ -938,6 +950,7 @@ class RequestReceipt():
self.link = link self.link = link
self.request_id = self.hash self.request_id = self.hash
self.request_size = request_size
self.response = None self.response = None
self.response_transfer_size = None self.response_transfer_size = None