From 4d4d39651fb0a5e9763c51fd99715408fa3c34fd Mon Sep 17 00:00:00 2001
From: Mark Qvist <mark@unsigned.io>
Date: Sat, 16 Apr 2022 23:26:57 +0200
Subject: [PATCH] Improved rnstatus util display

---
 RNS/Reticulum.py          |  2 ++
 RNS/Utilities/rnstatus.py | 32 +++++++++++++++++++++++++-------
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/RNS/Reticulum.py b/RNS/Reticulum.py
index 6021e85..4f4db57 100755
--- a/RNS/Reticulum.py
+++ b/RNS/Reticulum.py
@@ -709,6 +709,8 @@ class Reticulum:
                 ifstats["rxb"] = interface.rxb
                 ifstats["txb"] = interface.txb
                 ifstats["status"] = interface.online
+                ifstats["mode"] = interface.mode
+                
                 stats.append(ifstats)
 
             return stats
diff --git a/RNS/Utilities/rnstatus.py b/RNS/Utilities/rnstatus.py
index ad20869..7c23420 100644
--- a/RNS/Utilities/rnstatus.py
+++ b/RNS/Utilities/rnstatus.py
@@ -61,25 +61,43 @@ def program_setup(configdir, dispall=False, verbosity = 0):
                 else:
                     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:
                     clients = ifstat["clients"]
                     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:
+                            spec_str = " programs"
+
+                        clients_string = "Serving : "+str(cnum)+spec_str
                     else:
-                        clients_string = "Connected clients: "+str(clients)
+                        clients_string = "Clients : "+str(clients)
 
                 else:
                     clients = None
 
                 print(" {n}".format(n=ifstat["name"]))
-                print("\tStatus: {ss}".format(ss=ss))
+                print("    Status  : {ss}".format(ss=ss))
+                
+                if clients != None:
+                    print("    "+clients_string)
+
+                if not (name.startswith("Shared Instance[") or name.startswith("TCPInterface[Client")):
+                    print("    Mode    : {mode}".format(mode=modestr))
 
                 if "i2p_b32" in ifstat:
-                    print("\tI2P B32: {ep}".format(ep=str(ifstat["i2p_b32"])))
+                    print("    I2P B32 : {ep}".format(ep=str(ifstat["i2p_b32"])))
 
-                if clients != None:
-                    print("\t"+clients_string)
-                print("\tRX: {rxb}\n\tTX: {txb}".format(rxb=size_str(ifstat["rxb"]), txb=size_str(ifstat["txb"])))
+                print("    RX      : {rxb}\n    TX      : {txb}".format(rxb=size_str(ifstat["rxb"]), txb=size_str(ifstat["txb"])))
 
         print("")