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

Improved rnstatus util display

Browse Source
This commit is contained in:
Mark Qvist 2022-04-16 23:26:57 +02:00
parent 6a1e6417bb
commit 4d4d39651f
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RNS/Reticulum.py
View File

@ -709,6 +709,8 @@ class Reticulum:
ifstats["rxb"] = interface.rxb ifstats["rxb"] = interface.rxb
ifstats["txb"] = interface.txb ifstats["txb"] = interface.txb
ifstats["status"] = interface.online ifstats["status"] = interface.online
ifstats["mode"] = interface.mode
stats.append(ifstats) stats.append(ifstats)
return stats return stats

34
RNS/Utilities/rnstatus.py
View File

@ -61,25 +61,43 @@ def program_setup(configdir, dispall=False, verbosity = 0):
else: else:
ss = "Down" ss = "Down"
if ifstat["mode"] == RNS.Interfaces.Interface.Interface.MODE_ACCESS_POINT:
modestr = "Access Point"
elif ifstat["mode"] == RNS.Interfaces.Interface.Interface.MODE_POINT_TO_POINT:
modestr = "Point-to-Point"
else:
modestr = "Full"
if ifstat["clients"] != None: if ifstat["clients"] != None:
clients = ifstat["clients"] clients = ifstat["clients"]
if name.startswith("Shared Instance["): if name.startswith("Shared Instance["):
clients_string = "Connected applications: "+str(max(clients-1,0)) cnum = max(clients-1,0)
if cnum == 1:
spec_str = " program"
else: else:
clients_string = "Connected clients: "+str(clients) spec_str = " programs"
clients_string = "Serving : "+str(cnum)+spec_str
else:
clients_string = "Clients : "+str(clients)
else: else:
clients = None clients = None
print(" {n}".format(n=ifstat["name"])) print(" {n}".format(n=ifstat["name"]))
print("\tStatus: {ss}".format(ss=ss)) print(" Status : {ss}".format(ss=ss))
if "i2p_b32" in ifstat:
print("\tI2P B32: {ep}".format(ep=str(ifstat["i2p_b32"])))
if clients != None: if clients != None:
print("\t"+clients_string) print(" "+clients_string)
print("\tRX: {rxb}\n\tTX: {txb}".format(rxb=size_str(ifstat["rxb"]), txb=size_str(ifstat["txb"])))
if not (name.startswith("Shared Instance[") or name.startswith("TCPInterface[Client")):
print(" Mode : {mode}".format(mode=modestr))
if "i2p_b32" in ifstat:
print(" I2P B32 : {ep}".format(ep=str(ifstat["i2p_b32"])))
print(" RX : {rxb}\n TX : {txb}".format(rxb=size_str(ifstat["rxb"]), txb=size_str(ifstat["txb"])))
print("") print("")