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

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

Browse source 
modules/admin-core: extend uci schema to cover mixed mode and mesh mode (802.11s)
This commit is contained in:
Jo-Philipp Wich 2009-03-04 22:43:45 +00:00
parent f1b667fc6f
commit 0feb0a4607
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/admin-core/root/lib/uci/schema/default/wireless
View file

@ -220,6 +220,11 @@ config enum
option value 'wds' option value 'wds'
option title 'WDS' option title 'WDS'
config enum
option variable 'wireless.wifi-iface.mode'
option value 'mesh'
option title 'Mesh (802.11s)'
config variable config variable
option name 'bssid' option name 'bssid'
option section 'wireless.wifi-iface' option section 'wireless.wifi-iface'
@ -453,6 +458,8 @@ config variable
list depends 'encryption=wpa,mode=ap' list depends 'encryption=wpa,mode=ap'
list depends 'encryption=psk2' list depends 'encryption=psk2'
list depends 'encryption=wpa2i,mode=ap' list depends 'encryption=wpa2i,mode=ap'
list depends 'encryption=psk+psk2'
list depends 'encryption=mixed'
config variable config variable
option name 'nasid' option name 'nasid'

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

@ -291,17 +291,20 @@ if hwtype == "atheros" or hwtype == "mac80211" then
if hostapd and supplicant then if hostapd and supplicant then
encr:value("psk", "WPA-PSK") encr:value("psk", "WPA-PSK")
encr:value("psk2", "WPA2-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("wpa", "WPA-EAP", {mode="ap"}, {mode="sta"})
encr:value("wpa2i", "WPA2-EAP", {mode="ap"}, {mode="sta"}) encr:value("wpa2i", "WPA2-EAP", {mode="ap"}, {mode="sta"})
elseif hostapd and not supplicant then elseif hostapd and not supplicant then
encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="adhoc"}, {mode="ahdemo"}) encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="adhoc"}, {mode="ahdemo"})
encr:value("psk2", "WPA2-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("wpa", "WPA-EAP", {mode="ap"})
encr:value("wpa2i", "WPA2-EAP", {mode="ap"}) encr:value("wpa2i", "WPA2-EAP", {mode="ap"})
encr.description = translate("wifi_wpareq") encr.description = translate("wifi_wpareq")
elseif not hostapd and supplicant then elseif not hostapd and supplicant then
encr:value("psk", "WPA-PSK", {mode="sta"}) encr:value("psk", "WPA-PSK", {mode="sta"})
encr:value("psk2", "WPA2-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("wpa", "WPA-EAP", {mode="sta"})
encr:value("wpa2i", "WPA2-EAP", {mode="sta"}) encr:value("wpa2i", "WPA2-EAP", {mode="sta"})
encr.description = translate("wifi_wpareq") encr.description = translate("wifi_wpareq")
@ -311,6 +314,7 @@ if hwtype == "atheros" or hwtype == "mac80211" then
elseif hwtype == "broadcom" then elseif hwtype == "broadcom" then
encr:value("psk", "WPA-PSK") encr:value("psk", "WPA-PSK")
encr:value("psk2", "WPA2-PSK") encr:value("psk2", "WPA2-PSK")
encr:value("psk+psk2", "WPA-PSK/WPA2-PSK Mixed Mode")
end end
encr:depends("mode", "ap") encr:depends("mode", "ap")

4
modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
View file

@ -224,17 +224,20 @@ if hwtype == "atheros" or hwtype == "mac80211" then
if hostapd and supplicant then if hostapd and supplicant then
encr:value("psk", "WPA-PSK") encr:value("psk", "WPA-PSK")
encr:value("psk2", "WPA2-PSK") encr:value("psk2", "WPA2-PSK")
encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode")
encr:value("wpa", "WPA-Radius", {mode="ap"}) encr:value("wpa", "WPA-Radius", {mode="ap"})
encr:value("wpa2i", "WPA2-Radius", {mode="ap"}) encr:value("wpa2i", "WPA2-Radius", {mode="ap"})
elseif hostapd and not supplicant then elseif hostapd and not supplicant then
encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="adhoc"}) encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="adhoc"})
encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="adhoc"}) encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="adhoc"})
encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="adhoc"})
encr:value("wpa", "WPA-Radius", {mode="ap"}) encr:value("wpa", "WPA-Radius", {mode="ap"})
encr:value("wpa2i", "WPA2-Radius", {mode="ap"}) encr:value("wpa2i", "WPA2-Radius", {mode="ap"})
encr.description = translate("wifi_wpareq") encr.description = translate("wifi_wpareq")
elseif not hostapd and supplicant then elseif not hostapd and supplicant then
encr:value("psk", "WPA-PSK", {mode="sta"}) encr:value("psk", "WPA-PSK", {mode="sta"})
encr:value("psk2", "WPA2-PSK", {mode="sta"}) encr:value("psk2", "WPA2-PSK", {mode="sta"})
encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="sta"})
encr.description = translate("wifi_wpareq") encr.description = translate("wifi_wpareq")
else else
encr.description = translate("wifi_wpareq") encr.description = translate("wifi_wpareq")
@ -242,6 +245,7 @@ if hwtype == "atheros" or hwtype == "mac80211" then
elseif hwtype == "broadcom" then elseif hwtype == "broadcom" then
encr:value("psk", "WPA-PSK") encr:value("psk", "WPA-PSK")
encr:value("psk2", "WPA2-PSK") encr:value("psk2", "WPA2-PSK")
encr:value("psk+psk2", "WPA-PSK/WPA2-PSK Mixed Mode")
end end
key = s:option(Value, "key", translate("key")) key = s:option(Value, "key", translate("key"))