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

Added interface mode config shorthands

Browse Source
This commit is contained in:
Mark Qvist 2022-04-16 16:42:59 +02:00
parent 03d3478b5e
commit 39f1258d0e
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
RNS/Reticulum.py
View File

@ -304,7 +304,15 @@ class Reticulum:
interface_mode = Interface.Interface.MODE_FULL interface_mode = Interface.Interface.MODE_FULL
if "mode" in c: if "interface_mode" in c:
if c["interface_mode"] == "full":
interface_mode = Interface.Interface.MODE_FULL
elif c["interface_mode"] == "access_point" or c["interface_mode"] == "accesspoint" or c["interface_mode"] == "ap":
interface_mode = Interface.Interface.MODE_ACCESS_POINT
elif c["interface_mode"] == "pointtopoint" or c["interface_mode"] == "ptp":
interface_mode = Interface.Interface.MODE_POINT_TO_POINT
elif "mode" in c:
if c["mode"] == "full": if c["mode"] == "full":
interface_mode = Interface.Interface.MODE_FULL interface_mode = Interface.Interface.MODE_FULL
elif c["mode"] == "access_point" or c["mode"] == "accesspoint" or c["mode"] == "ap": elif c["mode"] == "access_point" or c["mode"] == "accesspoint" or c["mode"] == "ap":
@ -313,7 +321,7 @@ class Reticulum:
interface_mode = Interface.Interface.MODE_POINT_TO_POINT interface_mode = Interface.Interface.MODE_POINT_TO_POINT
try: try:
if ("interface_enabled" in c) and c.as_bool("interface_enabled") == True: if (("interface_enabled" in c) and c.as_bool("interface_enabled") == True) or (("enabled" in c) and c.as_bool("enabled") == True):
if c["type"] == "AutoInterface": if c["type"] == "AutoInterface":
if not RNS.vendor.platformutils.is_windows(): if not RNS.vendor.platformutils.is_windows():
group_id = c["group_id"] if "group_id" in c else None group_id = c["group_id"] if "group_id" in c else None