From: pmelange <isprotejesvalkata@gmail.com>
Date: Mon, 5 Nov 2018 16:20:16 +0000 (+0100)
Subject: luci-app-olsr: convert olsr.lua and overview.htm to new json plugin
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2dd31c4ff2c76958a7cfb53f1c18013f3a9bf1aa;p=oweals%2Fluci.git

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

Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
---

diff --git a/applications/luci-app-olsr/luasrc/controller/olsr.lua b/applications/luci-app-olsr/luasrc/controller/olsr.lua
index c5fb2b2a5..ff4a248da 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 f205edc16..7bfd73df2 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'