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 logging and rnpath output

Browse Source
This commit is contained in:
Mark Qvist 2022-04-20 11:22:52 +02:00
parent 104b186047
commit 5e6a1add6b
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
RNS/Transport.py
View File

@ -391,7 +391,7 @@ class Transport:
expires = tunnel_entry[3] expires = tunnel_entry[3]
if time.time() > expires: if time.time() > expires:
stale_tunnels.append(tunnel_id) stale_tunnels.append(tunnel_id)
RNS.log("Tunnel "+RNS.prettyhexrep(tunnel_id)+" timed out and was removed", RNS.LOG_DEBUG) RNS.log("Tunnel "+RNS.prettyhexrep(tunnel_id)+" timed out and was removed", RNS.LOG_EXTREME)
else: else:
stale_tunnel_paths = [] stale_tunnel_paths = []
tunnel_paths = tunnel_entry[2] tunnel_paths = tunnel_entry[2]
@ -400,7 +400,7 @@ class Transport:
if time.time() > tunnel_path_entry[0] + Transport.DESTINATION_TIMEOUT: if time.time() > tunnel_path_entry[0] + Transport.DESTINATION_TIMEOUT:
stale_tunnel_paths.append(tunnel_path) stale_tunnel_paths.append(tunnel_path)
RNS.log("Tunnel path to "+RNS.prettyhexrep(tunnel_path)+" timed out and was removed", RNS.LOG_DEBUG) RNS.log("Tunnel path to "+RNS.prettyhexrep(tunnel_path)+" timed out and was removed", RNS.LOG_EXTREME)
for tunnel_path in stale_tunnel_paths: for tunnel_path in stale_tunnel_paths:
tunnel_paths.pop(tunnel_path) tunnel_paths.pop(tunnel_path)
@ -409,9 +409,9 @@ class Transport:
if ti > 0: if ti > 0:
if ti == 1: if ti == 1:
RNS.log("Removed "+str(ti)+" tunnel path", RNS.LOG_DEBUG) RNS.log("Removed "+str(ti)+" tunnel path", RNS.LOG_EXTREME)
else: else:
RNS.log("Removed "+str(ti)+" tunnel paths", RNS.LOG_DEBUG) RNS.log("Removed "+str(ti)+" tunnel paths", RNS.LOG_EXTREME)
@ -422,9 +422,9 @@ class Transport:
if i > 0: if i > 0:
if i == 1: if i == 1:
RNS.log("Released "+str(i)+" reverse table entry", RNS.LOG_DEBUG) RNS.log("Released "+str(i)+" reverse table entry", RNS.LOG_EXTREME)
else: else:
RNS.log("Released "+str(i)+" reverse table entries", RNS.LOG_DEBUG) RNS.log("Released "+str(i)+" reverse table entries", RNS.LOG_EXTREME)
@ -435,9 +435,9 @@ class Transport:
if i > 0: if i > 0:
if i == 1: if i == 1:
RNS.log("Released "+str(i)+" link", RNS.LOG_DEBUG) RNS.log("Released "+str(i)+" link", RNS.LOG_EXTREME)
else: else:
RNS.log("Released "+str(i)+" links", RNS.LOG_DEBUG) RNS.log("Released "+str(i)+" links", RNS.LOG_EXTREME)
i = 0 i = 0
for destination_hash in stale_paths: for destination_hash in stale_paths:
@ -446,9 +446,9 @@ class Transport:
if i > 0: if i > 0:
if i == 1: if i == 1:
RNS.log("Removed "+str(i)+" path", RNS.LOG_DEBUG) RNS.log("Removed "+str(i)+" path", RNS.LOG_EXTREME)
else: else:
RNS.log("Removed "+str(i)+" paths", RNS.LOG_DEBUG) RNS.log("Removed "+str(i)+" paths", RNS.LOG_EXTREME)
i = 0 i = 0
for tunnel_id in stale_tunnels: for tunnel_id in stale_tunnels:
@ -457,9 +457,9 @@ class Transport:
if i > 0: if i > 0:
if i == 1: if i == 1:
RNS.log("Removed "+str(i)+" tunnel", RNS.LOG_DEBUG) RNS.log("Removed "+str(i)+" tunnel", RNS.LOG_EXTREME)
else: else:
RNS.log("Removed "+str(i)+" tunnels", RNS.LOG_DEBUG) RNS.log("Removed "+str(i)+" tunnels", RNS.LOG_EXTREME)
Transport.tables_last_culled = time.time() Transport.tables_last_culled = time.time()
@ -696,7 +696,7 @@ class Transport:
RNS.log("Dropped invalid announce packet", RNS.LOG_DEBUG) RNS.log("Dropped invalid announce packet", RNS.LOG_DEBUG)
return False return False
RNS.log("Filtered packet with hash "+RNS.prettyhexrep(packet.packet_hash), RNS.LOG_DEBUG) RNS.log("Filtered packet with hash "+RNS.prettyhexrep(packet.packet_hash), RNS.LOG_EXTREME)
return False return False
@staticmethod @staticmethod

6
RNS/Utilities/rnpath.py
View File

@ -37,7 +37,11 @@ def program_setup(configdir, table, drop, destination_hexhash, verbosity):
for path in table: for path in table:
exp_str = RNS.timestamp_str(path["expires"]) exp_str = RNS.timestamp_str(path["expires"])
print(RNS.prettyhexrep(path["hash"])+" is "+str(path["hops"])+" hops away via "+RNS.prettyhexrep(path["via"])+" on "+path["interface"]+" expires "+RNS.timestamp_str(path["expires"])) if path["hops"] == 1:
m_str = " "
else:
m_str = "s"
print(RNS.prettyhexrep(path["hash"])+" is "+str(path["hops"])+" hop"+m_str+" away via "+RNS.prettyhexrep(path["via"])+" on "+path["interface"]+" expires "+RNS.timestamp_str(path["expires"]))
elif drop: elif drop:
try: try: