mwan3-luci updated to 1.4-4

Hard-coded location of ip (/usr/bin/ip) in controller file
Added space after "for" in .htm files to clean it up

signed-off-by: Aedan "ARFETT" Renner <chipdankly@gmail.com>

diff --git a/net/mwan3-luci/Makefile b/net/mwan3-luci/Makefile
index d74b15263ddeb43581c1d4eb0b40304e0072c904..b4b49ce00a65518af351f138cfeffaa0fd4d565c 100644 (file)
--- a/net/mwan3-luci/Makefile
+++ b/net/mwan3-luci/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-mwan3
 PKG_VERSION:=1.4
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_MAINTAINER:=Aedan Renner <chipdankly@gmail.com>
 PKG_LICENSE:=GPLv2
 

diff --git a/net/mwan3-luci/files/usr/lib/lua/luci/controller/mwan3.lua b/net/mwan3-luci/files/usr/lib/lua/luci/controller/mwan3.lua
index 7fe4442c9a9b4bdfddc0a21b94557749e4c65819..bd343608ea5c970d79b26d2d8dbfca00165a19d0 100644 (file)
--- a/net/mwan3-luci/files/usr/lib/lua/luci/controller/mwan3.lua
+++ b/net/mwan3-luci/files/usr/lib/lua/luci/controller/mwan3.lua
@@ -3,6 +3,8 @@ module("luci.controller.mwan3", package.seeall)
 sys = require "luci.sys"
 ut = require "luci.util"
 
+ip = "/usr/bin/ip -4 "
+
 function index()
        if not nixio.fs.access("/etc/config/mwan3") then
                return
@@ -61,7 +63,7 @@ end
 
 function getInterfaceStatus(ruleNumber, interfaceName)
        if ut.trim(sys.exec("uci -p /var/state get mwan3." .. interfaceName .. ".enabled")) == "1" then
-               if ut.trim(sys.exec("ip route list table " .. ruleNumber)) ~= "" then
+               if ut.trim(sys.exec(ip .. "route list table " .. ruleNumber)) ~= "" then
                        if ut.trim(sys.exec("uci -p /var/state get mwan3." .. interfaceName .. ".track_ip")) ~= "" then
                                return "online"
                        else
@@ -183,8 +185,8 @@ function diagnosticsData(interface, tool, task)
                                end
                        elseif tool == "rulechk" then
                                getInterfaceNumber()
-                               local rule1 = sys.exec("ip rule | grep $(echo $((" .. interfaceNumber .. " + 1000)))")
-                               local rule2 = sys.exec("ip rule | grep $(echo $((" .. interfaceNumber .. " + 2000)))")
+                               local rule1 = sys.exec(ip .. "rule | grep $(echo $((" .. interfaceNumber .. " + 1000)))")
+                               local rule2 = sys.exec(ip .. "rule | grep $(echo $((" .. interfaceNumber .. " + 2000)))")
                                if rule1 ~= "" and rule2 ~= "" then
                                        results = "All required interface IP rules found:\n\n" .. rule1 .. rule2
                                elseif rule1 ~= "" or rule2 ~= "" then
@@ -194,7 +196,7 @@ function diagnosticsData(interface, tool, task)
                                end
                        elseif tool == "routechk" then
                                getInterfaceNumber()
-                               local routeTable = sys.exec("ip route list table " .. interfaceNumber)
+                               local routeTable = sys.exec(ip .. "route list table " .. interfaceNumber)
                                if routeTable ~= "" then
                                        results = "Interface routing table " .. interfaceNumber .. " was found:\n\n" .. routeTable
                                else
@@ -283,17 +285,17 @@ function troubleshootingData()
        mArray.routeshow = { routeShow }
 
        -- ip rule show
-       local ipRuleShow = ut.trim(sys.exec("ip rule show"))
+       local ipRuleShow = ut.trim(sys.exec(ip .. "rule show"))
                if ipRuleShow == "" then
                        ipRuleShow = "No data found"
                end
        mArray.iprule = { ipRuleShow }
 
        -- ip route list table 1-250
-       local routeList, routeString = ut.trim(sys.exec("ip rule | sed 's/://g' | awk '$1>=2001 && $1<=2250' | awk '{print $NF}'")), ""
+       local routeList, routeString = ut.trim(sys.exec(ip .. "rule | sed 's/://g' | awk '$1>=2001 && $1<=2250' | awk '{print $NF}'")), ""
                if routeList ~= "" then
                        for line in routeList:gmatch("[^\r\n]+") do
-                               routeString = routeString .. line .. "\n" .. sys.exec("ip route list table " .. line)
+                               routeString = routeString .. line .. "\n" .. sys.exec(ip .. "route list table " .. line)
                        end
                        routeString = ut.trim(routeString)
                else

diff --git a/net/mwan3-luci/files/usr/lib/lua/luci/view/mwan/openwrt_overview_status.htm b/net/mwan3-luci/files/usr/lib/lua/luci/view/mwan/openwrt_overview_status.htm
index 6dec9c8e24905715a537163ea4245e3035e48e41..9329b927355793cb31ced40cc1d80124c259987d 100644 (file)
--- a/net/mwan3-luci/files/usr/lib/lua/luci/view/mwan/openwrt_overview_status.htm
+++ b/net/mwan3-luci/files/usr/lib/lua/luci/view/mwan/openwrt_overview_status.htm
@@ -6,7 +6,7 @@
                        if (mArray.wans)
                        {
                                var temp = '';
-                               for( var i = 0; i < mArray.wans.length; i++ )
+                               for ( var i = 0; i < mArray.wans.length; i++ )
                                {
                                        var stat = '';
                                        var cssc = '';

diff --git a/net/mwan3-luci/files/usr/lib/lua/luci/view/mwan/overview_interface.htm b/net/mwan3-luci/files/usr/lib/lua/luci/view/mwan/overview_interface.htm
index 776fd4ce22437220e75cb4ea32fd3fd14515da6f..472c7ce7fcbdbb55450c2c0aa4e1b1b7ee8c5631 100644 (file)
--- a/net/mwan3-luci/files/usr/lib/lua/luci/view/mwan/overview_interface.htm
+++ b/net/mwan3-luci/files/usr/lib/lua/luci/view/mwan/overview_interface.htm
@@ -14,7 +14,7 @@
                        if (mArray.wans)
                        {
                                var interfaceStatus = '';
-                               for( var i = 0; i < mArray.wans.length; i++ )
+                               for ( var i = 0; i < mArray.wans.length; i++ )
                                {
                                        var status = '';
                                        var css = '';