From 77af204dea8c7872ed6a695ddb155fbe77a4a4dd Mon Sep 17 00:00:00 2001
From: Florian Eckert <fe@dev.tdt.de>
Date: Thu, 20 Dec 2018 14:59:42 +0100
Subject: luci-app-mwan3: add tracking methode nping

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
---
 applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'applications/luci-app-mwan3/luasrc')

diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
index ed9d94ac7e..a1880b3a9e 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
@@ -34,6 +34,10 @@ track_ip.datatype = "host"
 track_method = mwan_interface:option(ListValue, "track_method", translate("Tracking method"))
 track_method.default = "ping"
 track_method:value("ping")
+track_method:value("nping-tcp")
+track_method:value("nping-udp")
+track_method:value("nping-icmp")
+track_method:value("nping-arp")
 track_method:value("arping")
 track_method:value("httping")
 
-- 
cgit v1.2.3


From f9b634f95b06d2618a3742089cd64e80da0149fd Mon Sep 17 00:00:00 2001
From: Florian Eckert <fe@dev.tdt.de>
Date: Fri, 21 Dec 2018 10:00:26 +0100
Subject: luci-app-mwan3: add uptime/downtime to status page

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
---
 .../luasrc/view/mwan/overview_status_interface.htm | 26 +++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'applications/luci-app-mwan3/luasrc')

diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm b/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm
index 259f3c975b..2e7b490f4f 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm
@@ -5,6 +5,17 @@
 -%>
 
 <script type="text/javascript">//<![CDATA[
+
+function secondsToString(time) {
+	var seconds = parseInt(time, 10);
+
+	var hrs   = Math.floor(seconds / 3600);
+	seconds  -= hrs*3600;
+	var mnts = Math.floor(seconds / 60);
+	seconds  -= mnts*60;
+	return String.format("%sh:%sm:%ss", hrs, mnts, seconds);
+}
+
 XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface_status")%>', null,
 		function(x, status)
 		{
@@ -15,15 +26,24 @@ XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface
 				for ( var iface in status.interfaces)
 				{
 					var state = '';
-					var css = ''
+					var css = '';
+					var time = '';
 					switch (status.interfaces[iface].status)
 					{
 						case 'online':
 							state = '<%:Online%>';
+							time = String.format(
+								'<div><strong>Uptime: </strong>%s</div>',
+								secondsToString(status.interfaces[iface].uptime)
+							);
 							css = 'success';
 							break;
 						case 'offline':
 							state = '<%:Offline%>';
+							time = String.format(
+								'<div><strong>Downtime: </strong>%s</div>',
+								secondsToString(status.interfaces[iface].downtime)
+							);
 							css = 'danger';
 							break;
 						default:
@@ -43,6 +63,10 @@ XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface
 						'<div><strong>Status: </strong>%s</div>',
 						state
 					);
+					if (time)
+					{
+						statusview += time;
+					}
 					statusview += '</div>'
 				}
 				statusDiv.innerHTML = statusview;
-- 
cgit v1.2.3


From 99bac545ee242f62f7750d7bf393906669c59c00 Mon Sep 17 00:00:00 2001
From: Florian Eckert <fe@dev.tdt.de>
Date: Fri, 21 Dec 2018 10:15:36 +0100
Subject: luci-app-mwan3: show supported tracking methodes if needed bin is
 installed

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
---
 .../luasrc/model/cbi/mwan/interfaceconfig.lua        | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'applications/luci-app-mwan3/luasrc')

diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
index a1880b3a9e..4c970d4fa1 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
@@ -34,12 +34,20 @@ track_ip.datatype = "host"
 track_method = mwan_interface:option(ListValue, "track_method", translate("Tracking method"))
 track_method.default = "ping"
 track_method:value("ping")
-track_method:value("nping-tcp")
-track_method:value("nping-udp")
-track_method:value("nping-icmp")
-track_method:value("nping-arp")
-track_method:value("arping")
-track_method:value("httping")
+if os.execute("which nping 1>/dev/null") == 0 then
+	track_method:value("nping-tcp")
+	track_method:value("nping-udp")
+	track_method:value("nping-icmp")
+	track_method:value("nping-arp")
+end
+
+if os.execute("which arping 1>/dev/null") == 0 then
+	track_method:value("arping")
+end
+
+if os.execute("which httping 1>/dev/null") == 0 then
+	track_method:value("httping")
+end
 
 reliability = mwan_interface:option(Value, "reliability", translate("Tracking reliability"),
 	translate("Acceptable values: 1-100. This many Tracking IP addresses must respond for the link to be deemed up"))
-- 
cgit v1.2.3