From f79727ec0405abe2ed0c43e33aadcf4776b10a1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karsten=20B=C3=B6ddeker?= <freifunk@kb-light.de>
Date: Mon, 19 Sep 2016 20:39:03 +0200
Subject: [PATCH] ffho-status-page: improvements
lib/gluon/status-page/www/cgi-bin/status:
- show gluon-version
- list ip protocol if connected to a gateway
remove obsolete lib/gluon/status-page/www/cgi-bin/interfaces
---
.../gluon/status-page/www/cgi-bin/interfaces | 24 -------------------
.../lib/gluon/status-page/www/cgi-bin/status | 21 ++++++++++++----
2 files changed, 16 insertions(+), 29 deletions(-)
delete mode 100755 ffho/ffho-status-page/files/lib/gluon/status-page/www/cgi-bin/interfaces
diff --git a/ffho/ffho-status-page/files/lib/gluon/status-page/www/cgi-bin/interfaces b/ffho/ffho-status-page/files/lib/gluon/status-page/www/cgi-bin/interfaces
deleted file mode 100755
index 4eabf81..0000000
--- a/ffho/ffho-status-page/files/lib/gluon/status-page/www/cgi-bin/interfaces
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/lua
-
-util = require 'luci.util'
-json = require 'luci.jsonc'
-fs = require 'nixio.fs'
-
-io.write("Access-Control-Allow-Origin: *\n")
-io.write("Content-type: application/json\n\n")
-
-list = util.exec('batctl if')
-
-interfaces = {}
-
-for _, line in ipairs(util.split(list)) do
- ifname = line:match('^(.-):')
- if ifname ~= nil then
- pcall(function()
- local address = util.trim(fs.readfile('/sys/class/net/' .. ifname .. '/address'))
- interfaces[ifname] = { address = address }
- end)
- end
-end
-
-io.write(json.stringify(interfaces))
diff --git a/ffho/ffho-status-page/files/lib/gluon/status-page/www/cgi-bin/status b/ffho/ffho-status-page/files/lib/gluon/status-page/www/cgi-bin/status
index 94e1907..5b56da5 100755
--- a/ffho/ffho-status-page/files/lib/gluon/status-page/www/cgi-bin/status
+++ b/ffho/ffho-status-page/files/lib/gluon/status-page/www/cgi-bin/status
@@ -14,6 +14,7 @@ local uci = require('luci.model.uci').cursor()
local hostname = sys.hostname()
local model = platform_info.get_model()
local release = util.trim(fs.readfile("/lib/gluon/release") or "")
+local version = util.trim(fs.readfile("/lib/gluon/gluon-version") or "")
local primary_mac = require('gluon.sysconfig').primary_mac
local nodeid = require('gluon.util').node_id()
@@ -40,7 +41,7 @@ for k, v in data:gmatch('([^\n:]+):%s*(%d+) kB') do
fields[k] = tonumber(v)
end
-function location()
+local function location()
local text = 'none'
local locationid = uci:get_first('gluon-node-info', 'location')
if locationid then
@@ -56,11 +57,11 @@ function location()
return text
end
-function escape_html(s)
+local function escape_html(s)
return (s:gsub('&', '&'):gsub('<', '<'):gsub('>', '>'):gsub('"', '"'))
end
-function neighbours(ifname)
+local function neighbours(ifname)
local info = util.exec("gluon-neighbour-info -d ff02::2:1001 -p 1001 -r nodeinfo -t 3 -i " .. ifname)
local macs = {}
for _, line in ipairs(util.split(info)) do
@@ -91,6 +92,16 @@ function neighbours(ifname)
return macs
end
+local function ip_proto(address)
+ if address:match("%.") then
+ return "IPv4"
+ end
+ if address:match(":") then
+ return "IPv6"
+ end
+ return "???"
+end
+
io.write("Content-type: text/html\n\n")
io.write("<!DOCTYPE html>\n")
io.write("<html>")
@@ -106,7 +117,7 @@ io.write("<pre>")
io.write("Community: " .. escape_html(site.site_name) .. "\n")
io.write("Model: " .. escape_html(model) .. "\n")
-io.write("Firmware: " .. escape_html(release) .. "\n")
+io.write("Firmware: " .. escape_html(release) .. " / " .. escape_html(version) .. "\n")
io.write("MAC: " .. escape_html(primary_mac) .. "\n")
io.write("Contact: " .. escape_html(contact) .. "\n")
io.write("Uptime: " .. escape_html(util.trim(sys.exec("uptime | sed 's/^ \+//'"))) .. "\n")
@@ -188,7 +199,7 @@ if stat then
io.write(string.format("%s: ", escape_html(peer.name)))
if peer.connection then
- io.write(string.format("connected for %.3f seconds\n", peer.connection.established/1000))
+ io.write(string.format("connected for %.3f seconds via %s\n", peer.connection.established/1000, ip_proto(peer.address)))
else
io.write("not connected\n")
end
--
GitLab