Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

modules/admin-full: align wifi settings with recent hostapd.sh in OpenWrt (#261)

Browse source
This commit is contained in:
Jo-Philipp Wich 2011-10-02 10:25:32 +00:00
parent 31ea36f7ab
commit c45f6b670d
1 changed files with 53 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
View file

@ -558,6 +558,14 @@ encr:depends({mode="ap-wds"})
encr:depends({mode="sta-wds"}) encr:depends({mode="sta-wds"})
encr:depends({mode="mesh"}) encr:depends({mode="mesh"})
function encr.write(self, section, value)
if value == "wpa" or value == "wpa2" then
self.map.uci:delete("wireless", section, "key")
end
self.map.uci:set("wireless", section, "encryption", value)
end
encr:value("none", "No Encryption") encr:value("none", "No Encryption")
encr:value("wep-open", translate("WEP Open System"), {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}) encr:value("wep-open", translate("WEP Open System"), {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"})
encr:value("wep-shared", translate("WEP Shared Key"), {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}) encr:value("wep-shared", translate("WEP Shared Key"), {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"})
@ -604,35 +612,59 @@ elseif hwtype == "broadcom" then
encr:value("psk+psk2", "WPA-PSK/WPA2-PSK Mixed Mode") encr:value("psk+psk2", "WPA-PSK/WPA2-PSK Mixed Mode")
end end
encr:depends("mode", "ap") auth_server = s:taboption("encryption", Value, "auth_server", translate("Radius-Authentication-Server"))
encr:depends("mode", "sta") auth_server:depends({mode="ap", encryption="wpa"})
encr:depends("mode", "ap-wds") auth_server:depends({mode="ap", encryption="wpa2"})
encr:depends("mode", "sta-wds") auth_server:depends({mode="ap-wds", encryption="wpa"})
encr:depends("mode", "wds") auth_server:depends({mode="ap-wds", encryption="wpa2"})
auth_server.rmempty = true
auth_server.datatype = "host"
server = s:taboption("encryption", Value, "server", translate("Radius-Server")) auth_port = s:taboption("encryption", Value, "auth_port", translate("Radius-Authentication-Port"), translatef("Default %d", 1812))
server:depends({mode="ap", encryption="wpa"}) auth_port:depends({mode="ap", encryption="wpa"})
server:depends({mode="ap", encryption="wpa2"}) auth_port:depends({mode="ap", encryption="wpa2"})
server:depends({mode="ap-wds", encryption="wpa"}) auth_port:depends({mode="ap-wds", encryption="wpa"})
server:depends({mode="ap-wds", encryption="wpa2"}) auth_port:depends({mode="ap-wds", encryption="wpa2"})
server.rmempty = true auth_port.rmempty = true
auth_port.datatype = "port"
port = s:taboption("encryption", Value, "port", translate("Radius-Port")) auth_secret = s:taboption("encryption", Value, "auth_secret", translate("Radius-Authentication-Secret"))
port:depends({mode="ap", encryption="wpa"}) auth_secret:depends({mode="ap", encryption="wpa"})
port:depends({mode="ap", encryption="wpa2"}) auth_secret:depends({mode="ap", encryption="wpa2"})
port:depends({mode="ap-wds", encryption="wpa"}) auth_secret:depends({mode="ap-wds", encryption="wpa"})
port:depends({mode="ap-wds", encryption="wpa2"}) auth_secret:depends({mode="ap-wds", encryption="wpa2"})
port.rmempty = true auth_secret.rmempty = true
auth_secret.password = true
acct_server = s:taboption("encryption", Value, "acct_server", translate("Radius-Accounting-Server"))
acct_server:depends({mode="ap", encryption="wpa"})
acct_server:depends({mode="ap", encryption="wpa2"})
acct_server:depends({mode="ap-wds", encryption="wpa"})
acct_server:depends({mode="ap-wds", encryption="wpa2"})
acct_server.rmempty = true
acct_server.datatype = "host"
acct_port = s:taboption("encryption", Value, "acct_port", translate("Radius-Accounting-Port"), translatef("Default %d", 1813))
acct_port:depends({mode="ap", encryption="wpa"})
acct_port:depends({mode="ap", encryption="wpa2"})
acct_port:depends({mode="ap-wds", encryption="wpa"})
acct_port:depends({mode="ap-wds", encryption="wpa2"})
acct_port.rmempty = true
acct_port.datatype = "port"
acct_secret = s:taboption("encryption", Value, "acct_secret", translate("Radius-Accounting-Secret"))
acct_secret:depends({mode="ap", encryption="wpa"})
acct_secret:depends({mode="ap", encryption="wpa2"})
acct_secret:depends({mode="ap-wds", encryption="wpa"})
acct_secret:depends({mode="ap-wds", encryption="wpa2"})
acct_secret.rmempty = true
acct_secret.password = true
wpakey = s:taboption("encryption", Value, "_wpa_key", translate("Key")) wpakey = s:taboption("encryption", Value, "_wpa_key", translate("Key"))
wpakey:depends("encryption", "psk") wpakey:depends("encryption", "psk")
wpakey:depends("encryption", "psk2") wpakey:depends("encryption", "psk2")
wpakey:depends("encryption", "psk+psk2") wpakey:depends("encryption", "psk+psk2")
wpakey:depends("encryption", "psk-mixed") wpakey:depends("encryption", "psk-mixed")
wpakey:depends({mode="ap", encryption="wpa"})
wpakey:depends({mode="ap", encryption="wpa2"})
wpakey:depends({mode="ap-wds", encryption="wpa"})
wpakey:depends({mode="ap-wds", encryption="wpa2"})
wpakey.datatype = "wpakey" wpakey.datatype = "wpakey"
wpakey.rmempty = true wpakey.rmempty = true
wpakey.password = true wpakey.password = true