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

luci-mod-admin-full: place 80211w options behind a check for wpad-full

Browse source 
The default hostapd/wpad mini version does not support ieee80211w
and the option's visibility in LuCI may lead it to be placed in user's
/etc/config/wireless preventing wifi from starting.

Check for hostapd/wpad full before exposing the option.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman 2017-02-14 23:30:51 +02:00
parent d0dda31644
commit 07e01d094e
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua
View file

@ -1125,6 +1125,8 @@ end
-- ieee802.11w options -- ieee802.11w options
if hwtype == "mac80211" then if hwtype == "mac80211" then
local has_ap_eap = (os.execute("hostapd -veap >/dev/null 2>/dev/null") == 0)
if has_ap_eap then
ieee80211w = s:taboption("encryption", ListValue, "ieee80211w", ieee80211w = s:taboption("encryption", ListValue, "ieee80211w",
translate("802.11w Management Frame Protection"), translate("802.11w Management Frame Protection"),
translate("Requires the 'full' version of wpad/hostapd " .. translate("Requires the 'full' version of wpad/hostapd " ..
@ -1160,6 +1162,7 @@ if hwtype == "mac80211" then
retry_timeout.placeholder = "201" retry_timeout.placeholder = "201"
retry_timeout.rmempty = true retry_timeout.rmempty = true
end end
end
if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then
local wpasupplicant = fs.access("/usr/sbin/wpa_supplicant") local wpasupplicant = fs.access("/usr/sbin/wpa_supplicant")