Added autoconnect_discovered_mode and autoconnect_announces_to_internal options

RNS/Utilities/rnsd.py

@@ -217,6 +217,19 @@ instance_name = default
 
 # panic_on_interface_error = no
 
+# You can specify which mode discovered interfaces should
+# be created with when auto-connecting.
+
+# autoconnect_discovered_mode = gw
+
+
+# It is possible to allow announces from auto-connected
+# interfaces to propagate announces to internal-mode
+# interfaces, even if the auto-connected interface's mode
+# would normally not allow for this.
+
+# autoconnect_announces_to_internal = yes
+
 
 # When Transport is enabled, it is possible to allow the
 # Transport Instance to respond to probe requests from

RNS/Utilities/rnstatus.py

@@ -425,7 +425,7 @@ def program_setup(configdir, dispall=False, verbosity=0, name_filter=None, json=
                         elif ifstat["mode"] == RNS.Interfaces.Interface.Interface.MODE_GATEWAY: modestr = "Gateway"
                         elif ifstat["mode"] == RNS.Interfaces.Interface.Interface.MODE_INTERNAL: modestr = "Internal"
                         else: modestr = "Full"
-
+                        if "announces_to_internal" in ifstat and ifstat["announces_to_internal"]: modestr += " (a>i)"
 
                         if ifstat["clients"] != None:
                             clients = ifstat["clients"]
@@ -471,7 +471,7 @@ def program_setup(configdir, dispall=False, verbosity=0, name_filter=None, json=
                             print("    "+clients_string)
 
                         if not (name.startswith("Shared Instance[") or name.startswith("TCPInterface[Client") or name.startswith("LocalInterface[")):
-                            print("    Mode      : {mode}".format(mode=modestr))
+                            print(f"    Mode      : {modestr}")
 
                         if "bitrate" in ifstat and ifstat["bitrate"] != None:
                             print("    Rate      : {ss}".format(ss=speed_str(ifstat["bitrate"])))