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

luci-app-olsr: convert olsr.lua and overview.htm to new json plugin

Browse source 
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
This commit is contained in:
pmelange 2018-11-05 17:20:16 +01:00
parent 4fc3ab4737
commit 6ef3a00f6b
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
applications/luci-app-olsr/luasrc/controller/olsr.lua
View file

@ -87,8 +87,8 @@ function action_json()
local v4_port = tonumber(uci:get("olsrd", "olsrd_jsoninfo", "port") or "") or 9090 local v4_port = tonumber(uci:get("olsrd", "olsrd_jsoninfo", "port") or "") or 9090
local v6_port = tonumber(uci:get("olsrd6", "olsrd_jsoninfo", "port") or "") or 9090 local v6_port = tonumber(uci:get("olsrd6", "olsrd_jsoninfo", "port") or "") or 9090
jsonreq4 = utl.exec("(echo /status | nc 127.0.0.1 %d | sed -n '/^[}{ ]/p') 2>/dev/null" % v4_port) jsonreq4 = utl.exec("(echo /all | nc 127.0.0.1 %d | sed -n '/^[}{ ]/p') 2>/dev/null" % v4_port)
jsonreq6 = utl.exec("(echo /status | nc ::1 %d | sed -n '/^[}{ ]/p') 2>/dev/null" % v6_port) jsonreq6 = utl.exec("(echo /all | nc ::1 %d | sed -n '/^[}{ ]/p') 2>/dev/null" % v6_port)
http.prepare_content("application/json") http.prepare_content("application/json")
if not jsonreq4 or jsonreq4 == "" then if not jsonreq4 or jsonreq4 == "" then
jsonreq4 = "{}" jsonreq4 = "{}"

12
applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm
View file

@ -61,12 +61,12 @@ XHR.poll(10, '<%=REQUEST_URI%>/json', { },
if (e = document.getElementById('version')) if (e = document.getElementById('version'))
var version; var version;
var date; var date;
if (info.v4.config.olsrdVersion != undefined) { if (info.v4.version.version != undefined) {
version = info.v4.config.olsrdVersion version = info.v4.version.version
date = info.v4.config.olsrdBuildDate date = info.v4.version.date
} else if (info.v6.config.olsrdVersion != undefined) { } else if (info.v6.version.version != undefined) {
version = info.v6.config.olsrdVersion version = info.v6.version.version
date = info.v6.config.olsrdBuildDate date = info.v6.version.date
} else { } else {
version = 'unknown' version = 'unknown'
date = 'unknown' date = 'unknown'