X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Ffreifunk%2Fluasrc%2Fcontroller%2Ffreifunk%2Ffreifunk.lua;h=9769ea08bcd6c3e54b7da634bca3caf0294c5ff5;hp=3d4bf1cb75b3480cb61de8d7a82cb4f9e319cb46;hb=76457655ef5f098420af793740f03f6e2bdc80a0;hpb=c32a729fb2c88aad7bfb4d37eed52dbf1d8c8b17 diff --git a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua index 3d4bf1cb7..9769ea08b 100644 --- a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua +++ b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua @@ -19,6 +19,8 @@ function index() local page = node() page.lock = true page.target = alias("freifunk") + page.subindex = true + page.index = false local page = node("freifunk") page.title = "Freifunk" @@ -27,61 +29,184 @@ function index() page.setuser = "nobody" page.setgroup = "nogroup" page.i18n = "freifunk" - + page.index = true + local page = node("freifunk", "index") page.target = template("freifunk/index") page.title = "Übersicht" page.order = 10 - + page.indexignore = true + local page = node("freifunk", "index", "contact") page.target = template("freifunk/contact") page.title = "Kontakt" - - - local page = node("freifunk", "status") + + entry({"freifunk", "status"}, alias("freifunk", "status", "status"), "Status", 20) + + local page = node("freifunk", "status", "status") page.target = form("freifunk/public_status") - page.title = "Status" + page.title = i18n("overview") page.order = 20 page.i18n = "admin-core" page.setuser = false page.setgroup = false - + + entry({"freifunk", "status.json"}, call("jsonstatus")) + entry({"freifunk", "status", "zeroes"}, call("zeroes"), "Testdownload") + assign({"freifunk", "olsr"}, {"admin", "status", "olsr"}, "OLSR", 30) - - if luci.fs.isfile("/etc/config/luci_statistics") then + + if luci.fs.access("/etc/config/luci_statistics") then assign({"freifunk", "graph"}, {"admin", "statistics", "graph"}, i18n("stat_statistics", "Statistiken"), 40) end - + assign({"mini", "freifunk"}, {"admin", "freifunk"}, "Freifunk", 15) entry({"admin", "freifunk"}, alias("admin", "freifunk", "index"), "Freifunk", 15) local page = node("admin", "freifunk", "index") page.target = cbi("freifunk/freifunk") page.title = "Freifunk" page.order = 30 - + local page = node("admin", "freifunk", "contact") page.target = cbi("freifunk/contact") page.title = "Kontakt" page.order = 40 + + entry({"freifunk", "map"}, template("freifunk-map/frame"), i18n("freifunk_map", "Karte"), 50) + entry({"freifunk", "map", "content"}, template("freifunk-map/map"), nil, 51) end -function action_status() +local function fetch_olsrd() + local sys = require "luci.sys" + local util = require "luci.util" + local table = require "table" + local rawdata = sys.httpget("http://127.0.0.1:2006/") + + if #rawdata == 0 then + if luci.fs.access("/proc/net/ipv6_route", "r") then + rawdata = sys.httpget("http://[::1]:2006/") + if #rawdata == 0 then + return nil + end + else + return nil + end + end + local data = {} - - data.system, data.model, data.memtotal, data.memcached, data.membuffers, data.memfree = luci.sys.sysinfo() - data.perc_memfree = math.floor((data.memfree/data.memtotal)*100) - data.perc_membuffers = math.floor((data.membuffers/data.memtotal)*100) - data.perc_memcached = math.floor((data.memcached/data.memtotal)*100) - - data.wifi = luci.sys.wifi.getiwconfig() - - data.routes = {} - for i, r in pairs(luci.sys.net.routes()) do - if r.Destination == "00000000" then - table.insert(data.routes, r) + + local tables = util.split(util.trim(rawdata), "\r?\n\r?\n", nil, true) + + + for i, tbl in ipairs(tables) do + local lines = util.split(tbl, "\r?\n", nil, true) + local name = table.remove(lines, 1):sub(8) + local keys = util.split(table.remove(lines, 1), "\t") + local split = #keys - 1 + + data[name] = {} + + for j, line in ipairs(lines) do + local fields = util.split(line, "\t", split) + data[name][j] = {} + for k, key in pairs(keys) do + data[name][j][key] = fields[k] + end + + if data[name][j].Linkcost then + data[name][j].LinkQuality, + data[name][j].NLQ, + data[name][j].ETX = + data[name][j].Linkcost:match("([%w.]+)/([%w.]+)[%s]+([%w.]+)") + end end end + return data +end + +function zeroes() + local string = require "string" + local http = require "luci.http" + local zeroes = string.rep(string.char(0), 8192) + local cnt = 0 + local lim = 1024 * 1024 * 1024 - luci.template.render("public_status/index", data) -end \ No newline at end of file + http.prepare_content("application/x-many-zeroes") + + while cnt < lim do + http.write(zeroes) + cnt = cnt + #zeroes + end +end + +function jsonstatus() + local root = {} + local sys = require "luci.sys" + local uci = require "luci.model.uci" + local util = require "luci.util" + local http = require "luci.http" + local json = require "luci.json" + local ltn12 = require "luci.ltn12" + local version = require "luci.version" + local webadmin = require "luci.tools.webadmin" + + local cursor = uci.cursor_state() + + local ffzone = webadmin.firewall_find_zone("freifunk") + local ffznet = ffzone and cursor:get("firewall", ffzone, "network") + local ffwifs = ffznet and util.split(ffznet, " ") or {} + + + root.protocol = 1 + + root.system = { + uptime = {sys.uptime()}, + loadavg = {sys.loadavg()}, + sysinfo = {sys.sysinfo()}, + hostname = sys.hostname() + } + + root.firmware = { + luciname=version.luciname, + luciversion=version.luciversion, + distname=version.distname, + distversion=version.distversion + } + + root.freifunk = {} + cursor:foreach("freifunk", "public", function(s) + root.freifunk[s[".name"]] = s + end) + + cursor:foreach("system", "system", function(s) + root.geo = { + latitude = s.latitude, + longitude = s.longitude + } + end) + + root.network = {} + root.wireless = {devices = {}, interfaces = {}, status = {}} + local wifs = root.wireless.interfaces + local wifidata = luci.sys.wifi.getiwconfig() or {} + local netdata = luci.sys.net.deviceinfo() or {} + + for _, vif in ipairs(ffwifs) do + root.network[vif] = cursor:get_all("network", vif) + root.wireless.devices[vif] = cursor:get_all("wireless", vif) + cursor:foreach("wireless", "wifi-iface", function(s) + if s.device == vif and s.network == vif then + wifs[#wifs+1] = s + if s.ifname then + root.wireless.status[s.ifname] = wifidata[s.ifname] + end + end + end) + end + + root.olsrd = fetch_olsrd() + + http.prepare_content("application/json") + ltn12.pump.all(json.Encoder(root):source(), http.write) +end