return
end
- entry({"admin", "network", "mwan"},
- alias("admin", "network", "mwan", "overview"),
+ entry({"admin", "status", "mwan"},
+ alias("admin", "status", "mwan", "overview"),
_("Load Balancing"), 600)
- entry({"admin", "network", "mwan", "overview"},
- alias("admin", "network", "mwan", "overview", "overview_interface"),
- _("Overview"), 10)
- entry({"admin", "network", "mwan", "overview", "overview_interface"},
- template("mwan/overview_interface"))
- entry({"admin", "network", "mwan", "overview", "interface_status"},
- call("interfaceStatus"))
- entry({"admin", "network", "mwan", "overview", "overview_detailed"},
- template("mwan/overview_detailed"))
- entry({"admin", "network", "mwan", "overview", "detailed_status"},
+ entry({"admin", "status", "mwan", "overview"},
+ template("mwan/status_interface"))
+ entry({"admin", "status", "mwan", "detail"},
+ template("mwan/status_detail"))
+ entry({"admin", "status", "mwan", "diagnostics"},
+ template("mwan/status_diagnostics"))
+ entry({"admin", "status", "mwan", "troubleshooting"},
+ template("mwan/status_troubleshooting"))
+ entry({"admin", "status", "mwan", "interface_status"},
+ call("mwan_Status"))
+ entry({"admin", "status", "mwan", "detailed_status"},
call("detailedStatus"))
+ entry({"admin", "status", "mwan", "diagnostics_display"},
+ call("diagnosticsData"), nil).leaf = true
+ entry({"admin", "status", "mwan", "troubleshooting_display"},
+ call("troubleshootingData"))
+
+
+ entry({"admin", "network", "mwan"},
+ alias("admin", "network", "mwan", "interface"),
+ _("Load Balancing"), 600)
- entry({"admin", "network", "mwan", "configuration"},
- alias("admin", "network", "mwan", "configuration", "interface"),
- _("Configuration"), 20)
- entry({"admin", "network", "mwan", "configuration", "globals"},
- cbi("mwan/globalsconfig"),_("Globals"), 5).leaf = true
- entry({"admin", "network", "mwan", "configuration", "interface"},
+ entry({"admin", "network", "mwan", "globals"},
+ cbi("mwan/globalsconfig"),
+ _("Globals"), 5).leaf = true
+ entry({"admin", "network", "mwan", "interface"},
arcombine(cbi("mwan/interface"), cbi("mwan/interfaceconfig")),
_("Interfaces"), 10).leaf = true
- entry({"admin", "network", "mwan", "configuration", "member"},
+ entry({"admin", "network", "mwan", "member"},
arcombine(cbi("mwan/member"), cbi("mwan/memberconfig")),
_("Members"), 20).leaf = true
- entry({"admin", "network", "mwan", "configuration", "policy"},
+ entry({"admin", "network", "mwan", "policy"},
arcombine(cbi("mwan/policy"), cbi("mwan/policyconfig")),
_("Policies"), 30).leaf = true
- entry({"admin", "network", "mwan", "configuration", "rule"},
+ entry({"admin", "network", "mwan", "rule"},
arcombine(cbi("mwan/rule"), cbi("mwan/ruleconfig")),
_("Rules"), 40).leaf = true
-
- entry({"admin", "network", "mwan", "advanced"},
- alias("admin", "network", "mwan", "advanced", "hotplugscript"),
- _("Advanced"), 100)
- entry({"admin", "network", "mwan", "advanced", "hotplugscript"},
- form("mwan/advanced_hotplugscript"))
- entry({"admin", "network", "mwan", "advanced", "mwanconfig"},
- form("mwan/advanced_mwanconfig"))
- entry({"admin", "network", "mwan", "advanced", "networkconfig"},
- form("mwan/advanced_networkconfig"))
- entry({"admin", "network", "mwan", "advanced", "wirelessconfig"},
- form("mwan/advanced_wirelessconfig"))
- entry({"admin", "network", "mwan", "advanced", "diagnostics"},
- template("mwan/advanced_diagnostics"))
- entry({"admin", "network", "mwan", "advanced", "diagnostics_display"},
- call("diagnosticsData"), nil).leaf = true
- entry({"admin", "network", "mwan", "advanced", "troubleshooting"},
- template("mwan/advanced_troubleshooting"))
- entry({"admin", "network", "mwan", "advanced", "troubleshooting_display"},
- call("troubleshootingData"))
-end
-
-function getInterfaceStatus(ruleNumber, interfaceName)
- if ut.trim(sys.exec("uci -q -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("uci -q -p /var/state get mwan3." .. interfaceName .. ".track_ip")) ~= "" then
- return "online"
- else
- return "notMonitored"
- end
- else
- return "offline"
- end
- else
- return "notEnabled"
- end
-end
-
-function getInterfaceName()
- local ruleNumber, status = 0, ""
- uci.cursor():foreach("mwan3", "interface",
- function (section)
- ruleNumber = ruleNumber+1
- status = status .. section[".name"] .. "[" .. getInterfaceStatus(ruleNumber, section[".name"]) .. "]"
- end
- )
- return status
+ entry({"admin", "network", "mwan", "notify"},
+ cbi("mwan/notify"),
+ _("Notification"), 50).leaf = true
end
-function interfaceStatus()
- local ntm = require "luci.model.network".init()
-
- local mArray = {}
-
- -- overview status
- local statusString = getInterfaceName()
- if statusString ~= "" then
- mArray.wans = {}
- wansid = {}
-
- for wanName, interfaceState in string.gfind(statusString, "([^%[]+)%[([^%]]+)%]") do
- local wanInterfaceName = ut.trim(sys.exec("uci -q -p /var/state get network." .. wanName .. ".ifname"))
- if wanInterfaceName == "" then
- wanInterfaceName = "X"
- end
- local wanDeviceLink = ntm:get_interface(wanInterfaceName)
- wanDeviceLink = wanDeviceLink and wanDeviceLink:get_network()
- wanDeviceLink = wanDeviceLink and wanDeviceLink:adminlink() or "#"
- wansid[wanName] = #mArray.wans + 1
- mArray.wans[wansid[wanName]] = { name = wanName, link = wanDeviceLink, ifname = wanInterfaceName, status = interfaceState }
- end
- end
-
- -- overview status log
- local mwanLog = ut.trim(sys.exec("logread | grep mwan3 | tail -n 50 | sed 'x;1!H;$!d;x' 2>/dev/null"))
- if mwanLog ~= "" then
- mArray.mwanlog = { mwanLog }
- end
+function mwan_Status()
+ local status = ut.ubus("mwan3", "status", {})
luci.http.prepare_content("application/json")
- luci.http.write_json(mArray)
+ if status ~= nil then
+ luci.http.write_json(status)
+ else
+ luci.http.write_json({})
+ end
end
function detailedStatus()
local mArray = {}
local results = ""
- if tool == "service" then
- os.execute("/usr/sbin/mwan3 " .. task)
- if task == "restart" then
- results = "MWAN3 restarted"
- elseif task == "stop" then
- results = "MWAN3 stopped"
- else
- results = "MWAN3 started"
- end
- else
- local interfaceDevice = ut.trim(sys.exec("uci -q -p /var/state get network." .. interface .. ".ifname"))
- if interfaceDevice ~= "" then
- if tool == "ping" then
- local gateway = ut.trim(sys.exec("route -n | awk '{if ($8 == \"" .. interfaceDevice .. "\" && $1 == \"0.0.0.0\" && $3 == \"0.0.0.0\") print $2}'"))
- if gateway ~= "" then
- if task == "gateway" then
- local pingCommand = "ping -c 3 -W 2 -I " .. interfaceDevice .. " " .. gateway
- results = pingCommand .. "\n\n" .. sys.exec(pingCommand)
- else
- local tracked = ut.trim(sys.exec("uci -q -p /var/state get mwan3." .. interface .. ".track_ip"))
- if tracked ~= "" then
- for z in tracked:gmatch("[^ ]+") do
- local pingCommand = "ping -c 3 -W 2 -I " .. interfaceDevice .. " " .. z
- results = results .. pingCommand .. "\n\n" .. sys.exec(pingCommand) .. "\n\n"
- end
- else
- results = "No tracking IP addresses configured on " .. interface
+ local interfaceDevice = ut.trim(sys.exec("uci -q -p /var/state get network." .. interface .. ".ifname"))
+ if interfaceDevice ~= "" then
+ if tool == "ping" then
+ local gateway = ut.trim(sys.exec("route -n | awk '{if ($8 == \"" .. interfaceDevice .. "\" && $1 == \"0.0.0.0\" && $3 == \"0.0.0.0\") print $2}'"))
+ if gateway ~= "" then
+ if task == "gateway" then
+ local pingCommand = "ping -c 3 -W 2 -I " .. interfaceDevice .. " " .. gateway
+ results = pingCommand .. "\n\n" .. sys.exec(pingCommand)
+ else
+ local tracked = ut.trim(sys.exec("uci -q -p /var/state get mwan3." .. interface .. ".track_ip"))
+ if tracked ~= "" then
+ for z in tracked:gmatch("[^ ]+") do
+ local pingCommand = "ping -c 3 -W 2 -I " .. interfaceDevice .. " " .. z
+ results = results .. pingCommand .. "\n\n" .. sys.exec(pingCommand) .. "\n\n"
end
+ else
+ results = "No tracking IP addresses configured on " .. interface
end
- else
- results = "No default gateway for " .. interface .. " found. Default route does not exist or is configured incorrectly"
- 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)))")
- if rule1 ~= "" and rule2 ~= "" then
- results = "All required interface IP rules found:\n\n" .. rule1 .. rule2
- elseif rule1 ~= "" or rule2 ~= "" then
- results = "Missing 1 of the 2 required interface IP rules\n\n\nRules found:\n\n" .. rule1 .. rule2
- else
- results = "Missing both of the required interface IP rules"
- end
- elseif tool == "routechk" then
- getInterfaceNumber()
- local routeTable = sys.exec(ip .. "route list table " .. interfaceNumber)
- if routeTable ~= "" then
- results = "Interface routing table " .. interfaceNumber .. " was found:\n\n" .. routeTable
- else
- results = "Missing required interface routing table " .. interfaceNumber
- end
- elseif tool == "hotplug" then
- if task == "ifup" then
- os.execute("/usr/sbin/mwan3 ifup " .. interface)
- results = "Hotplug ifup sent to interface " .. interface .. "..."
- else
- os.execute("/usr/sbin/mwan3 ifdown " .. interface)
- results = "Hotplug ifdown sent to interface " .. interface .. "..."
end
+ else
+ results = "No default gateway for " .. interface .. " found. Default route does not exist or is configured incorrectly"
+ 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)))")
+ if rule1 ~= "" and rule2 ~= "" then
+ results = "All required interface IP rules found:\n\n" .. rule1 .. rule2
+ elseif rule1 ~= "" or rule2 ~= "" then
+ results = "Missing 1 of the 2 required interface IP rules\n\n\nRules found:\n\n" .. rule1 .. rule2
+ else
+ results = "Missing both of the required interface IP rules"
+ end
+ elseif tool == "routechk" then
+ getInterfaceNumber()
+ local routeTable = sys.exec(ip .. "route list table " .. interfaceNumber)
+ if routeTable ~= "" then
+ results = "Interface routing table " .. interfaceNumber .. " was found:\n\n" .. routeTable
+ else
+ results = "Missing required interface routing table " .. interfaceNumber
+ end
+ elseif tool == "hotplug" then
+ if task == "ifup" then
+ os.execute("/usr/sbin/mwan3 ifup " .. interface)
+ results = "Hotplug ifup sent to interface " .. interface .. "..."
+ else
+ os.execute("/usr/sbin/mwan3 ifdown " .. interface)
+ results = "Hotplug ifdown sent to interface " .. interface .. "..."
end
- else
- results = "Unable to perform diagnostic tests on " .. interface .. ". There is no physical or virtual device associated with this interface"
end
+ else
+ results = "Unable to perform diagnostic tests on " .. interface .. ". There is no physical or virtual device associated with this interface"
end
if results ~= "" then
results = ut.trim(results)
projects / project / luci.git / blobdiff