luci-0.11: merge outstanding trunk changes

[project/luci.git] / applications / luci-multiwan / luasrc / controller / multiwan.lua

diff --git a/applications/luci-multiwan/luasrc/controller/multiwan.lua b/applications/luci-multiwan/luasrc/controller/multiwan.lua
index 2a45c5f7bcbd3ea457bee26e8cd8f07faf66675f..b596ef7e34213f3ee7f817dbf41f46eabb74363a 100644 (file)
--- a/applications/luci-multiwan/luasrc/controller/multiwan.lua
+++ b/applications/luci-multiwan/luasrc/controller/multiwan.lua
@@ -9,10 +9,52 @@ function index()
        local page
 
        page = entry({"admin", "network", "multiwan"}, cbi("multiwan/multiwan"), _("Multi-WAN"))
-       page.i18n = "multiwan"
        page.dependent = true
+       
+       entry({"admin", "network", "multiwan", "status"}, call("multiwan_status"))
 
        page = entry({"mini", "network", "multiwan"}, cbi("multiwan/multiwanmini", {autoapply=true}), _("Multi-WAN"))
-       page.i18n = "multiwan"
        page.dependent = true
 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)
+                             wanlink = wanlink and wanlink:get_network()
+                             wanlink = wanlink and wanlink:adminlink() or "#"
+                       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