Changeset 4293

Timestamp:

03/05/09 00:43:45 (4 years ago)

Author:

jow

Message:

modules/admin-{mini,full}: implement wpa-wpa2 mixed mode
modules/admin-core: extend uci schema to cover mixed mode and mesh mode (802.11s)

Location:

luci/trunk/modules

Files:

• admin-core/root/lib/uci/schema/default/wireless (modified) (2 diffs)
• admin-full/luasrc/model/cbi/admin_network/wifi.lua (modified) (4 diffs)
• admin-mini/luasrc/model/cbi/mini/wifi.lua (modified) (8 diffs)

luci/trunk/modules/admin-core/root/lib/uci/schema/default/wireless

@@ -220 +220 @@
     option value 'wds'
     option title 'WDS'
+
+config enum
+    option variable 'wireless.wifi-iface.mode'
+    option value 'mesh'
+    option title 'Mesh (802.11s)'
 
 config variable
@@ -454 +459 @@
     list depends 'encryption=psk2'
     list depends 'encryption=wpa2i,mode=ap'
+    list depends 'encryption=psk+psk2'
+    list depends 'encryption=mixed'
 
 config variable

luci/trunk/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua

@@ -292 +292 @@
         encr:value("psk", "WPA-PSK")
         encr:value("psk2", "WPA2-PSK")
+        encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode")
         encr:value("wpa", "WPA-EAP", {mode="ap"}, {mode="sta"})
         encr:value("wpa2i", "WPA2-EAP", {mode="ap"}, {mode="sta"})
@@ -297 +298 @@
         encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="adhoc"}, {mode="ahdemo"})
         encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="adhoc"}, {mode="ahdemo"})
+        encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="adhoc"}, {mode="ahdemo"})
         encr:value("wpa", "WPA-EAP", {mode="ap"})
         encr:value("wpa2i", "WPA2-EAP", {mode="ap"})
@@ -303 +305 @@
         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("wpa2i", "WPA2-EAP", {mode="sta"})
@@ -312 +315 @@
     encr:value("psk", "WPA-PSK")
     encr:value("psk2", "WPA2-PSK")
+    encr:value("psk+psk2", "WPA-PSK/WPA2-PSK Mixed Mode")
 end
 

luci/trunk/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua

@@ -61 +61 @@
 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
@@ -119 +119 @@
         or self.map:get(section, "Frequency")
         or "-"
-end 
+end
 
 t2:option(DummyValue, "Encryption key", translate("iwscan_encr"))
@@ -181 +181 @@
         table.insert(devs, section[".name"])
     end)
-    
+
 if #devs > 1 then
     device = s:option(DummyValue, "device", translate("device"))
@@ -225 +225 @@
         encr:value("psk", "WPA-PSK")
         encr:value("psk2", "WPA2-PSK")
+        encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode")
         encr:value("wpa", "WPA-Radius", {mode="ap"})
         encr:value("wpa2i", "WPA2-Radius", {mode="ap"})
@@ -230 +231 @@
         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"})
@@ -236 +238 @@
         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.description = translate("wifi_wpareq")
     else
@@ -243 +246 @@
     encr:value("psk", "WPA-PSK")
     encr:value("psk2", "WPA2-PSK")
+    encr:value("psk+psk2", "WPA-PSK/WPA2-PSK Mixed Mode")
 end
 
@@ -268 +272 @@
     iso.rmempty = true
     iso:depends("mode", "ap")
-    
+
     hide = s:option(Flag, "hidden", translate("a_w_hideessid"))
     hide.rmempty = true