Changeset 8782

Timestamp:

06/26/12 22:49:18 (11 months ago)

Author:

jow

Message:

modules/admin-full: extend wifi model to allow assigning multiple networks

Files:

• luci/trunk/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua (modified) (4 diffs)

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

@@ -15 +15 @@
 local wa = require "luci.tools.webadmin"
 local nw = require "luci.model.network"
+local ut = require "luci.util"
 local fs = require "nixio.fs"
 
@@ -416 +417 @@
 network.rmempty = true
 network.template = "cbi/network_netlist"
-network.widget = "radio"
+network.widget = "checkbox"
+network.novirtual = true
 
 function network.write(self, section, value)
@@ -431 +433 @@
             end
         else
-            local n = nw:get_network(value)
-            if n then
-                n:set("type", "bridge")
-                n:add_interface(i)
+            local v
+            for _, v in ipairs(i:get_networks()) do
+                v:del_interface(i)
+            end
+            for v in ut.imatch(value) do
+                local n = nw:get_network(v)
+                if n then
+                    if not n:is_empty() then
+                        n:set("type", "bridge")
+                    end
+                    n:add_interface(i)
+                end
             end
         end
@@ -719 +729 @@
     local hostapd = fs.access("/usr/sbin/hostapd")
 
-    -- Probe EAP support                                                                                                
-    local has_ap_eap  = (os.execute("hostapd -veap >/dev/null 2>/dev/null") == 0)                                                        
+    -- Probe EAP support
+    local has_ap_eap  = (os.execute("hostapd -veap >/dev/null 2>/dev/null") == 0)
     local has_sta_eap = (os.execute("wpa_supplicant -veap >/dev/null 2>/dev/null") == 0)