diff options
| author | pmelange <isprotejesvalkata@gmail.com> | 2018-11-05 17:20:16 +0100 |
|---|---|---|
| committer | pmelange <isprotejesvalkata@gmail.com> | 2018-11-07 18:41:58 +0100 |
| commit | 6ef3a00f6bb8e7084aec6ff47375a77d77eee2d2 (patch) | |
| tree | bb454a2170e824a204f9f5c27e9f91b041dca627 | |
| parent | 4fc3ab47378df1ffdf766df2c514122a0217a2de (diff) | |
luci-app-olsr: convert olsr.lua and overview.htm to new json plugin
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
| -rw-r--r-- | applications/luci-app-olsr/luasrc/controller/olsr.lua | 4 | ||||
| -rw-r--r-- | applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/applications/luci-app-olsr/luasrc/controller/olsr.lua b/applications/luci-app-olsr/luasrc/controller/olsr.lua index c5fb2b2a53..ff4a248dae 100644 --- a/applications/luci-app-olsr/luasrc/controller/olsr.lua +++ b/applications/luci-app-olsr/luasrc/controller/olsr.lua @@ -87,8 +87,8 @@ function action_json() 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 - jsonreq4 = utl.exec("(echo /status | 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) + jsonreq4 = utl.exec("(echo /all | nc 127.0.0.1 %d | sed -n '/^[}{ ]/p') 2>/dev/null" % v4_port) + jsonreq6 = utl.exec("(echo /all | nc ::1 %d | sed -n '/^[}{ ]/p') 2>/dev/null" % v6_port) http.prepare_content("application/json") if not jsonreq4 or jsonreq4 == "" then jsonreq4 = "{}" diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm index f205edc16d..7bfd73df20 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm @@ -61,12 +61,12 @@ XHR.poll(10, '<%=REQUEST_URI%>/json', { }, if (e = document.getElementById('version')) var version; var date; - if (info.v4.config.olsrdVersion != undefined) { - version = info.v4.config.olsrdVersion - date = info.v4.config.olsrdBuildDate - } else if (info.v6.config.olsrdVersion != undefined) { - version = info.v6.config.olsrdVersion - date = info.v6.config.olsrdBuildDate + if (info.v4.version.version != undefined) { + version = info.v4.version.version + date = info.v4.version.date + } else if (info.v6.version.version != undefined) { + version = info.v6.version.version + date = info.v6.version.date } else { version = 'unknown' date = 'unknown' |