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

Added probe count option to rnprobe

Browse Source
This commit is contained in:
Mark Qvist 2023-11-02 16:14:38 +01:00
parent 43a6e280c0
commit 4b26a86a73
1 changed files with 94 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
RNS/Utilities/rnprobe.py
View File

@ -33,7 +33,7 @@ from RNS._version import __version__
DEFAULT_PROBE_SIZE = 16 DEFAULT_PROBE_SIZE = 16
DEFAULT_TIMEOUT = 12 DEFAULT_TIMEOUT = 12
def program_setup(configdir, destination_hexhash, size=None, full_name = None, verbosity = 0, timeout=None): def program_setup(configdir, destination_hexhash, size=None, full_name = None, verbosity = 0, timeout=None, probes=1):
if size == None: size = DEFAULT_PROBE_SIZE if size == None: size = DEFAULT_PROBE_SIZE
if full_name == None: if full_name == None:
print("The full destination name including application name aspects must be specified for the destination") print("The full destination name including application name aspects must be specified for the destination")
@ -96,6 +96,10 @@ def program_setup(configdir, destination_hexhash, size=None, full_name = None, v
*aspects *aspects
) )
sent = 0
replies = 0
while probes:
try: try:
probe = RNS.Packet(request_destination, os.urandom(size)) probe = RNS.Packet(request_destination, os.urandom(size))
probe.pack() probe.pack()
@ -104,6 +108,7 @@ def program_setup(configdir, destination_hexhash, size=None, full_name = None, v
exit(3) exit(3)
receipt = probe.send() receipt = probe.send()
sent += 1
if more_output: if more_output:
nhd = reticulum.get_next_hop(destination_hash) nhd = reticulum.get_next_hop(destination_hash)
@ -113,7 +118,7 @@ def program_setup(configdir, destination_hexhash, size=None, full_name = None, v
else: else:
more = "" more = ""
print("\rSent "+str(size)+" byte probe to "+RNS.prettyhexrep(destination_hash)+more+" ", end=" ") print("\rSent probe "+str(sent)+" ("+str(size)+" bytes) to "+RNS.prettyhexrep(destination_hash)+more+" ", end=" ")
_timeout = time.time() + (timeout or DEFAULT_TIMEOUT+reticulum.get_first_hop_timeout(destination_hash)) _timeout = time.time() + (timeout or DEFAULT_TIMEOUT+reticulum.get_first_hop_timeout(destination_hash))
i = 0 i = 0
@ -125,12 +130,13 @@ def program_setup(configdir, destination_hexhash, size=None, full_name = None, v
if time.time() > _timeout: if time.time() > _timeout:
print("\r \rProbe timed out") print("\r \rProbe timed out")
exit(2)
else:
print("\b\b ") print("\b\b ")
sys.stdout.flush() sys.stdout.flush()
if receipt.status == RNS.PacketReceipt.DELIVERED: if receipt.status == RNS.PacketReceipt.DELIVERED:
replies += 1
hops = RNS.Transport.hops_to(destination_hash) hops = RNS.Transport.hops_to(destination_hash)
if hops != 1: if hops != 1:
ms = "s" ms = "s"
@ -178,8 +184,15 @@ def program_setup(configdir, destination_hexhash, size=None, full_name = None, v
else: else:
print("\r \rProbe timed out") print("\r \rProbe timed out")
exit(2)
probes -= 1
loss = round((1-(replies/sent))*100, 2)
print(f"Sent {sent}, received {replies}, packet loss {loss}%")
if loss > 0:
exit(2)
else:
exit(0)
def main(): def main():
@ -188,6 +201,7 @@ def main():
parser.add_argument("--config", action="store", default=None, help="path to alternative Reticulum config directory", type=str) parser.add_argument("--config", action="store", default=None, help="path to alternative Reticulum config directory", type=str)
parser.add_argument("-s", "--size", action="store", default=None, help="size of probe packet payload in bytes", type=int) parser.add_argument("-s", "--size", action="store", default=None, help="size of probe packet payload in bytes", type=int)
parser.add_argument("-n", "--probes", action="store", default=1, help="number of probes to send", type=int)
parser.add_argument("-t", "--timeout", metavar="seconds", action="store", default=None, help="timeout before giving up", type=float) parser.add_argument("-t", "--timeout", metavar="seconds", action="store", default=None, help="timeout before giving up", type=float)
parser.add_argument("--version", action="version", version="rnprobe {version}".format(version=__version__)) parser.add_argument("--version", action="version", version="rnprobe {version}".format(version=__version__))
parser.add_argument("full_name", nargs="?", default=None, help="full destination name in dotted notation", type=str) parser.add_argument("full_name", nargs="?", default=None, help="full destination name in dotted notation", type=str)
@ -212,7 +226,8 @@ def main():
destination_hexhash = args.destination_hash, destination_hexhash = args.destination_hash,
size = args.size, size = args.size,
full_name = args.full_name, full_name = args.full_name,
verbosity = args.verbose verbosity = args.verbose,
probes = args.probes,
) )
except KeyboardInterrupt: except KeyboardInterrupt: