[luci] [PATCH] multiwan status

[Etienne Champetier]

Hi

This patch add multiwan status on the overview page

Signed-off-by: Etienne CHAMPETIER <etienne.champetier at free.fr>

-------------------------------------------------

Index: applications/luci-multiwan/luasrc/controller/multiwan.lua
===================================================================
--- applications/luci-multiwan/luasrc/controller/multiwan.lua	(révision 7243)
+++ applications/luci-multiwan/luasrc/controller/multiwan.lua	(copie de travail)
@@ -1,18 +1,60 @@
 module("luci.controller.multiwan", package.seeall)
 
 function index()
-    local fs = luci.fs or nixio.fs
-    if not fs.access("/etc/config/multiwan") then
+	local fs = luci.fs or nixio.fs
+	if not fs.access("/etc/config/multiwan") then
 		return
 	end
 	
 	local page = entry({"admin", "network", "multiwan"}, cbi("multiwan/multiwan"), "Multi-WAN")
 	page.i18n = "multiwan"
 	page.dependent = true
+	
+	entry({"admin", "network", "multiwan", "status"}, call("multiwan_status"))
 
-        local page = entry({"mini", "network", "multiwan"}, cbi("multiwan/multiwanmini", {autoapply=true}), "Multi-WAN")
-        page.i18n = "multiwan"
-        page.dependent = true
+	local page = entry({"mini", "network", "multiwan"}, cbi("multiwan/multiwanmini", {autoapply=true}), "Multi-WAN")
+	page.i18n = "multiwan"
+	page.dependent = true
 
+end
 
-end
+function multiwan_status()
+	local nfs = require "nixio.fs"
+	local cachefile = "/tmp/.mwan/cache"
+
+	local rv = {	}
+
+	cachefile = nfs.readfile(cachefile)
+	if cachefile then
+		local ntm = require "luci.model.network".init()
+		_, _, wan_if_map = string.find(cachefile, "wan_if_map=\"([^\"]*)\"")
+		_, _, wan_fail_map = string.find(cachefile, "wan_fail_map=\"([^\"]*)\"")
+		_, _, wan_recovery_map = string.find(cachefile, "wan_recovery_map=\"([^\"]*)\"")
+		
+		rv.wans = { }
+		wansid = {}
+
+		for wanname, wanifname in string.gfind(wan_if_map, "([^%[]+)%[([^%]]+)%]") do
+			local wanlink = ntm:get_interface(wanifname):get_network():adminlink()
+			wansid[wanname] = #rv.wans + 1
+			rv.wans[wansid[wanname]] = { name = wanname, link = wanlink, ifname = wanifname, status = "ok", count = 0 }
+		end
+
+		for wanname, failcount in string.gfind(wan_fail_map, "([^%[]+)%[([^%]]+)%]") do
+			if failcount == "x" then
+				rv.wans[wansid[wanname]].status = "ko"
+			else
+				rv.wans[wansid[wanname]].status = "failing"
+				rv.wans[wansid[wanname]].count = failcount
+			end
+		end
+
+		for wanname, recoverycount in string.gfind(wan_recovery_map, "([^%[]+)%[([^%]]+)%]") do
+			rv.wans[wansid[wanname]].status = "recovering"
+			rv.wans[wansid[wanname]].count = recoverycount
+		end
+	end
+
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(rv)
+end
\ No newline at end of file
Index: applications/luci-multiwan/luasrc/view/multiwan_status.htm
===================================================================
--- applications/luci-multiwan/luasrc/view/multiwan_status.htm	(révision 0)
+++ applications/luci-multiwan/luasrc/view/multiwan_status.htm	(révision 0)
@@ -0,0 +1,55 @@
+<script type="text/javascript">//<![CDATA[
+	var stxhr = new XHR();
+	var update_status = function() {
+		stxhr.get('<%=luci.dispatcher.build_url("admin", "network", "multiwan", "status")%>', null,
+			function(x, st)
+			{
+				var tx = document.getElementById('multiwan_status_text');
+				if (tx)
+				{
+					if (st && st.wans)
+					{
+						var temp = ""
+						for( var i = 0; i < st.wans.length; i++ )
+						{
+							if (st.wans[i].status == "ok")
+								temp += "<span class='wanok'><strong>" + st.wans[i].name + "(<a href='" + st.wans[i].link + "'>" +st.wans[i].ifname + "</a>) :</strong> OK</span>"
+	
+							if (st.wans[i].status == "ko")
+								temp += "<span class='wanko'><strong>" + st.wans[i].name + "(<a href='" + st.wans[i].link + "'>" +st.wans[i].ifname + "</a>) :</strong> KO</span>"
+							
+							if (st.wans[i].status == "recovering")
+								temp += "<span class='wanrecov'><strong>" + st.wans[i].name + "(<a href='" + st.wans[i].link + "'>" +st.wans[i].ifname + "</a>) :</strong> Recovering(" + st.wans[i].count + ")</span>"
+	
+							if (st.wans[i].status == "failing")
+								temp += "<span class='wanfail'><strong>" + st.wans[i].name + "(<a href='" + st.wans[i].link + "'>" +st.wans[i].ifname + "</a>) :</strong> Failing(" + st.wans[i].count + ")</span>"
+						}
+						tx.innerHTML = temp
+					}else{
+						tx.innerHTML = ""
+					}
+				}
+
+				window.setTimeout(update_status, 5000);
+			}
+		)
+	};
+
+	update_status();
+//]]></script>
+
+<style type="text/css">
+  .wanok { background-color: rgb(144, 240, 144); }
+  .wanko { background-color: rgb(240, 144, 144); }
+  .wanrecov { background-color: rgb(240, 240, 0); }
+  .wanfail { background-color: rgb(255, 165, 0); }
+  .wanko, .wanok, .wanrecov, .wanfail {
+	padding: 0.4em;
+	margin: 0.4em;
+  }
+</style>
+
+<fieldset class="cbi-section">
+	<legend><%:Multi-WAN Status%></legend>
+	<div id="multiwan_status_text" style="text-align:center;"><em><%:Collecting data...%></em></div>
+</fieldset>
Index: applications/luci-multiwan/luasrc/view/admin_status/index/multiwan.htm
===================================================================
--- applications/luci-multiwan/luasrc/view/admin_status/index/multiwan.htm	(révision 0)
+++ applications/luci-multiwan/luasrc/view/admin_status/index/multiwan.htm	(révision 0)
@@ -0,0 +1 @@
+<%+multiwan_status%>