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

Added timeout to rnpath utility

Browse Source
This commit is contained in:
Mark Qvist 2022-04-20 13:40:07 +02:00
parent 402b5fc461
commit 4af14a712c
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
RNS/Utilities/rnpath.py
View File

@ -30,7 +30,7 @@ import argparse
from RNS._version import __version__ from RNS._version import __version__
def program_setup(configdir, table, drop, destination_hexhash, verbosity): def program_setup(configdir, table, drop, destination_hexhash, verbosity, timeout):
if table: if table:
reticulum = RNS.Reticulum(configdir = configdir, loglevel = 3+verbosity) reticulum = RNS.Reticulum(configdir = configdir, loglevel = 3+verbosity)
table = sorted(reticulum.get_path_table(), key=lambda e: (e["interface"], e["hops"]) ) table = sorted(reticulum.get_path_table(), key=lambda e: (e["interface"], e["hops"]) )
@ -85,22 +85,26 @@ def program_setup(configdir, table, drop, destination_hexhash, verbosity):
i = 0 i = 0
syms = "⢄⢂⢁⡁⡈⡐⡠" syms = "⢄⢂⢁⡁⡈⡐⡠"
while not RNS.Transport.has_path(destination_hash): limit = time.time()+timeout
while not RNS.Transport.has_path(destination_hash) and time.time()<limit:
time.sleep(0.1) time.sleep(0.1)
print(("\b\b"+syms[i]+" "), end="") print(("\b\b"+syms[i]+" "), end="")
sys.stdout.flush() sys.stdout.flush()
i = (i+1)%len(syms) i = (i+1)%len(syms)
hops = RNS.Transport.hops_to(destination_hash) if RNS.Transport.has_path(destination_hash):
next_hop = RNS.prettyhexrep(reticulum.get_next_hop(destination_hash)) hops = RNS.Transport.hops_to(destination_hash)
next_hop_interface = reticulum.get_next_hop_if_name(destination_hash) next_hop = RNS.prettyhexrep(reticulum.get_next_hop(destination_hash))
next_hop_interface = reticulum.get_next_hop_if_name(destination_hash)
if hops != 1: if hops != 1:
ms = "s" ms = "s"
else:
ms = ""
print("\rPath found, destination "+RNS.prettyhexrep(destination_hash)+" is "+str(hops)+" hop"+ms+" away via "+next_hop+" on "+next_hop_interface)
else: else:
ms = "" print("\r \rPath not found")
print("\rPath found, destination "+RNS.prettyhexrep(destination_hash)+" is "+str(hops)+" hop"+ms+" away via "+next_hop+" on "+next_hop_interface)
def main(): def main():
@ -136,6 +140,15 @@ def main():
default=False default=False
) )
parser.add_argument(
"-w",
action="store",
metavar="seconds",
type=float,
help="timeout before giving up",
default=15
)
parser.add_argument( parser.add_argument(
"destination", "destination",
nargs="?", nargs="?",
@ -163,7 +176,8 @@ def main():
table = args.table, table = args.table,
drop = args.drop, drop = args.drop,
destination_hexhash = args.destination, destination_hexhash = args.destination,
verbosity = args.verbose verbosity = args.verbose,
timeout = args.w,
) )
except KeyboardInterrupt: except KeyboardInterrupt: