applications/ffwizard: Rework wireless interface configuration

diff --git a/applications/luci-ffwizard/luasrc/model/cbi/ffwizard.lua b/applications/luci-ffwizard/luasrc/model/cbi/ffwizard.lua
index d290d93..d37a55b 100644 (file)
--- a/applications/luci-ffwizard/luasrc/model/cbi/ffwizard.lua
+++ b/applications/luci-ffwizard/luasrc/model/cbi/ffwizard.lua
@@ -186,23 +186,22 @@ uci:foreach("wireless", "wifi-device",
                        function chan.cfgvalue(self, section)
                                return uci:get("freifunk", "wizard", "chan_" .. device)
                        end
                        function chan.cfgvalue(self, section)
                                return uci:get("freifunk", "wizard", "chan_" .. device)
                        end

+

                        chan:value('default')
                        chan:value('default')

-                       for i = 1, 14, 1 do
-                               chan:value(i)
-                       end
-                       for i = 36, 64, 4 do
-                               chan:value(i)
-                       end
-                       for i = 100, 140, 4 do
-                               chan:value(i)
+                       for _, f in ipairs(sys.wifi.channels(device)) do
+                               if not f.restricted then
+                                       chan:value(f.channel)
+                               end

                        end
                        end

+

                        function chan.write(self, sec, value)
                                if value then
                                        uci:set("freifunk", "wizard", "chan_" .. device, value)
                                        uci:save("freifunk")
                                end
                        end
                        function chan.write(self, sec, value)
                                if value then
                                        uci:set("freifunk", "wizard", "chan_" .. device, value)
                                        uci:save("freifunk")
                                end
                        end

-               local meship = f:field(Value, "meship_" .. device, device:upper() .. "  Mesh IP Adresse einrichten", "Ihre Mesh IP Adresse erhalten Sie von der Freifunk Gemeinschaft in Ihrer Nachbarschaft. Es ist eine netzweit eindeutige Identifikation, z.B. 104.1.1.1.")
+
+                       local meship = f:field(Value, "meship_" .. device, device:upper() .. "  Mesh IP Adresse einrichten", "Ihre Mesh IP Adresse erhalten Sie von der Freifunk Gemeinschaft in Ihrer Nachbarschaft. Es ist eine netzweit eindeutige Identifikation, z.B. 104.1.1.1.")

                        meship:depends("device_" .. device, "1")
                        meship.rmempty = true
                        function meship.cfgvalue(self, section)
                        meship:depends("device_" .. device, "1")
                        meship.rmempty = true
                        function meship.cfgvalue(self, section)


@@ -782,50 +781,37 @@ function main.write(self, section, value)
                end
                -- New Config
                -- Tune wifi device
                end
                -- New Config
                -- Tune wifi device

-               local ssiduci = uci:get("freifunk", community, "ssid")
-               local ssiddot = string.find(ssiduci,'%..*')
-               local ssidshort
-               if ssiddot then
-                       ssidshort = string.sub(ssiduci,ssiddot)
-               else
-                       ssidshort = ssiduci
-               end
+               local ssid = uci:get("freifunk", community, "ssid") or "olsr.freifunk.net"

                local devconfig = uci:get_all("freifunk", "wifi_device")
                util.update(devconfig, uci:get_all(external, "wifi_device") or {})
                local devconfig = uci:get_all("freifunk", "wifi_device")
                util.update(devconfig, uci:get_all(external, "wifi_device") or {})

-               local ssid = uci:get("freifunk", community, "ssid")

                local channel = luci.http.formvalue("cbid.ffwizward.1.chan_" .. device)
                local hwmode = "11bg"
                local channel = luci.http.formvalue("cbid.ffwizward.1.chan_" .. device)
                local hwmode = "11bg"

-               local bssid = "02:CA:FF:EE:BA:BE"
+               local bssid = uci:get_all(external, "wifi_iface", "bssid") or "02:CA:FF:EE:BA:BE"

                local mrate = 5500
                local mrate = 5500

+               -- set bssid, see https://kifuse02.pberg.freifunk.net/moin/channel-bssid-essid for schema

                if channel and channel ~= "default" then
                        if devconfig.channel ~= channel then
                                devconfig.channel = channel
                                local chan = tonumber(channel)
                                if chan >= 0 and chan < 10 then
                                        bssid = channel .. "2:CA:FF:EE:BA:BE"
                if channel and channel ~= "default" then
                        if devconfig.channel ~= channel then
                                devconfig.channel = channel
                                local chan = tonumber(channel)
                                if chan >= 0 and chan < 10 then
                                        bssid = channel .. "2:CA:FF:EE:BA:BE"

-                                       ssid = "ch" .. channel .. ssidshort
-                               elseif chan == 10 then
-                                       bssid = "02:CA:FF:EE:BA:BE"
-                                       ssid = "ch" .. channel .. ssidshort

                                elseif chan >= 11 and chan <= 14 then
                                        bssid = string.format("%X",channel) .. "2:CA:FF:EE:BA:BE"
                                elseif chan >= 11 and chan <= 14 then
                                        bssid = string.format("%X",channel) .. "2:CA:FF:EE:BA:BE"

-                                       ssid = "ch" .. channel .. ssidshort

                                elseif chan >= 36 and chan <= 64 then
                                        hwmode = "11a"
                                        mrate = ""
                                        outdoor = 0
                                        bssid = "00:" .. channel ..":CA:FF:EE:EE"
                                elseif chan >= 36 and chan <= 64 then
                                        hwmode = "11a"
                                        mrate = ""
                                        outdoor = 0
                                        bssid = "00:" .. channel ..":CA:FF:EE:EE"

-                                       ssid = "ch" .. channel .. ssidshort

                                elseif chan >= 100 and chan <= 140 then
                                        hwmode = "11a"
                                        mrate = ""
                                        outdoor = 1
                                        bssid = "01:" .. string.sub(channel, 2) .. ":CA:FF:EE:EE"
                                elseif chan >= 100 and chan <= 140 then
                                        hwmode = "11a"
                                        mrate = ""
                                        outdoor = 1
                                        bssid = "01:" .. string.sub(channel, 2) .. ":CA:FF:EE:EE"

-                                       ssid = "ch" .. channel .. ssidshort

                                end
                                devconfig.hwmode = hwmode
                                devconfig.outdoor = outdoor
                        end
                                end
                                devconfig.hwmode = hwmode
                                devconfig.outdoor = outdoor
                        end

+                       ssid = ssid .. " - ch" .. channel

                end
                uci:tset("wireless", device, devconfig)
                -- Create wifi iface
                end
                uci:tset("wireless", device, devconfig)
                -- Create wifi iface


@@ -833,13 +819,7 @@ function main.write(self, section, value)
                util.update(ifconfig, uci:get_all(external, "wifi_iface") or {})
                ifconfig.device = device
                ifconfig.network = nif
                util.update(ifconfig, uci:get_all(external, "wifi_iface") or {})
                ifconfig.device = device
                ifconfig.network = nif

-               if ssid then
-                       -- See Table https://kifuse02.pberg.freifunk.net/moin/channel-bssid-essid 
-                       ifconfig.ssid = ssid
-               else
-                       ifconfig.ssid = "olsr.freifunk.net"
-               end
-               -- See Table https://kifuse02.pberg.freifunk.net/moin/channel-bssid-essid       
+               ifconfig.ssid = ssid

                ifconfig.bssid = bssid
                ifconfig.encryption="none"
                -- Read Preset 
                ifconfig.bssid = bssid
                ifconfig.encryption="none"
                -- Read Preset 


@@ -947,8 +927,8 @@ function main.write(self, section, value)
                                                device     =device,
                                                mode       ="ap",
                                                encryption ="none",
                                                device     =device,
                                                mode       ="ap",
                                                encryption ="none",

-                                               network    =nif.."dhcp",
-                                               ssid       ="AP"..ssidshort
+                                               network    =nif .. "dhcp",
+                                               ssid       ="AP-" .. ssid

                                        })
                                        if has_radvd then
                                                uci:section("radvd", "interface", nil, {
                                        })
                                        if has_radvd then
                                                uci:section("radvd", "interface", nil, {