Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
mirrors
openwrt
luci
提交
42b162ea
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,发现更多精彩内容 >>
提交
42b162ea
编写于
8月 16, 2009
作者:
J
Jo-Philipp Wich
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
modules/admin-full: merge mode and wds options for madwifi
上级
59e5f625
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
48 addition
and
19 deletion
+48
-19
modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+48
-19
未找到文件。
modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
浏览文件 @
42b162ea
...
...
@@ -177,8 +177,8 @@ end
mode
=
s
:
taboption
(
"general"
,
ListValue
,
"mode"
,
translate
(
"mode"
))
mode
.
override_values
=
true
mode
:
value
(
"ap"
,
translate
(
"a_w_ap"
))
mode
:
value
(
"adhoc"
,
translate
(
"a_w_adhoc"
))
mode
:
value
(
"sta"
,
translate
(
"a_w_client"
))
mode
:
value
(
"adhoc"
,
translate
(
"a_w_adhoc"
))
bssid
=
s
:
taboption
(
"general"
,
Value
,
"bssid"
,
translate
(
"wifi_bssid"
))
...
...
@@ -205,22 +205,47 @@ end
if
hwtype
==
"atheros"
then
mode
:
value
(
"ahdemo"
,
translate
(
"a_w_ahdemo"
))
mode
:
value
(
"monitor"
,
translate
(
"a_w_monitor"
))
mode
:
value
(
"ap-wds"
,
"%s (%s)"
%
{
translate
(
"a_w_ap"
),
translate
(
"a_w_wds"
)})
mode
:
value
(
"sta-wds"
,
"%s (%s)"
%
{
translate
(
"a_w_client"
),
translate
(
"a_w_wds"
)})
function
mode
.
write
(
self
,
section
,
value
)
if
value
==
"ap-wds"
then
ListValue
.
write
(
self
,
section
,
"ap"
)
m
.
uci
:
set
(
"wireless"
,
section
,
"wds"
,
1
)
elseif
value
==
"sta-wds"
then
ListValue
.
write
(
self
,
section
,
"sta"
)
m
.
uci
:
set
(
"wireless"
,
section
,
"wds"
,
1
)
else
ListValue
.
write
(
self
,
section
,
value
)
m
.
uci
:
delete
(
"wireless"
,
section
,
"wds"
)
end
end
function
mode
.
cfgvalue
(
self
,
section
)
local
mode
=
ListValue
.
cfgvalue
(
self
,
section
)
local
wds
=
m
.
uci
:
get
(
"wireless"
,
section
,
"wds"
)
==
"1"
if
mode
==
"ap"
and
wds
then
return
"ap-wds"
elseif
mode
==
"sta"
and
wds
then
return
"sta-wds"
else
return
mode
end
end
bssid
:
depends
({
mode
=
"adhoc"
})
bssid
:
depends
({
mode
=
"ahdemo"
})
wds
=
s
:
taboption
(
"general"
,
Flag
,
"wds"
,
translate
(
"a_w_wds"
))
wds
:
depends
({
mode
=
"ap"
})
wds
:
depends
({
mode
=
"sta"
})
wds
.
rmempty
=
true
wdssep
=
s
:
taboption
(
"advanced"
,
Flag
,
"wdssep"
,
translate
(
"wifi_wdssep"
))
wdssep
:
depends
({
mode
=
"ap
"
,
wds
=
"1
"
})
wdssep
:
depends
({
mode
=
"ap
-wds
"
})
s
:
taboption
(
"advanced"
,
Flag
,
"doth"
,
"802.11h"
)
hidden
=
s
:
taboption
(
"general"
,
Flag
,
"hidden"
,
translate
(
"wifi_hidden"
))
hidden
:
depends
({
mode
=
"ap"
})
hidden
:
depends
({
mode
=
"adhoc"
})
hidden
:
depends
({
mode
=
"wds"
})
hidden
:
depends
({
mode
=
"ap-wds"
})
hidden
:
depends
({
mode
=
"sta-wds"
})
isolate
=
s
:
taboption
(
"advanced"
,
Flag
,
"isolate"
,
translate
(
"wifi_isolate"
),
translate
(
"wifi_isolate_desc"
))
isolate
:
depends
({
mode
=
"ap"
})
...
...
@@ -255,6 +280,7 @@ if hwtype == "atheros" then
local
nos
=
s
:
taboption
(
"advanced"
,
Flag
,
"nosbeacon"
,
translate
(
"wifi_nosbeacon"
))
nos
:
depends
({
mode
=
"sta"
})
nos
:
depends
({
mode
=
"sta-wds"
})
local
probereq
=
s
:
taboption
(
"advanced"
,
Flag
,
"probereq"
,
translate
(
"wifi_noprobereq"
))
probereq
.
enabled
=
"0"
...
...
@@ -317,7 +343,8 @@ encr:depends({mode="ap"})
encr
:
depends
({
mode
=
"sta"
})
encr
:
depends
({
mode
=
"adhoc"
})
encr
:
depends
({
mode
=
"ahdemo"
})
encr
:
depends
({
mode
=
"wds"
})
encr
:
depends
({
mode
=
"ap-wds"
})
encr
:
depends
({
mode
=
"sta-wds"
})
encr
:
depends
({
mode
=
"mesh"
})
encr
:
value
(
"none"
,
"No Encryption"
)
...
...
@@ -331,21 +358,21 @@ if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then
encr
:
value
(
"psk"
,
"WPA-PSK"
)
encr
:
value
(
"psk2"
,
"WPA2-PSK"
)
encr
:
value
(
"psk-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"
}
,
{
mode
=
"ap-wds"
},
{
mode
=
"sta-wds"
}
)
encr
:
value
(
"wpa2"
,
"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
(
"psk-mixed"
,
"WPA-PSK/WPA2-PSK Mixed Mode"
,
{
mode
=
"ap"
},
{
mode
=
"adhoc"
},
{
mode
=
"ahdemo"
})
encr
:
value
(
"wpa"
,
"WPA-EAP"
,
{
mode
=
"ap"
})
encr
:
value
(
"wpa2"
,
"WPA2-EAP"
,
{
mode
=
"ap"
})
encr
:
value
(
"psk"
,
"WPA-PSK"
,
{
mode
=
"ap"
},
{
mode
=
"a
p-wds"
},
{
mode
=
"a
dhoc"
},
{
mode
=
"ahdemo"
})
encr
:
value
(
"psk2"
,
"WPA2-PSK"
,
{
mode
=
"ap"
},
{
mode
=
"a
p-wds"
},
{
mode
=
"a
dhoc"
},
{
mode
=
"ahdemo"
})
encr
:
value
(
"psk-mixed"
,
"WPA-PSK/WPA2-PSK Mixed Mode"
,
{
mode
=
"ap"
},
{
mode
=
"a
p-wds"
},
{
mode
=
"a
dhoc"
},
{
mode
=
"ahdemo"
})
encr
:
value
(
"wpa"
,
"WPA-EAP"
,
{
mode
=
"ap"
}
,
{
mode
=
"ap-wds"
}
)
encr
:
value
(
"wpa2"
,
"WPA2-EAP"
,
{
mode
=
"ap"
}
,
{
mode
=
"ap-wds"
}
)
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
(
"psk-mixed"
,
"WPA-PSK/WPA2-PSK Mixed Mode"
,
{
mode
=
"sta"
})
encr
:
value
(
"wpa"
,
"WPA-EAP"
,
{
mode
=
"sta"
})
encr
:
value
(
"wpa2"
,
"WPA2-EAP"
,
{
mode
=
"sta"
})
encr
:
value
(
"psk"
,
"WPA-PSK"
,
{
mode
=
"sta"
}
,
{
mode
=
"sta-wds"
}
)
encr
:
value
(
"psk2"
,
"WPA2-PSK"
,
{
mode
=
"sta"
}
,
{
mode
=
"sta-wds"
}
)
encr
:
value
(
"psk-mixed"
,
"WPA-PSK/WPA2-PSK Mixed Mode"
,
{
mode
=
"sta"
}
,
{
mode
=
"sta-wds"
}
)
encr
:
value
(
"wpa"
,
"WPA-EAP"
,
{
mode
=
"sta"
}
,
{
mode
=
"sta-wds"
}
)
encr
:
value
(
"wpa2"
,
"WPA2-EAP"
,
{
mode
=
"sta"
}
,
{
mode
=
"sta-wds"
}
)
encr
.
description
=
translate
(
"wifi_wpareq"
)
else
encr
.
description
=
translate
(
"wifi_wpareq"
)
...
...
@@ -358,6 +385,8 @@ end
encr
:
depends
(
"mode"
,
"ap"
)
encr
:
depends
(
"mode"
,
"sta"
)
encr
:
depends
(
"mode"
,
"ap-wds"
)
encr
:
depends
(
"mode"
,
"sta-wds"
)
encr
:
depends
(
"mode"
,
"wds"
)
server
=
s
:
taboption
(
"encryption"
,
Value
,
"server"
,
translate
(
"a_w_radiussrv"
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录