X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-mini%2Fluasrc%2Fmodel%2Fcbi%2Fmini%2Fwifi.lua;h=056b5ee4b6e1823ae53e5f6db8365e564bd28fff;hp=cbf3d6a254f60169cea7c50be207750c67246a06;hb=9cc54c7f15d4a11a1eab5136a255896559511df6;hpb=21a7e9bc65da04588f2a9ff507427ba6bd7aeb39

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
index cbf3d6a25..056b5ee4b 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
@@ -15,6 +15,13 @@ $Id$
 
 -- Data init --
 
+local uci = luci.model.uci.cursor()
+if not uci:get("network", "wan") then
+	uci:section("network", "interface", "wan", {proto="none", ifname=" "})
+	uci:save("network")
+	uci:commit("network")
+end
+
 local wlcursor = luci.model.uci.cursor_state()
 local wireless = wlcursor:get_all("wireless")
 local wifidata = luci.sys.wifi.getiwconfig()
@@ -53,7 +60,7 @@ essid = s:option(DummyValue, "ssid", "ESSID")
 bssid = s:option(DummyValue, "_bsiid", "BSSID")
 function bssid.cfgvalue(self, section)
 	local ifname = self.map:get(section, "ifname")
-	return (wifidata[ifname] and (wifidata[ifname].Cell 
+	return (wifidata[ifname] and (wifidata[ifname].Cell
 	 or wifidata[ifname]["Access Point"])) or "-"
 end
 
@@ -89,6 +96,7 @@ end
 t2 = m:section(Table, {}, translate("iwscan"), translate("iwscan1"))
 
 function scan.write(self, section)
+	m.autoapply = false
 	t2.render = t2._render
 	local ifname = self.map:get(section, "ifname")
 	luci.util.update(t2.data, luci.sys.wifi.iwscan(ifname))
@@ -110,7 +118,7 @@ function chan.cfgvalue(self, section)
 	return self.map:get(section, "Channel")
 	    or self.map:get(section, "Frequency")
 	    or "-"
-end 
+end
 
 t2:option(DummyValue, "Encryption key", translate("iwscan_encr"))
 
@@ -127,8 +135,10 @@ end
 -- Config Section --
 
 s = m:section(NamedSection, wifidevs[1], "wifi-device", translate("devices"))
+s.addremove = false
 
 en = s:option(Flag, "disabled", translate("enable"))
+en.rmempty = false
 en.enabled = "0"
 en.disabled = "1"
 
@@ -141,6 +151,7 @@ local hwtype = m:get(wifidevs[1], "type")
 
 if hwtype == "atheros" then
 	mode = s:option(ListValue, "mode", translate("mode"))
+	mode.override_values = true
 	mode:value("", "auto")
 	mode:value("11b", "802.11b")
 	mode:value("11g", "802.11g")
@@ -158,6 +169,7 @@ end
 
 s = m:section(TypedSection, "wifi-iface", translate("m_n_local"))
 s.anonymous = true
+s.addremove = false
 
 s:option(Value, "ssid", translate("a_w_netid"))
 
@@ -168,7 +180,7 @@ luci.model.uci.cursor():foreach("wireless", "wifi-device",
 	function (section)
 		table.insert(devs, section[".name"])
 	end)
-	
+
 if #devs > 1 then
 	device = s:option(DummyValue, "device", translate("device"))
 else
@@ -176,18 +188,13 @@ else
 end
 
 mode = s:option(ListValue, "mode", translate("mode"))
+mode.override_values = true
 mode:value("ap", translate("m_w_ap"))
 mode:value("adhoc", translate("m_w_adhoc"))
 mode:value("sta", translate("m_w_client"))
 
 function mode.write(self, section, value)
 	if value == "sta" then
-		-- ToDo: Move this away
-		if not m.uci:get("network", "wan") then
-			m.uci:set("network", "wan", "proto", "none")
-			m.uci:set("network", "wan", "ifname", " ")
-		end
-
 		local oldif = m.uci:get("network", "wan", "ifname")
 		if oldif and oldif ~= " " then
 			m.uci:set("network", "wan", "_ifname", oldif)
@@ -206,6 +213,7 @@ function mode.write(self, section, value)
 end
 
 encr = s:option(ListValue, "encryption", translate("encryption"))
+encr.override_values = true
 encr:value("none", "No Encryption")
 encr:value("wep", "WEP")
 
@@ -216,17 +224,22 @@ if hwtype == "atheros" or hwtype == "mac80211" then
 	if hostapd and supplicant then
 		encr:value("psk", "WPA-PSK")
 		encr:value("psk2", "WPA2-PSK")
-		encr:value("wpa", "WPA-Radius", {mode="ap"})
-		encr:value("wpa2i", "WPA2-Radius", {mode="ap"})
+		encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode")
+		encr:value("wpa", "WPA-Radius", {mode="ap"}, {mode="sta"})
+		encr:value("wpa2", "WPA2-Radius", {mode="ap"}, {mode="sta"})
 	elseif hostapd and not supplicant then
 		encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="adhoc"})
 		encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="adhoc"})
+		encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="adhoc"})
 		encr:value("wpa", "WPA-Radius", {mode="ap"})
-		encr:value("wpa2i", "WPA2-Radius", {mode="ap"})
+		encr:value("wpa2", "WPA2-Radius", {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("mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="sta"})
+		encr:value("wpa", "WPA-EAP", {mode="sta"})
+		encr:value("wpa2", "WPA2-EAP", {mode="sta"})
 		encr.description = translate("wifi_wpareq")
 	else
 		encr.description = translate("wifi_wpareq")
@@ -234,32 +247,84 @@ if hwtype == "atheros" or hwtype == "mac80211" then
 elseif hwtype == "broadcom" then
 	encr:value("psk", "WPA-PSK")
 	encr:value("psk2", "WPA2-PSK")
+	encr:value("psk+psk2", "WPA-PSK/WPA2-PSK Mixed Mode")
 end
 
 key = s:option(Value, "key", translate("key"))
 key:depends("encryption", "wep")
 key:depends("encryption", "psk")
-key:depends("encryption", "wpa")
+key:depends({mode="ap", encryption="wpa"})
 key:depends("encryption", "psk2")
-key:depends("encryption", "wpa2i")
+key:depends({mode="ap", encryption="wpa2"})
 key.rmempty = true
 
 server = s:option(Value, "server", translate("a_w_radiussrv"))
-server:depends("encryption", "wpa")
-server:depends("encryption", "wpa2i")
+server:depends({mode="ap", encryption="wpa"})
+server:depends({mode="ap", encryption="wpa2"})
 server.rmempty = true
 
 port = s:option(Value, "port", translate("a_w_radiusport"))
-port:depends("encryption", "wpa")
-port:depends("encryption", "wpa2i")
+port:depends({mode="ap", encryption="wpa"})
+port:depends({mode="ap", encryption="wpa2"})
 port.rmempty = true
 
 
+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="wpa2"})
+	nasid.rmempty = true
+
+	eaptype = s:option(ListValue, "eap_type", translate("a_w_eaptype"))
+	eaptype:value("TLS")
+	eaptype:value("TTLS")
+	eaptype:value("PEAP")
+	eaptype:depends({mode="sta", encryption="wpa"})
+	eaptype:depends({mode="sta", encryption="wpa2"})
+
+	cacert = s:option(FileUpload, "ca_cert", translate("a_w_cacert"))
+	cacert:depends({mode="sta", encryption="wpa"})
+	cacert:depends({mode="sta", encryption="wpa2"})
+
+	privkey = s:option(FileUpload, "priv_key", translate("a_w_tlsprivkey"))
+	privkey:depends({mode="sta", eap_type="TLS", encryption="wpa2"})
+	privkey:depends({mode="sta", eap_type="TLS", encryption="wpa"})
+
+	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"})
+
+
+	auth = s:option(Value, "auth", translate("a_w_peapauth"))
+	auth:value("PAP")
+	auth:value("CHAP")
+	auth:value("MSCHAP")
+	auth:value("MSCHAPV2")
+	auth:depends({mode="sta", eap_type="PEAP", encryption="wpa2"})
+	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"})
+
+
+	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"})
+	identity:depends({mode="sta", eap_type="TTLS", encryption="wpa2"})
+	identity:depends({mode="sta", eap_type="TTLS", 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"})
+	password:depends({mode="sta", eap_type="TTLS", encryption="wpa2"})
+	password:depends({mode="sta", eap_type="TTLS", encryption="wpa"})
+end
+
+
 if hwtype == "atheros" or hwtype == "broadcom" then
 	iso = s:option(Flag, "isolate", translate("a_w_apisolation"), translate("a_w_apisolation1"))
 	iso.rmempty = true
 	iso:depends("mode", "ap")
-	
+
 	hide = s:option(Flag, "hidden", translate("a_w_hideessid"))
 	hide.rmempty = true
 	hide:depends("mode", "ap")