X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_network%2Fwifi.lua;h=0ed725b613c2b74e5f15e3d0ba651851ed49a871;hb=ae6c1f618f3618e386863b655a3be02de14d8f3b;hp=0f99c6ec08faee4f0fae117aa7879c759e5e8869;hpb=f9303705a0210a5c8dd7b44697c3ff31e1473b1a;p=project%2Fluci.git 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 0f99c6ec0..0ed725b61 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -17,7 +17,12 @@ arg[1] = arg[1] or "" m = Map("wireless", translate("networks"), translate("a_w_networks1")) s = m:section(NamedSection, arg[1], "wifi-device", translate("device") .. " " .. arg[1]) ---s.addremove = true +s.addremove = false + +back = s:option(DummyValue, "_overview", translate("overview")) +back.value = "" +back.titleref = luci.dispatcher.build_url("admin", "network", "wireless") + en = s:option(Flag, "disabled", translate("enable")) en.enabled = "0" @@ -29,6 +34,8 @@ end s:option(DummyValue, "type", translate("type")) local hwtype = m:get(arg[1], "type") +-- NanoFoo +local nsantenna = m:get(arg[1], "antenna") ch = s:option(Value, "channel", translate("a_w_channel")) for i=1, 14 do @@ -55,7 +62,7 @@ end ------------------- Madwifi Device ------------------ if hwtype == "atheros" then - mode = s:option(ListValue, "mode", translate("mode")) + mode = s:option(ListValue, "hwmode", translate("mode")) mode:value("", translate("wifi_auto")) mode:value("11b", "802.11b") mode:value("11g", "802.11g") @@ -65,9 +72,18 @@ if hwtype == "atheros" then mode:value("11adt", "802.11adt") mode:value("fh", translate("wifi_fh")) - s:option(Flag, "diversity", translate("wifi_diversity")) - s:option(Value, "txantenna", translate("wifi_txantenna")).optional = true - s:option(Value, "rxantenna", translate("wifi_rxantenna")).optional = true + s:option(Flag, "diversity", translate("wifi_diversity")).rmempty = false + + if not nsantenna then + s:option(Value, "txantenna", translate("wifi_txantenna")).optional = true + s:option(Value, "rxantenna", translate("wifi_rxantenna")).optional = true + else -- NanoFoo + local ant = s:option(ListValue, "antenna", translate("wifi_txantenna")) + ant:value("auto") + ant:value("vertical") + ant:value("horizontal") + ant:value("external") + end s:option(Value, "distance", translate("wifi_distance"), translate("wifi_distance_desc")).optional = true @@ -79,17 +95,17 @@ end ------------------- Broadcom Device ------------------ if hwtype == "broadcom" then - mp = s:option(ListValue, "macpolicy", translate("wifi_macpolicy")) + mp = s:option(ListValue, "macfilter", translate("wifi_macpolicy")) mp.optional = true mp:value("") - mp:value("deny", translate("wifi_whitelist")) - mp:value("allow", translate("wifi_blacklist")) - ml = s:option(Value, "maclist", translate("wifi_maclist")) - ml:depends({macpolicy="allow"}) - ml:depends({macpolicy="deny"}) + mp:value("allow", translate("wifi_whitelist")) + mp:value("deny", translate("wifi_blacklist")) + ml = s:option(DynamicList, "maclist", translate("wifi_maclist")) + ml:depends({macfilter="allow"}) + ml:depends({macfilter="deny"}) - s:option(Value, "txant", translate("wifi_txantenna")).optional = true - s:option(Value, "rxant", translate("wifi_rxantenna")).optional = true + s:option(Value, "txantenna", translate("wifi_txantenna")).optional = true + s:option(Value, "rxantenna", translate("wifi_rxantenna")).optional = true s:option(Flag, "frameburst", translate("wifi_bursting")).optional = true @@ -121,7 +137,7 @@ function network.write(self, section, value) if not m.uci:get("network", value) then -- avoid "value not defined in enum" because network is not known yet s.override_scheme = true - + m:chain("network") m.uci:set("network", value, "interface") Value.write(self, section, value) @@ -134,6 +150,7 @@ end mode = s:option(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")) @@ -144,10 +161,11 @@ bssid = s:option(Value, "bssid", translate("wifi_bssid")) -------------------- MAC80211 Interface ---------------------- if hwtype == "mac80211" then + 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, "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 @@ -172,7 +190,7 @@ 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 + 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"}) @@ -189,7 +207,7 @@ if hwtype == "atheros" then mp:value("") mp:value("deny", translate("wifi_whitelist")) mp:value("allow", translate("wifi_blacklist")) - ml = s:option(Value, "maclist", translate("wifi_maclist")) + ml = s:option(DynamicList, "maclist", translate("wifi_maclist")) ml:depends({macpolicy="allow"}) ml:depends({macpolicy="deny"}) @@ -208,6 +226,14 @@ if hwtype == "atheros" then s:option(Flag, "wmm", translate("wifi_wmm")).optional = true s:option(Flag, "xr", translate("wifi_xr")).optional = true s:option(Flag, "ar", translate("wifi_ar")).optional = true + + local swm = s:option(Flag, "sw_merge", translate("wifi_nosbeacon")) + swm:depends({mode="adhoc"}) + swm.optional = true + + local nos = s:option(Flag, "nosbeacon", translate("wifi_nosbeacon")) + nos:depends({mode="sta"}) + nos.optional = true end @@ -217,6 +243,8 @@ 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"}) @@ -309,11 +337,11 @@ if hwtype == "atheros" or hwtype == "mac80211" then eaptype:depends({mode="sta", encryption="wpa"}) eaptype:depends({mode="sta", encryption="wpa2i"}) - cacert = s:option(Value, "ca_cert", translate("a_w_cacert")) + cacert = s:option(FileUpload, "ca_cert", translate("a_w_cacert")) cacert:depends({mode="sta", encryption="wpa"}) cacert:depends({mode="sta", encryption="wpa2i"}) - privkey = s:option(Value, "priv_key", translate("a_w_tlsprivkey")) + privkey = s:option(FileUpload, "priv_key", translate("a_w_tlsprivkey")) privkey:depends({mode="sta", eap_type="TLS", encryption="wpa2i"}) privkey:depends({mode="sta", eap_type="TLS", encryption="wpa"})