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

Improved transport logging

Browse Source
This commit is contained in:
Mark Qvist 2022-04-20 09:24:48 +02:00
parent 3d38ef27d4
commit 5606b64317
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
RNS/Transport.py
View File

@ -298,7 +298,7 @@ class Transport:
for destination_hash in Transport.announce_table: for destination_hash in Transport.announce_table:
announce_entry = Transport.announce_table[destination_hash] announce_entry = Transport.announce_table[destination_hash]
if announce_entry[2] > Transport.PATHFINDER_R: if announce_entry[2] > Transport.PATHFINDER_R:
RNS.log("Dropping announce for "+RNS.prettyhexrep(destination_hash)+", retries exceeded", RNS.LOG_DEBUG) RNS.log("Completed announce for "+RNS.prettyhexrep(destination_hash)+", retries exceeded", RNS.LOG_EXTREME)
Transport.announce_table.pop(destination_hash) Transport.announce_table.pop(destination_hash)
break break
else: else:
@ -422,9 +422,9 @@ class Transport:
if i > 0: if i > 0:
if i == 1: if i == 1:
RNS.log("Dropped "+str(i)+" reverse table entry", RNS.LOG_DEBUG) RNS.log("Released "+str(i)+" reverse table entry", RNS.LOG_DEBUG)
else: else:
RNS.log("Dropped "+str(i)+" reverse table entries", RNS.LOG_DEBUG) RNS.log("Released "+str(i)+" reverse table entries", RNS.LOG_DEBUG)
@ -558,6 +558,9 @@ class Transport:
should_transmit = False should_transmit = False
else: else:
# Currently, annouces originating locally are always
# allowed, and do not conform to bandwidth caps.
# TODO: Rethink whether this is actually optimal.
if packet.hops > 0: if packet.hops > 0:
if not hasattr(interface, "announce_cap"): if not hasattr(interface, "announce_cap"):
@ -576,6 +579,10 @@ class Transport:
wait_time = (tx_time / interface.announce_cap) wait_time = (tx_time / interface.announce_cap)
interface.announce_allowed_at = outbound_time + wait_time interface.announce_allowed_at = outbound_time + wait_time
# TODO: Clean
# wait_time_str = str(round(wait_time*1000,3))+"ms"
# RNS.log("Next announce on "+str(interface)+" allowed in "+wait_time_str, RNS.LOG_EXTREME)
else: else:
should_transmit = False should_transmit = False
if not len(interface.announce_queue) >= RNS.Reticulum.MAX_QUEUED_ANNOUNCES: if not len(interface.announce_queue) >= RNS.Reticulum.MAX_QUEUED_ANNOUNCES:
@ -587,8 +594,16 @@ class Transport:
wait_time = max(interface.announce_allowed_at - time.time(), 0) wait_time = max(interface.announce_allowed_at - time.time(), 0)
timer = threading.Timer(wait_time, interface.process_announce_queue) timer = threading.Timer(wait_time, interface.process_announce_queue)
timer.start() timer.start()
wait_time_str = str(round(wait_time*1000,3))+"ms"
ql_str = str(len(interface.announce_queue))
RNS.log("Added announce to queue (height "+ql_str+") on "+str(interface)+" for processing in "+wait_time_str, RNS.LOG_EXTREME)
else: else:
pass wait_time = max(interface.announce_allowed_at - time.time(), 0)
wait_time_str = str(round(wait_time*1000,3))+"ms"
ql_str = str(len(interface.announce_queue))
RNS.log("Added announce to queue (height "+ql_str+") on "+str(interface)+" for processing in "+wait_time_str, RNS.LOG_EXTREME)
else: else:
pass pass
@ -1542,7 +1557,12 @@ class Transport:
@staticmethod @staticmethod
def path_request(destination_hash, is_from_local_client, attached_interface): def path_request(destination_hash, is_from_local_client, attached_interface):
RNS.log("Path request for "+RNS.prettyhexrep(destination_hash), RNS.LOG_DEBUG) if attached_interface != None:
interface_str = " on "+str(attached_interface)
else:
interface_str = ""
RNS.log("Path request for "+RNS.prettyhexrep(destination_hash)+interface_str, RNS.LOG_DEBUG)
destination_exists_on_local_client = False destination_exists_on_local_client = False
if len(Transport.local_client_interfaces) > 0: if len(Transport.local_client_interfaces) > 0: