From 0ceb25e3e7775a356ac01cc455bc411978fe9d1f Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 21 Jun 2017 22:40:58 +0200 Subject: [PATCH] gluon-web-network: allow switching wired mesh legacy mode on and off --- package/gluon-web-network/i18n/de.po | 6 ++++++ package/gluon-web-network/i18n/fr.po | 6 ++++++ .../i18n/gluon-web-network.pot | 6 ++++++ .../lib/gluon/web/model/admin/network.lua | 18 ++++++++++++++++++ 4 files changed, 36 insertions(+) diff --git a/package/gluon-web-network/i18n/de.po b/package/gluon-web-network/i18n/de.po index 6b321f3e..f394b84b 100644 --- a/package/gluon-web-network/i18n/de.po +++ b/package/gluon-web-network/i18n/de.po @@ -52,5 +52,11 @@ msgstr "Statisch" msgid "Static DNS servers" msgstr "Statische DNS-Server" +msgid "Use legacy mode for LAN meshing" +msgstr "Veralteter Modus (LAN-Mesh)" + +msgid "Use legacy mode for WAN meshing" +msgstr "Veralteter Modus (WAN-Mesh)" + msgid "WAN connection" msgstr "WAN-Verbindung" diff --git a/package/gluon-web-network/i18n/fr.po b/package/gluon-web-network/i18n/fr.po index 1e36a201..9bea9996 100644 --- a/package/gluon-web-network/i18n/fr.po +++ b/package/gluon-web-network/i18n/fr.po @@ -52,5 +52,11 @@ msgstr "Statique" msgid "Static DNS servers" msgstr "Adresse DNS statique" +msgid "Use legacy mode for LAN meshing" +msgstr "" + +msgid "Use legacy mode for WAN meshing" +msgstr "" + msgid "WAN connection" msgstr "Connexion WAN" diff --git a/package/gluon-web-network/i18n/gluon-web-network.pot b/package/gluon-web-network/i18n/gluon-web-network.pot index 5b793a23..946ec2c2 100644 --- a/package/gluon-web-network/i18n/gluon-web-network.pot +++ b/package/gluon-web-network/i18n/gluon-web-network.pot @@ -43,5 +43,11 @@ msgstr "" msgid "Static DNS servers" msgstr "" +msgid "Use legacy mode for LAN meshing" +msgstr "" + +msgid "Use legacy mode for WAN meshing" +msgstr "" + msgid "WAN connection" msgstr "" diff --git a/package/gluon-web-network/luasrc/lib/gluon/web/model/admin/network.lua b/package/gluon-web-network/luasrc/lib/gluon/web/model/admin/network.lua index eb178da2..e634512e 100644 --- a/package/gluon-web-network/luasrc/lib/gluon/web/model/admin/network.lua +++ b/package/gluon-web-network/luasrc/lib/gluon/web/model/admin/network.lua @@ -83,7 +83,17 @@ function mesh_wan:write(data) uci:set("network", "mesh_wan", "auto", data) end +local mesh_wan_legacy = s:option(Flag, "mesh_wan_legacy", translate("Use legacy mode for WAN meshing")) +mesh_wan_legacy.default = mesh_wan.default and uci:get_bool("network", "mesh_wan_legacy", "auto") +mesh_wan_legacy:depends(mesh_wan, true) + +function mesh_wan_legacy:write(data) + uci:set("network", "mesh_wan", "legacy", data) +end + if sysconfig.lan_ifname then + local s = f:section(Section) + local mesh_lan = s:option(Flag, "mesh_lan", translate("Enable meshing on the LAN interface")) mesh_lan.default = uci:get_bool("network", "mesh_lan", "auto") @@ -102,6 +112,14 @@ if sysconfig.lan_ifname then uci:set_list("network", "client", "ifname", interfaces) end + + local mesh_lan_legacy = s:option(Flag, "mesh_lan_legacy", translate("Use legacy mode for LAN meshing")) + mesh_lan_legacy.default = mesh_lan.default and uci:get_bool("network", "mesh_lan_legacy", "auto") + mesh_lan_legacy:depends(mesh_lan, true) + + function mesh_lan_legacy:write(data) + uci:set("network", "mesh_lan", "legacy", data) + end end if uci:get('system', 'gpio_switch_poe_passthrough') then