diff --git a/RNS/Reticulum.py b/RNS/Reticulum.py index c45c21b4..60f78755 100755 --- a/RNS/Reticulum.py +++ b/RNS/Reticulum.py @@ -108,8 +108,8 @@ class Reticulum: discovery significantly increases throughput over fast links. """ - MAX_QUEUED_ANNOUNCES = 16384 - QUEUED_ANNOUNCE_LIFE = 60*60*24 + MAX_QUEUED_ANNOUNCES = 4096 + QUEUED_ANNOUNCE_LIFE = 60*60*3 ANNOUNCE_CAP = 2 """ diff --git a/RNS/Transport.py b/RNS/Transport.py index cb5cb664..9ea62012 100755 --- a/RNS/Transport.py +++ b/RNS/Transport.py @@ -1563,20 +1563,19 @@ class Transport: timer = threading.Timer(wait_time, interface.process_announce_queue) timer.start() - if wait_time < 1: wait_time_str = str(round(wait_time*1000,2))+"ms" - else: wait_time_str = str(round(wait_time*1,2))+"s" - - 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) if RNS.sl(RNS.LOG_EXTREME) else None + if RNS.sl(RNS.LOG_EXTREME): + if wait_time < 1: wait_time_str = str(round(wait_time*1000,2))+"ms" + else: wait_time_str = str(round(wait_time*1,2))+"s" + 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: - wait_time = max(interface.announce_allowed_at - time.time(), 0) - - if wait_time < 1: wait_time_str = str(round(wait_time*1000,2))+"ms" - else: wait_time_str = str(round(wait_time*1,2))+"s" - - 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) if RNS.sl(RNS.LOG_EXTREME) else None + if RNS.sl(RNS.LOG_EXTREME): + wait_time = max(interface.announce_allowed_at - time.time(), 0) + if wait_time < 1: wait_time_str = str(round(wait_time*1000,2))+"ms" + else: wait_time_str = str(round(wait_time*1,2))+"s" + 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: pass