applications/meshwizard: Fox error when iwinfo.freqlist is empty

[project/luci.git] / applications / luci-meshwizard / luasrc / model / cbi / freifunk / meshwizard.lua

diff --git a/applications/luci-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua b/applications/luci-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua
index f4478f6..8cb0822 100644 (file)
--- a/applications/luci-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua
+++ b/applications/luci-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua
@@ -10,6 +10,7 @@ local mesh_network = ip.IPv4(uci:get_first(community, "community", "mesh_network
 local community_ipv6 = uci:get_first(community, "community", "ipv6") or 0
 local community_ipv6mode = uci:get_first(community, "community", "ipv6_config") or "static"
 local meshkit_ipv6 = uci:get("meshwizard", "ipv6", "enabled") or 0
+local community_vap = uci:get_first(community, "community", "vap") or 0
 
 m = Map("meshwizard", translate("Wizard"), translate("This wizard will assist you in setting up your router for Freifunk " ..
        "or another similar wireless community network."))
@@ -117,7 +118,7 @@ uci:foreach("wireless", "wifi-device", function(section)
        chan:value('default')
 
        local iwinfo = sys.wifi.getiwinfo(device)
-       if iwinfo then
+       if iwinfo and iwinfo.freqlist then
                for _, f in ipairs(iwinfo.freqlist) do
                        if not f.restricted then
                                chan:value(f.channel)
@@ -142,11 +143,18 @@ uci:foreach("wireless", "wifi-device", function(section)
        end
 
        -- Enable VAP
-       if hwtype == "atheros" then
+       local supports_vap = 0
+       if sys.call("/usr/bin/meshwizard/helpers/supports_vap.sh " .. device .. " " .. hwtype) == 0 then
+               supports_vap = 1
+       end
+       if supports_vap == 1 then
                local vap = n:taboption(device, Flag, device .. "_vap", translate("Virtual Access Point (VAP)"),
                        translate("This will setup a new virtual wireless interface in Access Point mode."))
                vap:depends(device .. "_dhcp", "1")
                 vap.rmempty = true
+                if community_vap == "1" then
+                       vap.default = "1"
+               end
        end
 end)