X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_network%2Fwifi.lua;h=fa3ad753b31ee4149b373079801d73599cfd2cee;hb=3a0eb02f30fa567bdfd705939e2ee6f58de5461a;hp=64a49287965ca0a3d27a2edae8aceedd50bd0e12;hpb=0c3fc70ddbf3f0fc0dcbb5d7c05285b0b2d12ccb;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 64a492879..fa3ad753b 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" @@ -27,36 +32,92 @@ function en.cfgvalue(self, section) return Flag.cfgvalue(self, section) or "0" end -t = s:option(DummyValue, "type", translate("type")) +s:option(DummyValue, "type", translate("type")) +local hwtype = m:get(arg[1], "type") +-- NanoFoo +local nsantenna = m:get(arg[1], "antenna") -mode = s:option(ListValue, "mode", translate("mode")) -mode:value("", "standard") -mode:value("11b", "802.11b") -mode:value("11g", "802.11g") -mode:value("11a", "802.11a") -mode:value("11bg", "802.11b+g") -mode.rmempty = true +ch = s:option(Value, "channel", translate("a_w_channel")) +for i=1, 14 do + ch:value(i, i .. " (2.4 GHz)") +end +for i=36, 64, 4 do + ch:value(i, i .. " (5 GHz)") +end +for i=100, 140, 4 do + ch:value(i, i .. " (5 GHz)") +end +ch:value(147, 147 .. " (5 GHz)") +ch:value(151, 151 .. " (5 GHz)") +ch:value(155, 155 .. " (5 GHz)") +ch:value(167, 167 .. " (5 GHz)") -s:option(Value, "channel", translate("a_w_channel")) +------------------- MAC80211 Device ------------------ + +if hwtype == "mac80211" then + +end + + +------------------- Madwifi Device ------------------ + +if hwtype == "atheros" then + mode = s:option(ListValue, "mode", translate("mode")) + mode:value("", translate("wifi_auto")) + mode:value("11b", "802.11b") + mode:value("11g", "802.11g") + mode:value("11a", "802.11a") + mode:value("11bg", "802.11b+g") + mode:value("11gdt", "802.11adt") + mode:value("11adt", "802.11adt") + mode:value("fh", translate("wifi_fh")) + + s:option(Flag, "diversity", translate("wifi_diversity")) + + 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 + + --s:option(Flag, "nosbeacon", translate("wifi_nosbeacon")).optional = true +end -s:option(Value, "txantenna", translate("a_w_txantenna")).optional = true -s:option(Value, "rxantenna", translate("a_w_rxantenna")).optional = true -s:option(Value, "distance", translate("distance"), - translate("a_w_distance1")).optional = true +------------------- Broadcom Device ------------------ -s:option(Value, "diversity", translate("a_w_diversity")):depends("type", "atheros") - -country = s:option(Value, "country", translate("a_w_countrycode")) -country.optional = true -country:depends("type", "broadcom") +if hwtype == "broadcom" then + 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(DynamicList, "maclist", translate("wifi_maclist")) + ml:depends({macfilter="allow"}) + ml:depends({macfilter="deny"}) -maxassoc = s:option(Value, "maxassoc", translate("a_w_connlimit")) -maxassoc:depends("type", "broadcom") -maxassoc.optional = true + s:option(Value, "txant", translate("wifi_txantenna")).optional = true + s:option(Value, "rxant", translate("wifi_rxantenna")).optional = true + s:option(Flag, "frameburst", translate("wifi_bursting")).optional = true + s:option(Value, "distance", translate("wifi_distance")).optional = true + --s:option(Value, "slottime", translate("wifi_slottime")).optional = true + + s:option(Value, "country", translate("wifi_country")).optional = true + s:option(Value, "maxassoc", translate("wifi_maxassoc")).optional = true +end + + +----------------------- Interface ----------------------- s = m:section(TypedSection, "wifi-iface", translate("interfaces")) s.addremove = true @@ -64,100 +125,232 @@ s.anonymous = true s:depends("device", arg[1]) s.defaults.device = arg[1] -s:option(Value, "ssid", translate("a_w_netid")).maxlength = 32 +s:option(Value, "ssid", translate("wifi_essid")) -network = s:option(ListValue, "network", translate("network"), translate("a_w_network1")) +network = s:option(Value, "network", translate("network"), translate("a_w_network1")) +network.rmempty = true network:value("") +network.combobox_manual = translate("a_w_netmanual") luci.tools.webadmin.cbi_add_networks(network) +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) + else + if m.uci:get("network", value) == "interface" then + Value.write(self, section, value) + end + end +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("ahdemo", translate("a_w_ahdemo")) mode:value("sta", translate("a_w_client")) -mode:value("wds", translate("a_w_wds")) -mode:value("monitor", translate("a_w_monitor")) -s:option(Value, "bssid", "BSSID").optional = true +bssid = s:option(Value, "bssid", translate("wifi_bssid")) + + +-------------------- MAC80211 Interface ---------------------- -s:option(Value, "txpower", translate("a_w_txpwr"), "dbm").rmempty = true +if hwtype == "mac80211" then + 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, "frag", translate("wifi_frag")).optional = true + s:option(Value, "rts", translate("wifi_rts")).optional = true +end -s:option(Flag, "frameburst", translate("a_w_brcmburst")).optional = true -s:option(Flag, "bursting", translate("a_w_athburst")).optional = true +-------------------- Madwifi Interface ---------------------- + +if hwtype == "atheros" then + mode:value("ahdemo", translate("a_w_ahdemo")) + mode:value("monitor", translate("a_w_monitor")) + + bssid:depends({mode="adhoc"}) + bssid:depends({mode="ahdemo"}) + + wds = s:option(Flag, "wds", translate("a_w_wds")) + wds:depends({mode="ap"}) + wds:depends({mode="sta"}) + wds.rmempty = true + wdssep = s:option(Flag, "wdssep", translate("wifi_wdssep")) + wdssep:depends({mode="ap", wds="1"}) + wdssep.optional = true + + s:option(Flag, "doth", "802.11h").optional = 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"}) + hidden:depends({mode="wds"}) + hidden.optional = true + isolate = s:option(Flag, "isolate", translate("wifi_isolate"), + translate("wifi_isolate_desc")) + isolate:depends({mode="ap"}) + isolate.optional = true + s:option(Flag, "bgscan", translate("wifi_bgscan")).optional = true + + mp = s:option(ListValue, "macpolicy", translate("wifi_macpolicy")) + mp.optional = true + mp:value("") + mp:value("deny", translate("wifi_whitelist")) + mp:value("allow", translate("wifi_blacklist")) + ml = s:option(DynamicList, "maclist", translate("wifi_maclist")) + ml:depends({macpolicy="allow"}) + ml:depends({macpolicy="deny"}) + + s:option(Value, "rate", translate("wifi_rate")).optional = true + s:option(Value, "mcast_rate", translate("wifi_mcast_rate")).optional = true + s:option(Value, "frag", translate("wifi_frag")).optional = true + s:option(Value, "rts", translate("wifi_rts")).optional = true + s:option(Value, "minrate", translate("wifi_minrate")).optional = true + s:option(Value, "maxrate", translate("wifi_maxrate")).optional = true + s:option(Flag, "compression", translate("wifi_compression")).optional = true + + s:option(Flag, "bursting", translate("wifi_bursting")).optional = true + s:option(Flag, "turbo", translate("wifi_turbo")).optional = true + s:option(Value, "ff", translate("wifi_ff")).optional = true + + 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 +end + + +-------------------- Broadcom Interface ---------------------- + +if hwtype == "broadcom" then + mode:value("wds", translate("a_w_wds")) + mode:value("monitor", translate("a_w_monitor")) + + hidden = s:option(Flag, "hidden", translate("wifi_hidden")) + hidden:depends({mode="ap"}) + hidden:depends({mode="adhoc"}) + hidden:depends({mode="wds"}) + hidden.optional = true + + isolate = s:option(Flag, "isolate", translate("wifi_isolate"), + translate("wifi_isolate_desc")) + isolate:depends({mode="ap"}) + isolate.optional = true + + bssid:depends({mode="wds"}) +end + + + +------------------- WiFI-Encryption ------------------- + encr = s:option(ListValue, "encryption", translate("encryption")) -encr:value("none", "keine") +encr.override_values = true +encr:depends({mode="ap"}) +encr:depends({mode="sta"}) +encr:depends({mode="adhoc"}) +encr:depends({mode="ahdemo"}) +encr:depends({mode="wds"}) + +encr:value("none", "No Encryption") encr:value("wep", "WEP") -encr:value("PSK", "WPA-PSK") -encr:value("WPA", "WPA-EAP", {mode="ap"}, {mode="sta"}) -encr:value("PSK2", "WPA2-PSK") -encr:value("WPA2", "WPA2-EAP", {mode="ap"}, {mode="sta"}) + +if hwtype == "atheros" or hwtype == "mac80211" then + local supplicant = luci.fs.mtime("/usr/sbin/wpa_supplicant") + local hostapd = luci.fs.mtime("/usr/sbin/hostapd") + + if hostapd and supplicant then + encr:value("psk", "WPA-PSK") + encr:value("psk2", "WPA2-PSK") + encr:value("wpa", "WPA-EAP", {mode="ap"}, {mode="sta"}) + encr:value("wpa2i", "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("wpa", "WPA-EAP", {mode="ap"}) + encr:value("wpa2i", "WPA2-EAP", {mode="ap"}) + 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("wpa", "WPA-EAP", {mode="sta"}) + encr:value("wpa2i", "WPA2-EAP", {mode="sta"}) + encr.description = translate("wifi_wpareq") + else + encr.description = translate("wifi_wpareq") + end +elseif hwtype == "broadcom" then + encr:value("psk", "WPA-PSK") + encr:value("psk2", "WPA2-PSK") +end + encr:depends("mode", "ap") encr:depends("mode", "sta") encr:depends("mode", "wds") server = s:option(Value, "server", translate("a_w_radiussrv")) -server:depends({mode="ap", encryption="WPA"}) -server:depends({mode="ap", encryption="WPA2"}) +server:depends({mode="ap", encryption="wpa"}) +server:depends({mode="ap", encryption="wpa2i"}) server.rmempty = true port = s:option(Value, "port", translate("a_w_radiusport")) -port:depends({mode="ap", encryption="WPA"}) -port:depends({mode="ap", encryption="WPA2"}) +port:depends({mode="ap", encryption="wpa"}) +port:depends({mode="ap", encryption="wpa2i"}) port.rmempty = true key = s:option(Value, "key", translate("key")) key:depends("encryption", "wep") -key:depends("encryption", "PSK") -key:depends({mode="ap", encryption="WPA"}) -key:depends("encryption", "PSK2") -key:depends({mode="ap", encryption="WPA2"}) +key:depends("encryption", "psk") +key:depends({mode="ap", encryption="wpa"}) +key:depends("encryption", "psk2") +key:depends({mode="ap", encryption="wpa2i"}) key.rmempty = true -nasid = s:option(Value, "nasid", translate("a_w_nasid")) -nasid:depends({mode="ap", encryption="WPA"}) -nasid:depends({mode="ap", encryption="WPA2"}) -nasid.rmempty = true - -eaptype = s:option(ListValue, "eap_type", translate("a_w_eaptype")) -eaptype:value("TLS") -eaptype:value("PEAP") -eaptype:depends({mode="sta", encryption="WPA"}) -eaptype:depends({mode="sta", encryption="WPA2"}) - -cacert = s:option(Value, "ca_cert", translate("a_w_cacert")) -cacert:depends({mode="sta", encryption="WPA"}) -cacert:depends({mode="sta", encryption="WPA2"}) +if hwtype == "atheros" or hwtype == "mac80211" then + nasid = s:option(Value, "nasid", translate("a_w_nasid")) + nasid:depends({mode="ap", encryption="wpa"}) + nasid:depends({mode="ap", encryption="wpa2i"}) + nasid.rmempty = true -privkey = s:option(Value, "priv_key", translate("a_w_tlsprivkey")) -privkey:depends({mode="sta", eap_type="TLS", encryption="WPA2"}) -privkey:depends({mode="sta", eap_type="TLS", encryption="WPA"}) + eaptype = s:option(ListValue, "eap_type", translate("a_w_eaptype")) + eaptype:value("TLS") + eaptype:value("PEAP") + eaptype:depends({mode="sta", encryption="wpa"}) + eaptype:depends({mode="sta", encryption="wpa2i"}) -privkeypwd = s:option(Value, "priv_key_pwd", translate("a_w_tlsprivkeypwd")) -privkeypwd:depends({mode="sta", eap_type="TLS", encryption="WPA2"}) -privkeypwd:depends({mode="sta", eap_type="TLS", encryption="WPA"}) + 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(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"}) -auth = s:option(Value, "auth", translate("a_w_peapauth")) -auth:depends({mode="sta", eap_type="PEAP", encryption="WPA2"}) -auth:depends({mode="sta", eap_type="PEAP", encryption="WPA"}) + privkeypwd = s:option(Value, "priv_key_pwd", translate("a_w_tlsprivkeypwd")) + privkeypwd:depends({mode="sta", eap_type="TLS", encryption="wpa2i"}) + privkeypwd:depends({mode="sta", eap_type="TLS", encryption="wpa"}) -identity = s:option(Value, "identity", translate("a_w_peapidentity")) -identity:depends({mode="sta", eap_type="PEAP", encryption="WPA2"}) -identity:depends({mode="sta", eap_type="PEAP", encryption="WPA"}) -password = s:option(Value, "password", translate("a_w_peappassword")) -password:depends({mode="sta", eap_type="PEAP", encryption="WPA2"}) -password:depends({mode="sta", eap_type="PEAP", encryption="WPA"}) + auth = s:option(Value, "auth", translate("a_w_peapauth")) + auth:depends({mode="sta", eap_type="PEAP", encryption="wpa2i"}) + auth:depends({mode="sta", eap_type="PEAP", encryption="wpa"}) + identity = s:option(Value, "identity", translate("a_w_peapidentity")) + identity:depends({mode="sta", eap_type="PEAP", encryption="wpa2i"}) + identity:depends({mode="sta", eap_type="PEAP", encryption="wpa"}) + password = s:option(Value, "password", translate("a_w_peappassword")) + password:depends({mode="sta", eap_type="PEAP", encryption="wpa2i"}) + password:depends({mode="sta", eap_type="PEAP", encryption="wpa"}) +end -s:option(Flag, "isolate", translate("a_w_apisolation"), translate("a_w_apisolation1")).optional = true - -s:option(Flag, "hidden", translate("a_w_hideessid")).optional = true - - - -return m \ No newline at end of file +return m