diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-06-15 23:14:38 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-06-15 23:14:38 +0000 |
| commit | aa3caed0b5ba4218c8665747cdd70b5fbd476d94 (patch) | |
| tree | 4a5efa657c5c1192af55037d02b725a458f139b4 /modules/admin-full/luasrc/model/cbi | |
| parent | f5df53faaae9138be33cfd7cf83089221bad6e22 (diff) | |
modules/admin-full: fix WPA-EAP and WPA2-EAP settings in STA-WDS mode
Diffstat (limited to 'modules/admin-full/luasrc/model/cbi')
| -rw-r--r-- | modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua | 22 |
1 files changed, 21 insertions, 1 deletions
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 d3d1774fff..a6be2fabd1 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -559,7 +559,7 @@ if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then encr:value("psk2", "WPA2-PSK") encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode") encr:value("wpa", "WPA-EAP", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}) - encr:value("wpa2", "WPA2-EAP", {mode="ap"}, {mode="sta"}) + encr:value("wpa2", "WPA2-EAP", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}) elseif hostapd and not supplicant then encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="ap-wds"}, {mode="adhoc"}, {mode="ahdemo"}) encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="ap-wds"}, {mode="adhoc"}, {mode="ahdemo"}) @@ -691,18 +691,26 @@ if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then eaptype:value("peap", "PEAP") eaptype:depends({mode="sta", encryption="wpa"}) eaptype:depends({mode="sta", encryption="wpa2"}) + eaptype:depends({mode="sta-wds", encryption="wpa"}) + eaptype:depends({mode="sta-wds", encryption="wpa2"}) cacert = s:taboption("encryption", FileUpload, "ca_cert", translate("Path to CA-Certificate")) cacert:depends({mode="sta", encryption="wpa"}) cacert:depends({mode="sta", encryption="wpa2"}) + cacert:depends({mode="sta-wds", encryption="wpa"}) + cacert:depends({mode="sta-wds", encryption="wpa2"}) privkey = s:taboption("encryption", FileUpload, "priv_key", translate("Path to Private Key")) privkey:depends({mode="sta", eap_type="tls", encryption="wpa2"}) privkey:depends({mode="sta", eap_type="tls", encryption="wpa"}) + privkey:depends({mode="sta-wds", eap_type="tls", encryption="wpa2"}) + privkey:depends({mode="sta-wds", eap_type="tls", encryption="wpa"}) privkeypwd = s:taboption("encryption", Value, "priv_key_pwd", translate("Password of Private Key")) privkeypwd:depends({mode="sta", eap_type="tls", encryption="wpa2"}) privkeypwd:depends({mode="sta", eap_type="tls", encryption="wpa"}) + privkeypwd:depends({mode="sta-wds", eap_type="tls", encryption="wpa2"}) + privkeypwd:depends({mode="sta-wds", eap_type="tls", encryption="wpa"}) auth = s:taboption("encryption", Value, "auth", translate("Authentication")) @@ -714,6 +722,10 @@ if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then auth:depends({mode="sta", eap_type="peap", encryption="wpa"}) auth:depends({mode="sta", eap_type="ttls", encryption="wpa2"}) auth:depends({mode="sta", eap_type="ttls", encryption="wpa"}) + auth:depends({mode="sta-wds", eap_type="peap", encryption="wpa2"}) + auth:depends({mode="sta-wds", eap_type="peap", encryption="wpa"}) + auth:depends({mode="sta-wds", eap_type="ttls", encryption="wpa2"}) + auth:depends({mode="sta-wds", eap_type="ttls", encryption="wpa"}) identity = s:taboption("encryption", Value, "identity", translate("Identity")) @@ -721,12 +733,20 @@ if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then identity:depends({mode="sta", eap_type="peap", encryption="wpa"}) identity:depends({mode="sta", eap_type="ttls", encryption="wpa2"}) identity:depends({mode="sta", eap_type="ttls", encryption="wpa"}) + identity:depends({mode="sta-wds", eap_type="peap", encryption="wpa2"}) + identity:depends({mode="sta-wds", eap_type="peap", encryption="wpa"}) + identity:depends({mode="sta-wds", eap_type="ttls", encryption="wpa2"}) + identity:depends({mode="sta-wds", eap_type="ttls", encryption="wpa"}) password = s:taboption("encryption", Value, "password", translate("Password")) password:depends({mode="sta", eap_type="peap", encryption="wpa2"}) password:depends({mode="sta", eap_type="peap", encryption="wpa"}) password:depends({mode="sta", eap_type="ttls", encryption="wpa2"}) password:depends({mode="sta", eap_type="ttls", encryption="wpa"}) + password:depends({mode="sta-wds", eap_type="peap", encryption="wpa2"}) + password:depends({mode="sta-wds", eap_type="peap", encryption="wpa"}) + password:depends({mode="sta-wds", eap_type="ttls", encryption="wpa2"}) + password:depends({mode="sta-wds", eap_type="ttls", encryption="wpa"}) end return m |