Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
mirrors
openwrt
luci
提交
aa3caed0
L
luci
项目概览
mirrors
/
openwrt
/
luci
11 个月 前同步成功
通知
43
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
luci
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
aa3caed0
编写于
6月 15, 2011
作者:
J
Jo-Philipp Wich
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
modules/admin-full: fix WPA-EAP and WPA2-EAP settings in STA-WDS mode
上级
f5df53fa
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
21 addition
and
1 deletion
+21
-1
modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+21
-1
未找到文件。
modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
浏览文件 @
aa3caed0
...
...
@@ -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
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录