Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

applications/ffwizard: Rework wireless interface configuration

Browse source
This commit is contained in:
Manuel Munz 2011-01-19 21:56:07 +00:00
parent 32e908a51c
commit 6838970c59
1 changed files with 15 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
applications/luci-ffwizard/luasrc/model/cbi/ffwizard.lua
View file

@ -186,23 +186,22 @@ uci:foreach("wireless", "wifi-device",
function chan.cfgvalue(self, section) function chan.cfgvalue(self, section)
return uci:get("freifunk", "wizard", "chan_" .. device) return uci:get("freifunk", "wizard", "chan_" .. device)
end end
chan:value('default') chan:value('default')
for i = 1, 14, 1 do for _, f in ipairs(sys.wifi.channels(device)) do
chan:value(i) if not f.restricted then
end chan:value(f.channel)
for i = 36, 64, 4 do end
chan:value(i)
end
for i = 100, 140, 4 do
chan:value(i)
end end
function chan.write(self, sec, value) function chan.write(self, sec, value)
if value then if value then
uci:set("freifunk", "wizard", "chan_" .. device, value) uci:set("freifunk", "wizard", "chan_" .. device, value)
uci:save("freifunk") uci:save("freifunk")
end end
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:depends("device_" .. device, "1")
meship.rmempty = true meship.rmempty = true
function meship.cfgvalue(self, section) function meship.cfgvalue(self, section)
@ -782,50 +781,37 @@ function main.write(self, section, value)
end end
-- New Config -- New Config
-- Tune wifi device -- Tune wifi device
local ssiduci = uci:get("freifunk", community, "ssid") local ssid = uci:get("freifunk", community, "ssid") or "olsr.freifunk.net"
local ssiddot = string.find(ssiduci,'%..*')
local ssidshort
if ssiddot then
ssidshort = string.sub(ssiduci,ssiddot)
else
ssidshort = ssiduci
end
local devconfig = uci:get_all("freifunk", "wifi_device") local devconfig = uci:get_all("freifunk", "wifi_device")
util.update(devconfig, uci:get_all(external, "wifi_device") or {}) 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 channel = luci.http.formvalue("cbid.ffwizward.1.chan_" .. device)
local hwmode = "11bg" 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 channel and channel ~= "default" then
if devconfig.channel ~= channel then if devconfig.channel ~= channel then
devconfig.channel = channel devconfig.channel = channel
local chan = tonumber(channel) local chan = tonumber(channel)
if chan >= 0 and chan < 10 then if chan >= 0 and chan < 10 then
bssid = channel .. "2:CA:FF:EE:BA:BE" 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 elseif chan >= 11 and chan <= 14 then
bssid = string.format("%X",channel) .. "2:CA:FF:EE:BA:BE" bssid = string.format("%X",channel) .. "2:CA:FF:EE:BA:BE"
ssid = "ch" .. channel .. ssidshort
elseif chan >= 36 and chan <= 64 then elseif chan >= 36 and chan <= 64 then
hwmode = "11a" hwmode = "11a"
mrate = "" mrate = ""
outdoor = 0 outdoor = 0
bssid = "00:" .. channel ..":CA:FF:EE:EE" bssid = "00:" .. channel ..":CA:FF:EE:EE"
ssid = "ch" .. channel .. ssidshort
elseif chan >= 100 and chan <= 140 then elseif chan >= 100 and chan <= 140 then
hwmode = "11a" hwmode = "11a"
mrate = "" mrate = ""
outdoor = 1 outdoor = 1
bssid = "01:" .. string.sub(channel, 2) .. ":CA:FF:EE:EE" bssid = "01:" .. string.sub(channel, 2) .. ":CA:FF:EE:EE"
ssid = "ch" .. channel .. ssidshort
end end
devconfig.hwmode = hwmode devconfig.hwmode = hwmode
devconfig.outdoor = outdoor devconfig.outdoor = outdoor
end end
ssid = ssid .. " - ch" .. channel
end end
uci:tset("wireless", device, devconfig) uci:tset("wireless", device, devconfig)
-- Create wifi iface -- Create wifi iface
@ -833,13 +819,7 @@ function main.write(self, section, value)
util.update(ifconfig, uci:get_all(external, "wifi_iface") or {}) util.update(ifconfig, uci:get_all(external, "wifi_iface") or {})
ifconfig.device = device ifconfig.device = device
ifconfig.network = nif ifconfig.network = nif
if ssid then ifconfig.ssid = ssid
-- 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.bssid = bssid ifconfig.bssid = bssid
ifconfig.encryption="none" ifconfig.encryption="none"
-- Read Preset -- Read Preset
@ -947,8 +927,8 @@ function main.write(self, section, value)
device =device, device =device,
mode ="ap", mode ="ap",
encryption ="none", encryption ="none",
network =nif.."dhcp", network =nif .. "dhcp",
ssid ="AP"..ssidshort ssid ="AP-" .. ssid
}) })
if has_radvd then if has_radvd then
uci:section("radvd", "interface", nil, { uci:section("radvd", "interface", nil, {