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

applications/luci-olsr: Fix overview page for ipv4 or ipv6 only

Browse source
This commit is contained in:
Manuel Munz 2013-03-26 10:30:41 +00:00
parent 0fecd14785
commit 276a93867c
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
applications/luci-olsr/luasrc/controller/olsr.lua
View file

@ -108,8 +108,16 @@ function action_json()
local jsonreq4 = utl.exec("echo /status | nc 127.0.0.1 9090") local jsonreq4 = utl.exec("echo /status | nc 127.0.0.1 9090")
local jsonreq6 = utl.exec("echo /status | nc ::1 9090") local jsonreq6 = utl.exec("echo /status | nc ::1 9090")
http.prepare_content("application/json") http.prepare_content("application/json")
if #jsonreq4 < 1 then
jsonreq4 = "{}"
end
if #jsonreq6 < 1 then
jsonreq6 = "{}"
end
http.write("{v4:" .. jsonreq4 .. ", v6:" .. jsonreq6 .. "}") http.write("{v4:" .. jsonreq4 .. ", v6:" .. jsonreq6 .. "}")
end end

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

@ -72,7 +72,6 @@ XHR.poll(10, '<%=REQUEST_URI%>/json', { },
} else if (info.v6.config.olsrdVersion != undefined) { } else if (info.v6.config.olsrdVersion != undefined) {
version = info.v6.config.olsrdVersion version = info.v6.config.olsrdVersion
date = info.v6.config.olsrdBuildDate date = info.v6.config.olsrdBuildDate
} else { } else {
version = 'unknown' version = 'unknown'
date = 'unknown' date = 'unknown'
@ -81,10 +80,10 @@ XHR.poll(10, '<%=REQUEST_URI%>/json', { },
if (e = document.getElementById('nr_neigh')) if (e = document.getElementById('nr_neigh'))
var neigh = 0; var neigh = 0;
if (info.v4.links.length != undefined) { if (info.v4.links != undefined) {
neigh = neigh + info.v4.links.length neigh = neigh + info.v4.links.length
} }
if (info.v6.links.length != undefined) { if (info.v6.links != undefined) {
neigh = neigh + info.v6.links.length neigh = neigh + info.v6.links.length
} }
e.innerHTML = neigh; e.innerHTML = neigh;
@ -92,10 +91,10 @@ XHR.poll(10, '<%=REQUEST_URI%>/json', { },
if (e = document.getElementById('nr_hna')) if (e = document.getElementById('nr_hna'))
var hna = 0; var hna = 0;
if (info.v4.hna.length != undefined) { if (info.v4.hna != undefined) {
hna = hna + info.v4.hna.length hna = hna + info.v4.hna.length
} }
if (info.v6.hna.length != undefined) { if (info.v6.hna != undefined) {
hna = hna + info.v6.hna.length hna = hna + info.v6.hna.length
} }
e.innerHTML = hna; e.innerHTML = hna;
@ -103,10 +102,10 @@ XHR.poll(10, '<%=REQUEST_URI%>/json', { },
if (e = document.getElementById('nr_ifaces')) if (e = document.getElementById('nr_ifaces'))
var nrint = 0 var nrint = 0
if (info.v4.interfaces.length != undefined) { if (info.v4.interfaces != undefined) {
nrint = nrint + info.v4.interfaces.length nrint = nrint + info.v4.interfaces.length
} }
if (info.v6.interfaces.length != undefined) { if (info.v6.interfaces != undefined) {
nrint = nrint + info.v6.interfaces.length nrint = nrint + info.v6.interfaces.length
} }
e.innerHTML = nrint e.innerHTML = nrint
@ -125,7 +124,7 @@ XHR.poll(10, '<%=REQUEST_URI%>/json', { },
return false; return false;
} }
if (info.v4.topology.length != undefined) { if (info.v4.topology != undefined) {
topo = topo + info.v4.topology.length; topo = topo + info.v4.topology.length;
for (var i = 0; i < info.v4.topology.length; i++) { for (var i = 0; i < info.v4.topology.length; i++) {
var destip = info.v4.topology[i].destinationIP var destip = info.v4.topology[i].destinationIP
@ -135,7 +134,7 @@ XHR.poll(10, '<%=REQUEST_URI%>/json', { },
} }
} }
if (info.v6.topology.length != undefined) { if (info.v6.topology != undefined) {
topo = topo + info.v6.topology.length topo = topo + info.v6.topology.length
for (var i = 0; i < info.v6.topology.length; i++) { for (var i = 0; i < info.v6.topology.length; i++) {
var destip = info.v6.topology[i].destinationIP var destip = info.v6.topology[i].destinationIP