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

modules/admin-full: add wep-open and wep-shared support

Browse source
This commit is contained in:
Jo-Philipp Wich 2010-10-27 11:50:08 +00:00
parent 6e5620cc47
commit 5e0536d61a
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,10 +28,6 @@ m = Map("wireless", "",
m:chain("network") m:chain("network")
m.breadcrumb = {
{ luci.dispatcher.build_url("admin/network/wireless"), translate("Wireless Networks") }
}
local ifsection local ifsection
function m.on_commit(map) function m.on_commit(map)
@ -78,7 +74,7 @@ back.titleref = luci.dispatcher.build_url("admin", "network", "wireless")
st = s:taboption("general", DummyValue, "__status", translate("Status")) st = s:taboption("general", DummyValue, "__status", translate("Status"))
st.template = "admin_network/wifi_status" st.template = "admin_network/wifi_status"
st.ifname = arg[1] st.ifname = arg[2]
en = s:taboption("general", Flag, "disabled", translate("Enable device")) en = s:taboption("general", Flag, "disabled", translate("Enable device"))
en.enabled = "0" en.enabled = "0"
@ -319,7 +315,7 @@ if wnet then
if value == '-' then if value == '-' then
value = m:formvalue(self:cbid(section) .. ".newnet") value = m:formvalue(self:cbid(section) .. ".newnet")
if value and #value > 0 then if value and #value > 0 then
local n = nw:add_network(value, {type="bridge", proto="none"}) local n = nw:add_network(value, {proto="none"})
if n then n:add_interface(i) end if n then n:add_interface(i) end
else else
local n = i:get_network() local n = i:get_network()
@ -539,7 +535,8 @@ if wnet then
encr:depends({mode="mesh"}) encr:depends({mode="mesh"})
encr:value("none", "No Encryption") encr:value("none", "No Encryption")
encr:value("wep", "WEP", {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"})
if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then
local supplicant = fs.access("/usr/sbin/wpa_supplicant") local supplicant = fs.access("/usr/sbin/wpa_supplicant")
@ -625,9 +622,9 @@ if wnet then
nasid.rmempty = true nasid.rmempty = true
eaptype = s:taboption("encryption", ListValue, "eap_type", translate("EAP-Method")) eaptype = s:taboption("encryption", ListValue, "eap_type", translate("EAP-Method"))
eaptype:value("tls") eaptype:value("tls", "TLS")
eaptype:value("ttls") eaptype:value("ttls", "TTLS")
eaptype:value("peap") eaptype:value("peap", "PEAP")
eaptype:depends({mode="sta", encryption="wpa"}) eaptype:depends({mode="sta", encryption="wpa"})
eaptype:depends({mode="sta", encryption="wpa2"}) eaptype:depends({mode="sta", encryption="wpa2"})