modules/admin-{mini,full}: implement wpa-wpa2 mixed mode

[project/luci.git] / modules / admin-full / luasrc / model / cbi / admin_network / wifi.lua

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
index dd3e5ed..7d18121 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -27,6 +27,7 @@ back.titleref = luci.dispatcher.build_url("admin", "network", "wireless")
 en = s:option(Flag, "disabled", translate("enable"))
 en.enabled = "0"
 en.disabled = "1"
+en.rmempty = false
 
 function en.cfgvalue(self, section)
        return Flag.cfgvalue(self, section) or "0"
@@ -52,6 +53,8 @@ ch:value(151, 151 .. " (5 GHz)")
 ch:value(155, 155 .. " (5 GHz)")
 ch:value(167, 167 .. " (5 GHz)")
 
+s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
+
 ------------------- MAC80211 Device ------------------
 
 if hwtype == "mac80211" then
@@ -161,11 +164,14 @@ bssid = s:option(Value, "bssid", translate("wifi_bssid"))
 -------------------- MAC80211 Interface ----------------------
 
 if hwtype == "mac80211" then
+       if luci.fs.mtime("/usr/sbin/iw") then
+               mode:value("mesh", "802.11s")
+       end
+
        mode:value("ahdemo", translate("a_w_ahdemo"))
        mode:value("monitor", translate("a_w_monitor"))
        bssid:depends({mode="adhoc"})
 
-       s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
        s:option(Value, "frag", translate("wifi_frag")).optional = true
        s:option(Value, "rts", translate("wifi_rts")).optional = true
 end
@@ -190,7 +196,6 @@ if hwtype == "atheros" then
        wdssep.optional = true
 
        s:option(Flag, "doth", "802.11h").optional = true
-       s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
        hidden = s:option(Flag, "hidden", translate("wifi_hidden"))
        hidden:depends({mode="ap"})
        hidden:depends({mode="adhoc"})
@@ -248,8 +253,6 @@ if hwtype == "broadcom" then
        mode:value("wds", translate("a_w_wds"))
        mode:value("monitor", translate("a_w_monitor"))
 
-       s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
-
        hidden = s:option(Flag, "hidden", translate("wifi_hidden"))
        hidden:depends({mode="ap"})
        hidden:depends({mode="adhoc"})
@@ -262,6 +265,7 @@ if hwtype == "broadcom" then
        isolate.optional = true
 
        bssid:depends({mode="wds"})
+       bssid:depends({mode="adhoc"})
 end
 
 
@@ -275,6 +279,7 @@ encr:depends({mode="sta"})
 encr:depends({mode="adhoc"})
 encr:depends({mode="ahdemo"})
 encr:depends({mode="wds"})
+encr:depends({mode="mesh"})
 
 encr:value("none", "No Encryption")
 encr:value("wep", "WEP")
@@ -286,17 +291,20 @@ if hwtype == "atheros" or hwtype == "mac80211" then
        if hostapd and supplicant then
                encr:value("psk", "WPA-PSK")
                encr:value("psk2", "WPA2-PSK")
+               encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode")
                encr:value("wpa", "WPA-EAP", {mode="ap"}, {mode="sta"})
                encr:value("wpa2i", "WPA2-EAP", {mode="ap"}, {mode="sta"})
        elseif hostapd and not supplicant then
                encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="adhoc"}, {mode="ahdemo"})
                encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="adhoc"}, {mode="ahdemo"})
+               encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="adhoc"}, {mode="ahdemo"})
                encr:value("wpa", "WPA-EAP", {mode="ap"})
                encr:value("wpa2i", "WPA2-EAP", {mode="ap"})
                encr.description = translate("wifi_wpareq")
        elseif not hostapd and supplicant then
                encr:value("psk", "WPA-PSK", {mode="sta"})
                encr:value("psk2", "WPA2-PSK", {mode="sta"})
+               encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="sta"})
                encr:value("wpa", "WPA-EAP", {mode="sta"})
                encr:value("wpa2i", "WPA2-EAP", {mode="sta"})
                encr.description = translate("wifi_wpareq")
@@ -306,6 +314,7 @@ if hwtype == "atheros" or hwtype == "mac80211" then
 elseif hwtype == "broadcom" then
        encr:value("psk", "WPA-PSK")
        encr:value("psk2", "WPA2-PSK")
+       encr:value("psk+psk2", "WPA-PSK/WPA2-PSK Mixed Mode")
 end
 
 encr:depends("mode", "ap")