diff options
Diffstat (limited to 'applications/luci-app-mwan3')
24 files changed, 1721 insertions, 2198 deletions
diff --git a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua index f429cc60ff..cf5708051f 100644 --- a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua +++ b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua @@ -23,7 +23,7 @@ function index() entry({"admin", "status", "mwan", "troubleshooting"}, template("mwan/status_troubleshooting")) entry({"admin", "status", "mwan", "interface_status"}, - call("interfaceStatus")) + call("mwan_Status")) entry({"admin", "status", "mwan", "detailed_status"}, call("detailedStatus")) entry({"admin", "status", "mwan", "diagnostics_display"}, @@ -56,83 +56,31 @@ function index() _("Notification"), 50).leaf = true 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 -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 = {} - - -- detailed mwan status - local detailStatusInfo = ut.trim(sys.exec("/usr/sbin/mwan3 status")) - if detailStatusInfo ~= "" then - mArray.mwandetail = { detailStatusInfo } + local statusInfo = ut.trim(sys.exec("/usr/sbin/mwan3 status")) + luci.http.prepare_content("text/plain") + if statusInfo ~= "" then + luci.http.write(statusInfo) + else + luci.http.write("Unable to get status information") end - - luci.http.prepare_content("application/json") - luci.http.write_json(mArray) end -function diagnosticsData(interface, tool, task) - function getInterfaceNumber() +function diagnosticsData(interface, task) + function getInterfaceNumber(interface) local number = 0 + local interfaceNumber uci.cursor():foreach("mwan3", "interface", function (section) number = number+1 @@ -141,184 +89,213 @@ function diagnosticsData(interface, tool, task) end end ) + return interfaceNumber end - 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 - end - 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 .. "..." + function diag_command(cmd, addr) + if addr and addr:match("^[a-zA-Z0-9%-%.:_]+$") then + local util = io.popen(cmd % addr) + if util then + while true do + local ln = util:read("*l") + if not ln then break end + luci.http.write(ln) + luci.http.write("\n") end + util:close() end - else - results = "Unable to perform diagnostic tests on " .. interface .. ". There is no physical or virtual device associated with this interface" + return end end - if results ~= "" then - results = ut.trim(results) - mArray.diagnostics = { results } - end - - luci.http.prepare_content("application/json") - luci.http.write_json(mArray) -end -function troubleshootingData() - local ver = require "luci.version" + function get_gateway(inteface) + local dump = require("luci.util").ubus("network.interface.%s" % interface, "status", {}) + local gateway + if dump then + local _, route + for _, route in ipairs(dump.route) do + if dump.route[_].target == "0.0.0.0" then + gateway = dump.route[_].nexthop + end + end + end + return gateway + end local mArray = {} + local results = "" + local number = getInterfaceNumber(interface) - -- software versions - local wrtRelease = ut.trim(ver.distversion) - if wrtRelease ~= "" then - wrtRelease = "OpenWrt - " .. wrtRelease - else - wrtRelease = "OpenWrt - unknown" - end - local luciRelease = ut.trim(ver.luciversion) - if luciRelease ~= "" then - luciRelease = "\nLuCI - " .. luciRelease - else - luciRelease = "\nLuCI - unknown" - end - local mwanVersion = ut.trim(sys.exec("opkg info mwan3 | grep Version | awk '{print $2}'")) - if mwanVersion ~= "" then - mwanVersion = "\n\nmwan3 - " .. mwanVersion - else - mwanVersion = "\n\nmwan3 - unknown" - end - local mwanLuciVersion = ut.trim(sys.exec("opkg info luci-app-mwan3 | grep Version | awk '{print $2}'")) - if mwanLuciVersion ~= "" then - mwanLuciVersion = "\nmwan3-luci - " .. mwanLuciVersion - else - mwanLuciVersion = "\nmwan3-luci - unknown" - end - mArray.versions = { wrtRelease .. luciRelease .. mwanVersion .. mwanLuciVersion } - - -- mwan config - local mwanConfig = ut.trim(sys.exec("cat /etc/config/mwan3")) - if mwanConfig == "" then - mwanConfig = "No data found" - end - mArray.mwanconfig = { mwanConfig } + local uci = uci.cursor(nil, "/var/state") + local device = uci:get("network", interface, "ifname") - -- network config - local networkConfig = ut.trim(sys.exec("cat /etc/config/network | sed -e 's/.*username.*/ USERNAME HIDDEN/' -e 's/.*password.*/ PASSWORD HIDDEN/'")) - if networkConfig == "" then - networkConfig = "No data found" + luci.http.prepare_content("text/plain") + if device ~= "" then + if task == "ping_gateway" then + local gateway = get_gateway(interface) + if gateway ~= nil then + diag_command("ping -c 5 -W 1 %q 2>&1", gateway) + else + luci.http.prepare_content("text/plain") + luci.http.write(string.format("No gateway for interface %s found.", interface)) + end + elseif task == "ping_trackips" then + local trackips = uci:get("mwan3", interface, "track_ip") + if #trackips > 0 then + for i in pairs(trackips) do + diag_command("ping -c 5 -W 1 %q 2>&1", trackips[i]) + end + else + luci.http.write(string.format("No tracking Hosts for interface %s defined.", interface)) + end + elseif task == "check_rules" then + local number = getInterfaceNumber(interface) + local iif = 1000 + number + local fwmark = 2000 + number + local iif_rule = sys.exec(string.format("ip rule | grep %d", iif)) + local fwmark_rule = sys.exec(string.format("ip rule | grep %d", fwmark)) + if iif_rule ~= "" and fwmark_rule ~= "" then + luci.http.write(string.format("All required IP rules for interface %s found", interface)) + luci.http.write("\n") + luci.http.write(fwmark_rule) + luci.http.write(iif_rule) + elseif iif_rule == "" and fwmark_rule ~= "" then + luci.http.write(string.format("Only one IP rules for interface %s found", interface)) + luci.http.write("\n") + luci.http.write(fwmark_rule) + elseif iif_rule ~= "" and fwmark_rule == "" then + luci.http.write(string.format("Only one IP rules for interface %s found", interface)) + luci.http.write("\n") + luci.http.write(iif_rule) + else + luci.http.write(string.format("Missing both IP rules for interface %s", interface)) + end + elseif task == "check_routes" then + local number = getInterfaceNumber(interface) + local routeTable = sys.exec(string.format("ip route list table %s", number)) + if routeTable ~= "" then + luci.http.write(string.format("Routing table %s for interface %s found", number, interface)) + luci.http.write("\n") + luci.http.write(routeTable) + else + luci.http.write(string.format("Routing table %s for interface %s not found", number, interface)) + end + elseif task == "hotplug_ifup" then + os.execute(string.format("/usr/sbin/mwan3 ifup %s", interface)) + luci.http.write(string.format("Hotplug ifup sent to interface %s", interface)) + elseif task == "hotplug_ifdown" then + os.execute(string.format("/usr/sbin/mwan3 ifdown %s", interface)) + luci.http.write(string.format("Hotplug ifdown sent to interface %s", interface)) + else + luci.http.write("Unknown task") end - mArray.netconfig = { networkConfig } + else + luci.http.write(string.format("Unable to perform diagnostic tests on %s.", interface)) + luci.http.write("\n") + luci.http.write("There is no physical or virtual device associated with this interface.") + end +end - -- wireless config - local wirelessConfig = ut.trim(sys.exec("cat /etc/config/wireless | sed -e 's/.*username.*/ USERNAME HIDDEN/' -e 's/.*password.*/ PASSWORD HIDDEN/' -e 's/.*key.*/ KEY HIDDEN/'")) - if wirelessConfig == "" then - wirelessConfig = "No data found" - end - mArray.wificonfig = { wirelessConfig } - - -- ifconfig - local ifconfig = ut.trim(sys.exec("ifconfig")) - if ifconfig == "" then - ifconfig = "No data found" - end - mArray.ifconfig = { ifconfig } +function troubleshootingData() + local ver = require "luci.version" + local dash = "-------------------------------------------------" + + luci.http.prepare_content("text/plain") + + luci.http.write("\n") + luci.http.write("\n") + luci.http.write("Software-Version") + luci.http.write("\n") + luci.http.write(dash) + luci.http.write("\n") + if ver.distversion then + luci.http.write(string.format("OpenWrt - %s", ver.distversion)) + luci.http.write("\n") + else + luci.http.write("OpenWrt - unknown") + luci.http.write("\n") + end - -- route -n - local routeShow = ut.trim(sys.exec("route -n")) - if routeShow == "" then - routeShow = "No data found" - end - mArray.routeshow = { routeShow } + if ver.luciversion then + luci.http.write(string.format("LuCI - %s", ver.luciversion)) + luci.http.write("\n") + else + luci.http.write("LuCI - unknown") + luci.http.write("\n") + end - -- ip rule show - local ipRuleShow = ut.trim(sys.exec(ip .. "rule show")) - if ipRuleShow == "" then - ipRuleShow = "No data found" - end - mArray.iprule = { ipRuleShow } + luci.http.write("\n") + luci.http.write("\n") + local output = ut.trim(sys.exec("ip a show")) + luci.http.write("Output of \"ip a show\"") + luci.http.write("\n") + luci.http.write(dash) + luci.http.write("\n") + if output ~= "" then + luci.http.write(output) + luci.http.write("\n") + else + luci.http.write("No data found") + luci.http.write("\n") + end - -- ip route list table 1-250 - local routeList, routeString = ut.trim(sys.exec(ip .. "rule | sed 's/://g' 2>/dev/null | 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) - end - routeString = ut.trim(routeString) - else - routeString = "No data found" - end - mArray.routelist = { routeString } + luci.http.write("\n") + luci.http.write("\n") + local output = ut.trim(sys.exec("ip route show")) + luci.http.write("Output of \"ip route show\"") + luci.http.write("\n") + luci.http.write(dash) + luci.http.write("\n") + if output ~= "" then + luci.http.write(output) + luci.http.write("\n") + else + luci.http.write("No data found") + luci.http.write("\n") + end - -- default firewall output policy - local firewallOut = ut.trim(sys.exec("uci -q -p /var/state get firewall.@defaults[0].output")) - if firewallOut == "" then - firewallOut = "No data found" - end - mArray.firewallout = { firewallOut } + luci.http.write("\n") + luci.http.write("\n") + local output = ut.trim(sys.exec("ip rule show")) + luci.http.write("Output of \"ip rule show\"") + luci.http.write("\n") + luci.http.write(dash) + luci.http.write("\n") + if output ~= "" then + luci.http.write(output) + luci.http.write("\n") + else + luci.http.write("No data found") + luci.http.write("\n") + end - -- iptables - local iptables = ut.trim(sys.exec("iptables -L -t mangle -v -n")) - if iptables == "" then - iptables = "No data found" + luci.http.write("\n") + luci.http.write("\n") + luci.http.write("Output of \"ip route list table 1-250\"") + luci.http.write("\n") + luci.http.write(dash) + luci.http.write("\n") + for i=1,250 do + local output = ut.trim(sys.exec(string.format("ip route list table %d", i))) + if output ~= "" then + luci.http.write(string.format("Table %s: ", i)) + luci.http.write(output) + luci.http.write("\n") end - mArray.iptables = { iptables } + end - luci.http.prepare_content("application/json") - luci.http.write_json(mArray) + luci.http.write("\n") + luci.http.write("\n") + local output = ut.trim(sys.exec("iptables -L -t mangle -v -n")) + luci.http.write("Output of \"iptables -L -t mangle -v -n\"") + luci.http.write("\n") + luci.http.write(dash) + luci.http.write("\n") + if output ~= "" then + luci.http.write(output) + luci.http.write("\n") + else + luci.http.write("No data found") + luci.http.write("\n") + end end diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua index 919ed46cd4..b53d288d0d 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua @@ -14,12 +14,14 @@ $Id$ local net = require "luci.model.network".init() -m = Map("mwan3") -s = m:section(NamedSection, "globals", "globals", translate("Globals mwan3 options")) +m = Map("mwan3", translate("MWAN - Globals")) + +s = m:section(NamedSection, "globals", "globals", nil) n = s:option(ListValue, "local_source", translate("Local source interface"), - translate("Use the IP address of this interface as source IP address for traffic initiated by the router itself")) + translate("Use the IP address of this interface as source IP " .. + "address for traffic initiated by the router itself")) n:value("none") n.default = "none" for _, net in ipairs(net:get_networks()) do diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua index 77198d5c39..166f077910 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua @@ -1,276 +1,208 @@ --- ------ extra functions ------ -- +dsp = require "luci.dispatcher" -function interfaceCheck() -- find issues with too many interfaces, reliability and metric - uci.cursor():foreach("mwan3", "interface", - function (section) - local interfaceName = section[".name"] - interfaceNumber = interfaceNumber+1 -- count number of mwan interfaces configured - -- create list of metrics for none and duplicate checking - local metricValue = ut.trim(sys.exec("uci -p /var/state get network." .. interfaceName .. ".metric")) - if metricValue == "" then - errorFound = 1 - errorNoMetricList = errorNoMetricList .. interfaceName .. " " - else - metricList = metricList .. interfaceName .. " " .. metricValue .. "\n" - end - -- check if any interfaces have a higher reliability requirement than tracking IPs configured - local trackingNumber = tonumber(ut.trim(sys.exec("echo $(uci -p /var/state get mwan3." .. interfaceName .. ".track_ip) | wc -w"))) - if trackingNumber > 0 then - local reliabilityNumber = tonumber(ut.trim(sys.exec("uci -p /var/state get mwan3." .. interfaceName .. ".reliability"))) - if reliabilityNumber and reliabilityNumber > trackingNumber then - errorFound = 1 - errorReliabilityList = errorReliabilityList .. interfaceName .. " " - end - end - -- check if any interfaces are not properly configured in /etc/config/network or have no default route in main routing table - if ut.trim(sys.exec("uci -p /var/state get network." .. interfaceName)) == "interface" then - local interfaceDevice = ut.trim(sys.exec("uci -p /var/state get network." .. interfaceName .. ".ifname")) - if interfaceDevice == "uci: Entry not found" or interfaceDevice == "" then - errorFound = 1 - errorNetConfigList = errorNetConfigList .. interfaceName .. " " - errorRouteList = errorRouteList .. interfaceName .. " " - else - local routeCheck = ut.trim(sys.exec("route -n | awk '{if ($8 == \"" .. interfaceDevice .. "\" && $1 == \"0.0.0.0\" && $3 == \"0.0.0.0\") print $1}'")) - if routeCheck == "" then - errorFound = 1 - errorRouteList = errorRouteList .. interfaceName .. " " - end - end - else - errorFound = 1 - errorNetConfigList = errorNetConfigList .. interfaceName .. " " - errorRouteList = errorRouteList .. interfaceName .. " " - end - end - ) - -- check if any interfaces have duplicate metrics - local metricDuplicateNumbers = sys.exec("echo '" .. metricList .. "' | awk '{print $2}' | uniq -d") - if metricDuplicateNumbers ~= "" then - errorFound = 1 - local metricDuplicates = "" - for line in metricDuplicateNumbers:gmatch("[^\r\n]+") do - metricDuplicates = sys.exec("echo '" .. metricList .. "' | grep '" .. line .. "' | awk '{print $1}'") - errorDuplicateMetricList = errorDuplicateMetricList .. metricDuplicates - end - errorDuplicateMetricList = sys.exec("echo '" .. errorDuplicateMetricList .. "' | tr '\n' ' '") - end -end -function interfaceWarnings() -- display status and warning messages at the top of the page +function interfaceWarnings(overview, count) local warnings = "" - if interfaceNumber <= 250 then - warnings = "<strong>" .. translatef("There are currently %d of 250 supported interfaces configured", interfaceNumber) .. "</strong>" + if count <= 250 then + warnings = string.format("<strong>%s</strong></br>", + translatef("There are currently %d of 250 supported interfaces configured", count) + ) else - warnings = "<font color=\"ff0000\"><strong>" .. translatef("WARNING: %d interfaces are configured exceeding the maximum of 250!", interfaceNumber) .. "</strong></font>" + warnings = string.format("<strong>%s</strong></br>", + translatef("WARNING: %d interfaces are configured exceeding the maximum of 250!", count) + ) end - if errorReliabilityList ~= " " then - warnings = warnings .. "<br /><br /><font color=\"ff0000\"><strong>" .. translate("WARNING: Some interfaces have a higher reliability requirement than there are tracking IP addresses!") .. "</strong></font>" - end - if errorRouteList ~= " " then - warnings = warnings .. "<br /><br /><font color=\"ff0000\"><strong>" .. translate("WARNING: Some interfaces have no default route in the main routing table!") .. "</strong></font>" - end - if errorNetConfigList ~= " " then - warnings = warnings .. "<br /><br /><font color=\"ff0000\"><strong>" .. translate("WARNING: Some interfaces are configured incorrectly or not at all in /etc/config/network!") .. "</strong></font>" - end - if errorNoMetricList ~= " " then - warnings = warnings .. "<br /><br /><font color=\"ff0000\"><strong>" .. translate("WARNING: Some interfaces have no metric configured in /etc/config/network!") .. "</strong></font>" - end - if errorDuplicateMetricList ~= " " then - warnings = warnings .. "<br /><br /><font color=\"ff0000\"><strong>" .. translate("WARNING: Some interfaces have duplicate metrics configured in /etc/config/network!") .. "</strong></font>" + + for i, k in pairs(overview) do + if overview[i]["network"] == false then + warnings = warnings .. string.format("<strong>%s</strong></br>", + translatef("WARNING: Interface %s are not found in /etc/config/network", i) + ) + end + + if overview[i]["default_route"] == false then + warnings = warnings .. string.format("<strong>%s</strong></br>", + translatef("WARNING: Interface %s has no default route in the main routing table", i) + ) + end + + if overview[i]["reliability"] == false then + warnings = warnings .. string.format("<strong>%s</strong></br>", + translatef("WARNING: Interface %s has a higher reliability " .. + "requirement than tracking hosts (%d)", i, overview[i]["tracking"]) + ) + end + + if overview[i]["duplicate_metric"] == true then + warnings = warnings .. string.format("<strong>%s</strong></br>", + translatef("WARNING: Interface %s has a duplicate metric %s configured", i, overview[i]["metric"]) + ) + end end + return warnings end --- ------ interface configuration ------ -- - -dsp = require "luci.dispatcher" -sys = require "luci.sys" -ut = require "luci.util" +function configCheck() + local overview = {} + local count = 0 + local duplicate_metric = {} + uci.cursor():foreach("mwan3", "interface", + function (section) + local uci = uci.cursor(nil, "/var/state") + local iface = section[".name"] + overview[iface] = {} + count = count + 1 + local network = uci:get("network", iface) + overview[iface]["network"] = false + if network ~= nil then + overview[iface]["network"] = true + + local device = uci:get("network", iface, "ifname") + if device ~= nil then + overview[iface]["device"] = device + end -interfaceNumber = 0 -metricList = "" -errorFound = 0 -errorDuplicateMetricList = " " -errorNetConfigList = " " -errorNoMetricList = " " -errorReliabilityList = " " -errorRouteList = " " -interfaceCheck() + local metric = uci:get("network", iface, "metric") + if metric ~= nil then + overview[iface]["metric"] = metric + overview[iface]["duplicate_metric"] = false + for _, m in ipairs(duplicate_metric) do + if m == metric then + overview[iface]["duplicate_metric"] = true + end + end + table.insert(duplicate_metric, metric) + end + local dump = require("luci.util").ubus("network.interface.%s" % iface, "status", {}) + overview[iface]["default_route"] = false + if dump then + local _, route + for _, route in ipairs(dump.route) do + if dump.route[_].target == "0.0.0.0" then + overview[iface]["default_route"] = true + end + end + end + end -m5 = Map("mwan3", translate("MWAN Interface Configuration"), - interfaceWarnings()) - m5:append(Template("mwan/config_css")) + local trackingNumber = uci:get("mwan3", iface, "track_ip") + overview[iface]["tracking"] = 0 + if #trackingNumber > 0 then + overview[iface]["tracking"] = #trackingNumber + overview[iface]["reliability"] = false + local reliabilityNumber = tonumber(uci:get("mwan3", iface, "reliability")) + if reliabilityNumber and reliabilityNumber <= #trackingNumber then + overview[iface]["reliability"] = true + end + end + end + ) + return overview, count +end +m5 = Map("mwan3", translate("MWAN - Interfaces"), + interfaceWarnings(configCheck())) -mwan_interface = m5:section(TypedSection, "interface", translate("Interfaces"), +mwan_interface = m5:section(TypedSection, "interface", nil, translate("MWAN supports up to 250 physical and/or logical interfaces<br />" .. "MWAN requires that all interfaces have a unique metric configured in /etc/config/network<br />" .. "Names must match the interface name found in /etc/config/network (see advanced tab)<br />" .. "Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br />" .. "Interfaces may not share the same name as configured members, policies or rules")) - mwan_interface.addremove = true - mwan_interface.dynamic = false - mwan_interface.sectionhead = translate("Interface") - mwan_interface.sortable = false - mwan_interface.template = "cbi/tblsection" - mwan_interface.extedit = dsp.build_url("admin", "network", "mwan", "interface", "%s") - function mwan_interface.create(self, section) - TypedSection.create(self, section) - m5.uci:save("mwan3") - luci.http.redirect(dsp.build_url("admin", "network", "mwan", "interface", section)) - end - +mwan_interface.addremove = true +mwan_interface.dynamic = false +mwan_interface.sectionhead = translate("Interface") +mwan_interface.sortable = false +mwan_interface.template = "cbi/tblsection" +mwan_interface.extedit = dsp.build_url("admin", "network", "mwan", "interface", "%s") +function mwan_interface.create(self, section) + TypedSection.create(self, section) + m5.uci:save("mwan3") + luci.http.redirect(dsp.build_url("admin", "network", "mwan", "interface", section)) +end enabled = mwan_interface:option(DummyValue, "enabled", translate("Enabled")) - enabled.rawhtml = true - function enabled.cfgvalue(self, s) - if self.map:get(s, "enabled") == "1" then - return "Yes" - else - return "No" - end - end - -track_ip = mwan_interface:option(DummyValue, "track_ip", translate("Tracking IP")) - track_ip.rawhtml = true - function track_ip.cfgvalue(self, s) - tracked = self.map:get(s, "track_ip") - if tracked then - local ipList = "" - for k,v in pairs(tracked) do - ipList = ipList .. v .. "<br />" - end - return ipList - else - return "—" - end +enabled.rawhtml = true +function enabled.cfgvalue(self, s) + if self.map:get(s, "enabled") == "1" then + return translate("Yes") + else + return translate("No") end +end track_method = mwan_interface:option(DummyValue, "track_method", translate("Tracking method")) - track_method.rawhtml = true - function track_method.cfgvalue(self, s) - if tracked then - return self.map:get(s, "track_method") or "—" - else - return "—" - end +track_method.rawhtml = true +function track_method.cfgvalue(self, s) + local tracked = self.map:get(s, "track_ip") + if tracked then + return self.map:get(s, "track_method") or "—" + else + return "—" end +end reliability = mwan_interface:option(DummyValue, "reliability", translate("Tracking reliability")) - reliability.rawhtml = true - function reliability.cfgvalue(self, s) - if tracked then - return self.map:get(s, "reliability") or "—" - else - return "—" - end - end - -count = mwan_interface:option(DummyValue, "count", translate("Ping count")) - count.rawhtml = true - function count.cfgvalue(self, s) - if tracked then - return self.map:get(s, "count") or "—" - else - return "—" - end - end - -timeout = mwan_interface:option(DummyValue, "timeout", translate("Ping timeout")) - timeout.rawhtml = true - function timeout.cfgvalue(self, s) - if tracked then - local timeoutValue = self.map:get(s, "timeout") - if timeoutValue then - return timeoutValue .. "s" - else - return "—" - end - else - return "—" - end +reliability.rawhtml = true +function reliability.cfgvalue(self, s) + local tracked = self.map:get(s, "track_ip") + if tracked then + return self.map:get(s, "reliability") or "—" + else + return "—" end +end interval = mwan_interface:option(DummyValue, "interval", translate("Ping interval")) - interval.rawhtml = true - function interval.cfgvalue(self, s) - if tracked then - local intervalValue = self.map:get(s, "interval") - if intervalValue then - return intervalValue .. "s" - else - return "—" - end +interval.rawhtml = true +function interval.cfgvalue(self, s) + local tracked = self.map:get(s, "track_ip") + if tracked then + local intervalValue = self.map:get(s, "interval") + if intervalValue then + return intervalValue .. "s" else return "—" end + else + return "—" end +end down = mwan_interface:option(DummyValue, "down", translate("Interface down")) - down.rawhtml = true - function down.cfgvalue(self, s) - if tracked then - return self.map:get(s, "down") or "—" - else - return "—" - end +down.rawhtml = true +function down.cfgvalue(self, s) + local tracked = self.map:get(s, "track_ip") + if tracked then + return self.map:get(s, "down") or "—" + else + return "—" end +end up = mwan_interface:option(DummyValue, "up", translate("Interface up")) - up.rawhtml = true - function up.cfgvalue(self, s) - if tracked then - return self.map:get(s, "up") or "—" - else - return "—" - end +up.rawhtml = true +function up.cfgvalue(self, s) + local tracked = self.map:get(s, "track_ip") + if tracked then + return self.map:get(s, "up") or "—" + else + return "—" end +end metric = mwan_interface:option(DummyValue, "metric", translate("Metric")) - metric.rawhtml = true - function metric.cfgvalue(self, s) - local metricValue = sys.exec("uci -p /var/state get network." .. s .. ".metric") - if metricValue ~= "" then - return metricValue - else - return "—" - end - end - -errors = mwan_interface:option(DummyValue, "errors", translate("Errors")) - errors.rawhtml = true - function errors.cfgvalue(self, s) - if errorFound == 1 then - local mouseOver, lineBreak = "", "" - if string.find(errorReliabilityList, " " .. s .. " ") then - mouseOver = "Higher reliability requirement than there are tracking IP addresses" - lineBreak = " " - end - if string.find(errorRouteList, " " .. s .. " ") then - mouseOver = mouseOver .. lineBreak .. "No default route in the main routing table" - lineBreak = " " - end - if string.find(errorNetConfigList, " " .. s .. " ") then - mouseOver = mouseOver .. lineBreak .. "Configured incorrectly or not at all in /etc/config/network" - lineBreak = " " - end - if string.find(errorNoMetricList, " " .. s .. " ") then - mouseOver = mouseOver .. lineBreak .. "No metric configured in /etc/config/network" - lineBreak = " " - end - if string.find(errorDuplicateMetricList, " " .. s .. " ") then - mouseOver = mouseOver .. lineBreak .. "Duplicate metric configured in /etc/config/network" - end - if mouseOver == "" then - return "" - else - return "<span title=\"" .. mouseOver .. "\"><img src=\"/luci-static/resources/cbi/reset.gif\" alt=\"error\"></img></span>" - end - else - return "" - end +metric.rawhtml = true +function metric.cfgvalue(self, s) + local uci = uci.cursor(nil, "/var/state") + local metric = uci:get("network", s, "metric") + if metric then + return metric + else + return "—" end - +end return m5 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 86e959771e..9f1db08be7 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua @@ -1,266 +1,179 @@ --- ------ extra functions ------ -- - -function interfaceCheck() - metricValue = ut.trim(sys.exec("uci -p /var/state get network." .. arg[1] .. ".metric")) - if metricValue == "" then -- no metric - errorNoMetric = 1 - else -- if metric exists create list of interface metrics to compare against for duplicates - uci.cursor():foreach("mwan3", "interface", - function (section) - local metricValue = ut.trim(sys.exec("uci -p /var/state get network." .. section[".name"] .. ".metric")) - metricList = metricList .. section[".name"] .. " " .. metricValue .. "\n" - end - ) - -- compare metric against list - local metricDuplicateNumbers, metricDuplicates = sys.exec("echo '" .. metricList .. "' | awk '{print $2}' | uniq -d"), "" - for line in metricDuplicateNumbers:gmatch("[^\r\n]+") do - metricDuplicates = sys.exec("echo '" .. metricList .. "' | grep '" .. line .. "' | awk '{print $1}'") - errorDuplicateMetricList = errorDuplicateMetricList .. metricDuplicates - end - if sys.exec("echo '" .. errorDuplicateMetricList .. "' | grep -w " .. arg[1]) ~= "" then - errorDuplicateMetric = 1 - end - end - -- check if this interface has a higher reliability requirement than track IPs configured - local trackingNumber = tonumber(ut.trim(sys.exec("echo $(uci -p /var/state get mwan3." .. arg[1] .. ".track_ip) | wc -w"))) - if trackingNumber > 0 then - local reliabilityNumber = tonumber(ut.trim(sys.exec("uci -p /var/state get mwan3." .. arg[1] .. ".reliability"))) - if reliabilityNumber and reliabilityNumber > trackingNumber then - errorReliability = 1 - end - end - -- check if any interfaces are not properly configured in /etc/config/network or have no default route in main routing table - if ut.trim(sys.exec("uci -p /var/state get network." .. arg[1])) == "interface" then - local interfaceDevice = ut.trim(sys.exec("uci -p /var/state get network." .. arg[1] .. ".ifname")) - if interfaceDevice == "uci: Entry not found" or interfaceDevice == "" then - errorNetConfig = 1 - errorRoute = 1 - else - local routeCheck = ut.trim(sys.exec("route -n | awk '{if ($8 == \"" .. interfaceDevice .. "\" && $1 == \"0.0.0.0\" && $3 == \"0.0.0.0\") print $1}'")) - if routeCheck == "" then - errorRoute = 1 - end - end - else - errorNetConfig = 1 - errorRoute = 1 - end -end - -function interfaceWarnings() -- display warning messages at the top of the page - local warns, lineBreak = "", "" - if errorReliability == 1 then - warns = "<font color=\"ff0000\"><strong>" .. translate("WARNING: This interface has a higher reliability requirement than there are tracking IP addresses!") .. "</strong></font>" - lineBreak = "<br /><br />" - end - if errorRoute == 1 then - warns = warns .. lineBreak .. "<font color=\"ff0000\"><strong>" .. translate("WARNING: This interface has no default route in the main routing table!") .. "</strong></font>" - lineBreak = "<br /><br />" - end - if errorNetConfig == 1 then - warns = warns .. lineBreak .. "<font color=\"ff0000\"><strong>" .. translate("WARNING: This interface is configured incorrectly or not at all in /etc/config/network!") .. "</strong></font>" - lineBreak = "<br /><br />" - end - if errorNoMetric == 1 then - warns = warns .. lineBreak .. "<font color=\"ff0000\"><strong>" .. translate("WARNING: This interface has no metric configured in /etc/config/network!") .. "</strong></font>" - elseif errorDuplicateMetric == 1 then - warns = warns .. lineBreak .. "<font color=\"ff0000\"><strong>" .. translate("WARNING: This and other interfaces have duplicate metrics configured in /etc/config/network!") .. "</strong></font>" - end - return warns -end - --- ------ interface configuration ------ -- - dsp = require "luci.dispatcher" -sys = require "luci.sys" -ut = require "luci.util" arg[1] = arg[1] or "" -metricValue = "" -metricList = "" -errorDuplicateMetricList = "" -errorNoMetric = 0 -errorDuplicateMetric = 0 -errorRoute = 0 -errorNetConfig = 0 -errorReliability = 0 -interfaceCheck() - -m5 = Map("mwan3", translatef("MWAN Interface Configuration - %s", arg[1]), - interfaceWarnings()) +m5 = Map("mwan3", translatef("MWAN Interface Configuration - %s", arg[1])) m5.redirect = dsp.build_url("admin", "network", "mwan", "interface") - mwan_interface = m5:section(NamedSection, arg[1], "interface", "") - mwan_interface.addremove = false - mwan_interface.dynamic = false - +mwan_interface.addremove = false +mwan_interface.dynamic = false enabled = mwan_interface:option(ListValue, "enabled", translate("Enabled")) - enabled.default = "1" - enabled:value("1", translate("Yes")) - enabled:value("0", translate("No")) +enabled.default = "1" +enabled:value("1", translate("Yes")) +enabled:value("0", translate("No")) initial_state = mwan_interface:option(ListValue, "initial_state", translate("Initial state"), translate("Expect interface state on up event")) - initial_state.default = "online" - initial_state:value("online", translate("Online")) - initial_state:value("offline", translate("Offline")) +initial_state.default = "online" +initial_state:value("online", translate("Online")) +initial_state:value("offline", translate("Offline")) family = mwan_interface:option(ListValue, "family", translate("Internet Protocol")) - family.default = "ipv4" - family:value("ipv4", translate("IPv4")) - family:value("ipv6", translate("IPv6")) +family.default = "ipv4" +family:value("ipv4", translate("IPv4")) +family:value("ipv6", translate("IPv6")) track_ip = mwan_interface:option(DynamicList, "track_ip", translate("Tracking hostname or IP address"), translate("This hostname or IP address will be pinged to determine if the link is up or down. Leave blank to assume interface is always online")) - track_ip.datatype = "host" +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("arping") - track_method:value("httping") +track_method.default = "ping" +track_method:value("ping") +track_method:value("arping") +track_method:value("httping") 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")) - reliability.datatype = "range(1, 100)" - reliability.default = "1" +reliability.datatype = "range(1, 100)" +reliability.default = "1" count = mwan_interface:option(ListValue, "count", translate("Ping count")) - count.default = "1" - count:value("1") - count:value("2") - count:value("3") - count:value("4") - count:value("5") +count.default = "1" +count:value("1") +count:value("2") +count:value("3") +count:value("4") +count:value("5") size = mwan_interface:option(Value, "size", translate("Ping size")) - size.default = "56" - size:value("8") - size:value("24") - size:value("56") - size:value("120") - size:value("248") - size:value("504") - size:value("1016") - size:value("1472") - size:value("2040") - size.datatype = "range(1, 65507)" - size.rmempty = false - size.optional = false +size.default = "56" +size:value("8") +size:value("24") +size:value("56") +size:value("120") +size:value("248") +size:value("504") +size:value("1016") +size:value("1472") +size:value("2040") +size.datatype = "range(1, 65507)" +size.rmempty = false +size.optional = false timeout = mwan_interface:option(ListValue, "timeout", translate("Ping timeout")) - timeout.default = "2" - timeout:value("1", translatef("%d second", 1)) - timeout:value("2", translatef("%d seconds", 2)) - timeout:value("3", translatef("%d seconds", 3)) - timeout:value("4", translatef("%d seconds", 4)) - timeout:value("5", translatef("%d seconds", 5)) - timeout:value("6", translatef("%d seconds", 6)) - timeout:value("7", translatef("%d seconds", 7)) - timeout:value("8", translatef("%d seconds", 8)) - timeout:value("9", translatef("%d seconds", 9)) - timeout:value("10", translatef("%d seconds", 10)) +timeout.default = "2" +timeout:value("1", translatef("%d second", 1)) +timeout:value("2", translatef("%d seconds", 2)) +timeout:value("3", translatef("%d seconds", 3)) +timeout:value("4", translatef("%d seconds", 4)) +timeout:value("5", translatef("%d seconds", 5)) +timeout:value("6", translatef("%d seconds", 6)) +timeout:value("7", translatef("%d seconds", 7)) +timeout:value("8", translatef("%d seconds", 8)) +timeout:value("9", translatef("%d seconds", 9)) +timeout:value("10", translatef("%d seconds", 10)) interval = mwan_interface:option(ListValue, "interval", translate("Ping interval")) - interval.default = "5" - interval:value("1", translatef("%d second", 1)) - interval:value("3", translatef("%d seconds", 3)) - interval:value("5", translatef("%d seconds", 5)) - interval:value("10", translatef("%d seconds", 10)) - interval:value("20", translatef("%d seconds", 20)) - interval:value("30", translatef("%d seconds", 30)) - interval:value("60", translatef("%d minute", 1)) - interval:value("300", translatef("%d minutes", 5)) - interval:value("600", translatef("%d minutes", 10)) - interval:value("900", translatef("%d minutes", 15)) - interval:value("1800", translatef("%d minutes", 30)) - interval:value("3600", translatef("%d hour", 1)) +interval.default = "5" +interval:value("1", translatef("%d second", 1)) +interval:value("3", translatef("%d seconds", 3)) +interval:value("5", translatef("%d seconds", 5)) +interval:value("10", translatef("%d seconds", 10)) +interval:value("20", translatef("%d seconds", 20)) +interval:value("30", translatef("%d seconds", 30)) +interval:value("60", translatef("%d minute", 1)) +interval:value("300", translatef("%d minutes", 5)) +interval:value("600", translatef("%d minutes", 10)) +interval:value("900", translatef("%d minutes", 15)) +interval:value("1800", translatef("%d minutes", 30)) +interval:value("3600", translatef("%d hour", 1)) failure = mwan_interface:option(Value, "failure_interval", translate("Failure interval"), translate("Ping interval during failure detection")) - failure.default = "5" - failure:value("1", translatef("%d second", 1)) - failure:value("3", translatef("%d seconds", 3)) - failure:value("5", translatef("%d seconds", 5)) - failure:value("10", translatef("%d seconds", 10)) - failure:value("20", translatef("%d seconds", 20)) - failure:value("30", translatef("%d seconds", 30)) - failure:value("60", translatef("%d minute", 1)) - failure:value("300", translatef("%d minutes", 5)) - failure:value("600", translatef("%d minutes", 10)) - failure:value("900", translatef("%d minutes", 15)) - failure:value("1800", translatef("%d minutes", 30)) - failure:value("3600", translatef("%d hour", 1)) +failure.default = "5" +failure:value("1", translatef("%d second", 1)) +failure:value("3", translatef("%d seconds", 3)) +failure:value("5", translatef("%d seconds", 5)) +failure:value("10", translatef("%d seconds", 10)) +failure:value("20", translatef("%d seconds", 20)) +failure:value("30", translatef("%d seconds", 30)) +failure:value("60", translatef("%d minute", 1)) +failure:value("300", translatef("%d minutes", 5)) +failure:value("600", translatef("%d minutes", 10)) +failure:value("900", translatef("%d minutes", 15)) +failure:value("1800", translatef("%d minutes", 30)) +failure:value("3600", translatef("%d hour", 1)) keep_failure = mwan_interface:option(Flag, "keep_failure_interval", translate("Keep failure interval"), translate("Keep ping failure interval during failure state")) - keep_failure.default = keep_failure.disabled +keep_failure.default = keep_failure.disabled recovery = mwan_interface:option(Value, "recovery_interval", translate("Recovery interval"), translate("Ping interval during failure recovering")) - recovery.default = "5" - recovery:value("1", translatef("%d second", 1)) - recovery:value("3", translatef("%d seconds", 3)) - recovery:value("5", translatef("%d seconds", 5)) - recovery:value("10", translatef("%d seconds", 10)) - recovery:value("20", translatef("%d seconds", 20)) - recovery:value("30", translatef("%d seconds", 30)) - recovery:value("60", translatef("%d minute", 1)) - recovery:value("300", translatef("%d minutes", 5)) - recovery:value("600", translatef("%d minutes", 10)) - recovery:value("900", translatef("%d minutes", 15)) - recovery:value("1800", translatef("%d minutes", 30)) - recovery:value("3600", translatef("%d hour", 1)) +recovery.default = "5" +recovery:value("1", translatef("%d second", 1)) +recovery:value("3", translatef("%d seconds", 3)) +recovery:value("5", translatef("%d seconds", 5)) +recovery:value("10", translatef("%d seconds", 10)) +recovery:value("20", translatef("%d seconds", 20)) +recovery:value("30", translatef("%d seconds", 30)) +recovery:value("60", translatef("%d minute", 1)) +recovery:value("300", translatef("%d minutes", 5)) +recovery:value("600", translatef("%d minutes", 10)) +recovery:value("900", translatef("%d minutes", 15)) +recovery:value("1800", translatef("%d minutes", 30)) +recovery:value("3600", translatef("%d hour", 1)) down = mwan_interface:option(ListValue, "down", translate("Interface down"), translate("Interface will be deemed down after this many failed ping tests")) - down.default = "3" - down:value("1") - down:value("2") - down:value("3") - down:value("4") - down:value("5") - down:value("6") - down:value("7") - down:value("8") - down:value("9") - down:value("10") +down.default = "3" +down:value("1") +down:value("2") +down:value("3") +down:value("4") +down:value("5") +down:value("6") +down:value("7") +down:value("8") +down:value("9") +down:value("10") up = mwan_interface:option(ListValue, "up", translate("Interface up"), translate("Downed interface will be deemed up after this many successful ping tests")) - up.default = "3" - up:value("1") - up:value("2") - up:value("3") - up:value("4") - up:value("5") - up:value("6") - up:value("7") - up:value("8") - up:value("9") - up:value("10") +up.default = "3" +up:value("1") +up:value("2") +up:value("3") +up:value("4") +up:value("5") +up:value("6") +up:value("7") +up:value("8") +up:value("9") +up:value("10") flush = mwan_interface:option(ListValue, "flush_conntrack", translate("Flush conntrack table"), translate("Flush global firewall conntrack table on interface events")) - flush.default = "never" - flush:value("ifup", translate("ifup")) - flush:value("ifdown", translate("ifdown")) - flush:value("never", translate("never")) - flush:value("always", translate("always")) +flush.default = "never" +flush:value("ifup", translate("ifup")) +flush:value("ifdown", translate("ifdown")) +flush:value("never", translate("never")) +flush:value("always", translate("always")) metric = mwan_interface:option(DummyValue, "metric", translate("Metric"), translate("This displays the metric assigned to this interface in /etc/config/network")) - metric.rawhtml = true - function metric.cfgvalue(self, s) - if errorNoMetric == 0 then - return metricValue - else - return "—" - end +metric.rawhtml = true +function metric.cfgvalue(self, s) + local uci = uci.cursor(nil, "/var/state") + local metric = uci:get("network", arg[1], "metric") + if metric then + return metric + else + return "—" end - +end return m5 diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua index b73ee57652..ebe1162c55 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua @@ -1,46 +1,40 @@ --- ------ member configuration ------ -- +dsp = require "luci.dispatcher" -ds = require "luci.dispatcher" +m5 = Map("mwan3", translate("MWAN - Members")) -m5 = Map("mwan3", translate("MWAN Member Configuration")) - m5:append(Template("mwan/config_css")) - - -mwan_member = m5:section(TypedSection, "member", translate("Members"), +mwan_member = m5:section(TypedSection, "member", nil, translate("Members are profiles attaching a metric and weight to an MWAN interface<br />" .. "Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br />" .. "Members may not share the same name as configured interfaces, policies or rules")) - mwan_member.addremove = true - mwan_member.dynamic = false - mwan_member.sectionhead = translate("Member") - mwan_member.sortable = true - mwan_member.template = "cbi/tblsection" - mwan_member.extedit = ds.build_url("admin", "network", "mwan", "member", "%s") - function mwan_member.create(self, section) - TypedSection.create(self, section) - m5.uci:save("mwan3") - luci.http.redirect(ds.build_url("admin", "network", "mwan", "member", section)) - end - +mwan_member.addremove = true +mwan_member.dynamic = false +mwan_member.sectionhead = translate("Member") +mwan_member.sortable = true +mwan_member.template = "cbi/tblsection" +mwan_member.extedit = dsp.build_url("admin", "network", "mwan", "member", "%s") +function mwan_member.create(self, section) + TypedSection.create(self, section) + m5.uci:save("mwan3") + luci.http.redirect(dsp.build_url("admin", "network", "mwan", "member", section)) +end interface = mwan_member:option(DummyValue, "interface", translate("Interface")) - interface.rawhtml = true - function interface.cfgvalue(self, s) - return self.map:get(s, "interface") or "—" - end +interface.rawhtml = true +function interface.cfgvalue(self, s) + return self.map:get(s, "interface") or "—" +end metric = mwan_member:option(DummyValue, "metric", translate("Metric")) - metric.rawhtml = true - function metric.cfgvalue(self, s) - return self.map:get(s, "metric") or "1" - end +metric.rawhtml = true +function metric.cfgvalue(self, s) + return self.map:get(s, "metric") or "1" +end weight = mwan_member:option(DummyValue, "weight", translate("Weight")) - weight.rawhtml = true - function weight.cfgvalue(self, s) - return self.map:get(s, "weight") or "1" - end - +weight.rawhtml = true +function weight.cfgvalue(self, s) + return self.map:get(s, "weight") or "1" +end return m5 diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua index 220c4bddd6..ade357f819 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua @@ -1,47 +1,27 @@ --- ------ extra functions ------ -- - -function cbi_add_interface(field) - uci.cursor():foreach("mwan3", "interface", - function (section) - field:value(section[".name"]) - end - ) -end - --- ------ member configuration ------ -- - dsp = require "luci.dispatcher" arg[1] = arg[1] or "" m5 = Map("mwan3", translatef("MWAN Member Configuration - %s", arg[1])) - m5.redirect = dsp.build_url("admin", "network", "mwan", "member") - +m5.redirect = dsp.build_url("admin", "network", "mwan", "member") mwan_member = m5:section(NamedSection, arg[1], "member", "") - mwan_member.addremove = false - mwan_member.dynamic = false - +mwan_member.addremove = false +mwan_member.dynamic = false interface = mwan_member:option(Value, "interface", translate("Interface")) - cbi_add_interface(interface) +m5.uci:foreach("mwan3", "interface", + function(s) + interface:value(s['.name'], s['.name']) + end +) metric = mwan_member:option(Value, "metric", translate("Metric"), translate("Acceptable values: 1-256. Defaults to 1 if not set")) - metric.datatype = "range(1, 256)" +metric.datatype = "range(1, 256)" weight = mwan_member:option(Value, "weight", translate("Weight"), translate("Acceptable values: 1-1000. Defaults to 1 if not set")) - weight.datatype = "range(1, 1000)" - - --- ------ currently configured interfaces ------ -- - -mwan_interface = m5:section(TypedSection, "interface", translate("Currently Configured Interfaces")) - mwan_interface.addremove = false - mwan_interface.dynamic = false - mwan_interface.sortable = false - mwan_interface.template = "cbi/tblsection" - +weight.datatype = "range(1, 1000)" return m5 diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua index 20e86fc027..1019302ac9 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua @@ -1,12 +1,11 @@ --- ------ hotplug script configuration ------ -- - local fs = require "nixio.fs" local ut = require "luci.util" script = "/etc/mwan3.user" -m5 = SimpleForm("luci", nil) -f = m5:section(SimpleSection, translate("MWAN Notification"), +m5 = SimpleForm("luci", translate("MWAN - Notification")) + +f = m5:section(SimpleSection, nil, translate("This section allows you to modify the content of \"/etc/mwan3.user\".<br />" .. "The file is also preserved during sysupgrade.<br />" .. "<br />" .. diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua index 495b45e646..6d2ce71300 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua @@ -1,94 +1,80 @@ --- ------ extra functions ------ -- +dsp = require "luci.dispatcher" + + +function policyCheck() + local policy_error = {} -function policyCheck() -- check to see if any policy names exceed the maximum of 15 characters uci.cursor():foreach("mwan3", "policy", function (section) + policy_error[section[".name"]] = false if string.len(section[".name"]) > 15 then - nameTooLong = 1 - err_name_list = err_name_list .. section[".name"] .. " " + policy_error[section[".name"]] = true end end ) -end -function policyWarn() -- display status and warning messages at the top of the page - if nameTooLong == 1 then - return "<font color=\"ff0000\"><strong>" .. translate("WARNING: Some policies have names exceeding the maximum of 15 characters!") .. "</strong></font>" - else - return "" - end + return policy_error end --- ------ policy configuration ------ -- - -ds = require "luci.dispatcher" -sys = require "luci.sys" - -nameTooLong = 0 -err_name_list = " " -policyCheck() - +function policyError(policy_error) + local warnings = "" + for i, k in pairs(policy_error) do + if policy_error[i] == true then + warnings = warnings .. string.format("<strong>%s</strong></br>", + translatef("WARNING: Policie %s has exceeding the maximum name of 15 characters", i) + ) + end + end -m5 = Map("mwan3", translate("MWAN Policy Configuration"), - policyWarn()) - m5:append(Template("mwan/config_css")) + return warnings +end +m5 = Map("mwan3", translate("MWAN - Policies"), + policyError(policyCheck())) -mwan_policy = m5:section(TypedSection, "policy", translate("Policies"), +mwan_policy = m5:section(TypedSection, "policy", nil, translate("Policies are profiles grouping one or more members controlling how MWAN distributes traffic<br />" .. "Member interfaces with lower metrics are used first. Interfaces with the same metric load-balance<br />" .. "Load-balanced member interfaces distribute more traffic out those with higher weights<br />" .. "Names may contain characters A-Z, a-z, 0-9, _ and no spaces. Names must be 15 characters or less<br />" .. "Policies may not share the same name as configured interfaces, members or rules")) - mwan_policy.addremove = true - mwan_policy.dynamic = false - mwan_policy.sectionhead = translate("Policy") - mwan_policy.sortable = true - mwan_policy.template = "cbi/tblsection" - mwan_policy.extedit = ds.build_url("admin", "network", "mwan", "policy", "%s") - function mwan_policy.create(self, section) - TypedSection.create(self, section) - m5.uci:save("mwan3") - luci.http.redirect(ds.build_url("admin", "network", "mwan", "policy", section)) - end - +mwan_policy.addremove = true +mwan_policy.dynamic = false +mwan_policy.sectionhead = translate("Policy") +mwan_policy.sortable = true +mwan_policy.template = "cbi/tblsection" +mwan_policy.extedit = dsp.build_url("admin", "network", "mwan", "policy", "%s") +function mwan_policy.create(self, section) + TypedSection.create(self, section) + m5.uci:save("mwan3") + luci.http.redirect(dsp.build_url("admin", "network", "mwan", "policy", section)) +end use_member = mwan_policy:option(DummyValue, "use_member", translate("Members assigned")) - use_member.rawhtml = true - function use_member.cfgvalue(self, s) - local memberConfig, memberList = self.map:get(s, "use_member"), "" - if memberConfig then - for k,v in pairs(memberConfig) do - memberList = memberList .. v .. "<br />" - end - return memberList - else - return "—" +use_member.rawhtml = true +function use_member.cfgvalue(self, s) + local memberConfig, memberList = self.map:get(s, "use_member"), "" + if memberConfig then + for k,v in pairs(memberConfig) do + memberList = memberList .. v .. "<br />" end + return memberList + else + return "—" end +end last_resort = mwan_policy:option(DummyValue, "last_resort", translate("Last resort")) - last_resort.rawhtml = true - function last_resort.cfgvalue(self, s) - local action = self.map:get(s, "last_resort") - if action == "blackhole" then - return translate("blackhole (drop)") - elseif action == "default" then - return translate("default (use main routing table)") - else - return translate("unreachable (reject)") - end - end - -errors = mwan_policy:option(DummyValue, "errors", translate("Errors")) - errors.rawhtml = true - function errors.cfgvalue(self, s) - if not string.find(err_name_list, " " .. s .. " ") then - return "" - else - return "<span title=\"Name exceeds 15 characters\"><img src=\"/luci-static/resources/cbi/reset.gif\" alt=\"error\"></img></span>" - end +last_resort.rawhtml = true +function last_resort.cfgvalue(self, s) + local action = self.map:get(s, "last_resort") + if action == "blackhole" then + return translate("blackhole (drop)") + elseif action == "default" then + return translate("default (use main routing table)") + else + return translate("unreachable (reject)") end - +end return m5 diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua index cdf6521a79..1f8da0f2dd 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua @@ -1,65 +1,26 @@ --- ------ extra functions ------ -- - -function policyCheck() -- check to see if this policy's name exceed the maximum of 15 characters - policyNameLength = string.len(arg[1]) - if policyNameLength > 15 then - nameTooLong = 1 - end -end - -function policyWarn() -- display status and warning messages at the top of the page - if nameTooLong == 1 then - return "<font color=\"ff0000\"><strong>" .. translatef("WARNING: This policy's name is %d characters exceeding the maximum of 15!", policyNameLength) .. "</strong></font>" - else - return "" - end -end - -function cbiAddMember(field) - uci.cursor():foreach("mwan3", "member", - function (section) - field:value(section[".name"]) - end - ) -end - --- ------ policy configuration ------ -- - dsp = require "luci.dispatcher" arg[1] = arg[1] or "" -nameTooLong = 0 -policyCheck() - - -m5 = Map("mwan3", translatef("MWAN Policy Configuration - %s", arg[1]), - policyWarn()) - m5.redirect = dsp.build_url("admin", "network", "mwan", "policy") +m5 = Map("mwan3", translatef("MWAN Policy Configuration - %s", arg[1])) +m5.redirect = dsp.build_url("admin", "network", "mwan", "policy") mwan_policy = m5:section(NamedSection, arg[1], "policy", "") - mwan_policy.addremove = false - mwan_policy.dynamic = false - +mwan_policy.addremove = false +mwan_policy.dynamic = false -use_member = mwan_policy:option(DynamicList, "use_member", translate("Member used")) - cbiAddMember(use_member) +member = mwan_policy:option(DynamicList, "use_member", translate("Member used")) +m5.uci:foreach("mwan3", "member", + function(s) + member:value(s['.name'], s['.name']) + end +) last_resort = mwan_policy:option(ListValue, "last_resort", translate("Last resort"), translate("When all policy members are offline use this behavior for matched traffic")) - last_resort.default = "unreachable" - last_resort:value("unreachable", translate("unreachable (reject)")) - last_resort:value("blackhole", translate("blackhole (drop)")) - last_resort:value("default", translate("default (use main routing table)")) - - --- ------ currently configured members ------ -- - -mwan_member = m5:section(TypedSection, "member", translate("Currently Configured Members")) - mwan_member.addremove = false - mwan_member.dynamic = false - mwan_member.sortable = false - mwan_member.template = "cbi/tblsection" - +last_resort.default = "unreachable" +last_resort:value("unreachable", translate("unreachable (reject)")) +last_resort:value("blackhole", translate("blackhole (drop)")) +last_resort:value("default", translate("default (use main routing table)")) return m5 diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua index 586f174b28..5b19693e66 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua @@ -1,141 +1,99 @@ --- ------ extra functions ------ -- +dsp = require "luci.dispatcher" + -function ruleCheck() -- determine if rules needs a proper protocol configured +function ruleCheck() + local rule_error = {} uci.cursor():foreach("mwan3", "rule", function (section) - local sourcePort = ut.trim(sys.exec("uci -p /var/state get mwan3." .. section[".name"] .. ".src_port")) - local destPort = ut.trim(sys.exec("uci -p /var/state get mwan3." .. section[".name"] .. ".dest_port")) - if sourcePort ~= "" or destPort ~= "" then -- ports configured - local protocol = ut.trim(sys.exec("uci -p /var/state get mwan3." .. section[".name"] .. ".proto")) - if protocol == "" or protocol == "all" then -- no or improper protocol - error_protocol_list = error_protocol_list .. section[".name"] .. " " + rule_error[section[".name"]] = false + local uci = uci.cursor(nil, "/var/state") + local sourcePort = uci:get("mwan3", section[".name"], "src_port") + local destPort = uci:get("mwan3", section[".name"], "dest_port") + if sourcePort ~= nil or destPort ~= nil then + local protocol = uci:get("mwan3", section[".name"], "proto") + if protocol == nil or protocol == "all" then + rule_error[section[".name"]] = true end end end ) + return rule_error end -function ruleWarn() -- display warning messages at the top of the page - if error_protocol_list ~= " " then - return "<font color=\"ff0000\"><strong>" .. translate("WARNING: Some rules have a port configured with no or improper protocol specified! Please configure a specific protocol!") .. "</strong></font>" - else - return "" +function ruleWarn(rule_error) + local warnings = "" + for i, k in pairs(rule_error) do + if rule_error[i] == true then + warnings = warnings .. string.format("<strong>%s</strong></br>", + translatef("WARNING: Rule %s have a port configured with no or improper protocol specified!", i) + ) + end end -end - --- ------ rule configuration ------ -- -dsp = require "luci.dispatcher" -sys = require "luci.sys" -ut = require "luci.util" - -error_protocol_list = " " -ruleCheck() - - -m5 = Map("mwan3", translate("MWAN Rule Configuration"), - ruleWarn()) - m5:append(Template("mwan/config_css")) + return warnings +end +m5 = Map("mwan3", translate("MWAN - Rules"), + ruleWarn(ruleCheck()) + ) -mwan_rule = m5:section(TypedSection, "rule", translate("Traffic Rules"), - translate("Rules specify which traffic will use a particular MWAN policy based on IP address, port or protocol<br />" .. - "Rules are matched from top to bottom. Rules below a matching rule are ignored. Traffic not matching any rule is routed using the main routing table<br />" .. - "Traffic destined for known (other than default) networks is handled by the main routing table. Traffic matching a rule, but all WAN interfaces for that policy are down will be blackholed<br />" .. +mwan_rule = m5:section(TypedSection, "rule", nil, + translate("Rules specify which traffic will use a particular MWAN policy<br />" .. + "Rules are based on IP address, port or protocol<br />" .. + "Rules are matched from top to bottom<br />" .. + "Rules below a matching rule are ignored<br />" .. + "Traffic not matching any rule is routed using the main routing table<br />" .. + "Traffic destined for known (other than default) networks is handled by the main routing table<br />" .. + "Traffic matching a rule, but all WAN interfaces for that policy are down will be blackholed<br />" .. "Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br />" .. "Rules may not share the same name as configured interfaces, members or policies")) - mwan_rule.addremove = true - mwan_rule.anonymous = false - mwan_rule.dynamic = false - mwan_rule.sectionhead = translate("Rule") - mwan_rule.sortable = true - mwan_rule.template = "cbi/tblsection" - mwan_rule.extedit = dsp.build_url("admin", "network", "mwan", "rule", "%s") - function mwan_rule.create(self, section) - TypedSection.create(self, section) - m5.uci:save("mwan3") - luci.http.redirect(dsp.build_url("admin", "network", "mwan", "rule", section)) - end - +mwan_rule.addremove = true +mwan_rule.anonymous = false +mwan_rule.dynamic = false +mwan_rule.sectionhead = translate("Rule") +mwan_rule.sortable = true +mwan_rule.template = "cbi/tblsection" +mwan_rule.extedit = dsp.build_url("admin", "network", "mwan", "rule", "%s") +function mwan_rule.create(self, section) + TypedSection.create(self, section) + m5.uci:save("mwan3") + luci.http.redirect(dsp.build_url("admin", "network", "mwan", "rule", section)) +end src_ip = mwan_rule:option(DummyValue, "src_ip", translate("Source address")) - src_ip.rawhtml = true - function src_ip.cfgvalue(self, s) - return self.map:get(s, "src_ip") or "—" - end +src_ip.rawhtml = true +function src_ip.cfgvalue(self, s) + return self.map:get(s, "src_ip") or "—" +end src_port = mwan_rule:option(DummyValue, "src_port", translate("Source port")) - src_port.rawhtml = true - function src_port.cfgvalue(self, s) - return self.map:get(s, "src_port") or "—" - end +src_port.rawhtml = true +function src_port.cfgvalue(self, s) + return self.map:get(s, "src_port") or "—" +end dest_ip = mwan_rule:option(DummyValue, "dest_ip", translate("Destination address")) - dest_ip.rawhtml = true - function dest_ip.cfgvalue(self, s) - return self.map:get(s, "dest_ip") or "—" - end +dest_ip.rawhtml = true +function dest_ip.cfgvalue(self, s) + return self.map:get(s, "dest_ip") or "—" +end dest_port = mwan_rule:option(DummyValue, "dest_port", translate("Destination port")) - dest_port.rawhtml = true - function dest_port.cfgvalue(self, s) - return self.map:get(s, "dest_port") or "—" - end +dest_port.rawhtml = true +function dest_port.cfgvalue(self, s) + return self.map:get(s, "dest_port") or "—" +end proto = mwan_rule:option(DummyValue, "proto", translate("Protocol")) - proto.rawhtml = true - function proto.cfgvalue(self, s) - return self.map:get(s, "proto") or "all" - end - -sticky = mwan_rule:option(DummyValue, "sticky", translate("Sticky")) - sticky.rawhtml = true - function sticky.cfgvalue(self, s) - if self.map:get(s, "sticky") == "1" then - stickied = 1 - return translate("Yes") - else - stickied = nil - return translate("No") - end - end - -timeout = mwan_rule:option(DummyValue, "timeout", translate("Sticky timeout")) - timeout.rawhtml = true - function timeout.cfgvalue(self, s) - if stickied then - local timeoutValue = self.map:get(s, "timeout") - if timeoutValue then - return timeoutValue .. "s" - else - return "600s" - end - else - return "—" - end - end - -ipset = mwan_rule:option(DummyValue, "ipset", translate("IPset")) - ipset.rawhtml = true - function ipset.cfgvalue(self, s) - return self.map:get(s, "ipset") or "—" - end +proto.rawhtml = true +function proto.cfgvalue(self, s) + return self.map:get(s, "proto") or "all" +end use_policy = mwan_rule:option(DummyValue, "use_policy", translate("Policy assigned")) - use_policy.rawhtml = true - function use_policy.cfgvalue(self, s) - return self.map:get(s, "use_policy") or "—" - end - -errors = mwan_rule:option(DummyValue, "errors", translate("Errors")) - errors.rawhtml = true - function errors.cfgvalue(self, s) - if not string.find(error_protocol_list, " " .. s .. " ") then - return "" - else - return "<span title=\"" .. translate("No protocol specified") .. "\"><img src=\"/luci-static/resources/cbi/reset.gif\" alt=\"error\"></img></span>" - end - end - +use_policy.rawhtml = true +function use_policy.cfgvalue(self, s) + return self.map:get(s, "use_policy") or "—" +end return m5 diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua index 87c4691af4..712ada03ed 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua @@ -1,113 +1,59 @@ --- ------ extra functions ------ -- - -function ruleCheck() -- determine if rule needs a protocol specified - local sourcePort = ut.trim(sys.exec("uci -p /var/state get mwan3." .. arg[1] .. ".src_port")) - local destPort = ut.trim(sys.exec("uci -p /var/state get mwan3." .. arg[1] .. ".dest_port")) - if sourcePort ~= "" or destPort ~= "" then -- ports configured - local protocol = ut.trim(sys.exec("uci -p /var/state get mwan3." .. arg[1] .. ".proto")) - if protocol == "" or protocol == "all" then -- no or improper protocol - error_protocol = 1 - end - end -end - -function ruleWarn() -- display warning message at the top of the page - if error_protocol == 1 then - return "<font color=\"ff0000\"><strong>" .. translate("WARNING: This rule is incorrectly configured with no or improper protocol specified! Please configure a specific protocol!") .. "</strong></font>" - else - return "" - end -end - -function cbiAddPolicy(field) - uci.cursor():foreach("mwan3", "policy", - function (section) - field:value(section[".name"]) - end - ) -end - -function cbiAddProtocol(field) - local protocols = ut.trim(sys.exec("cat /etc/protocols | grep ' # ' | awk '{print $1}' | grep -vw -e 'ip' -e 'tcp' -e 'udp' -e 'icmp' -e 'esp' | grep -v 'ipv6' | sort | tr '\n' ' '")) - for p in string.gmatch(protocols, "%S+") do - field:value(p) - end -end - --- ------ rule configuration ------ -- - dsp = require "luci.dispatcher" -sys = require "luci.sys" -ut = require "luci.util" arg[1] = arg[1] or "" -error_protocol = 0 -ruleCheck() - - -m5 = Map("mwan3", translatef("MWAN Rule Configuration - %s", arg[1]), - ruleWarn()) - m5.redirect = dsp.build_url("admin", "network", "mwan", "rule") +m5 = Map("mwan3", translatef("MWAN Rule Configuration - %s", arg[1])) +m5.redirect = dsp.build_url("admin", "network", "mwan", "rule") mwan_rule = m5:section(NamedSection, arg[1], "rule", "") - mwan_rule.addremove = false - mwan_rule.dynamic = false - +mwan_rule.addremove = false +mwan_rule.dynamic = false src_ip = mwan_rule:option(Value, "src_ip", translate("Source address"), translate("Supports CIDR notation (eg \"192.168.100.0/24\") without quotes")) - src_ip.datatype = ipaddr +src_ip.datatype = ipaddr src_port = mwan_rule:option(Value, "src_port", translate("Source port"), translate("May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or as a portrange (eg \"1024:2048\") without quotes")) dest_ip = mwan_rule:option(Value, "dest_ip", translate("Destination address"), translate("Supports CIDR notation (eg \"192.168.100.0/24\") without quotes")) - dest_ip.datatype = ipaddr +dest_ip.datatype = ipaddr dest_port = mwan_rule:option(Value, "dest_port", translate("Destination port"), translate("May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or as a portrange (eg \"1024:2048\") without quotes")) proto = mwan_rule:option(Value, "proto", translate("Protocol"), - translate("View the contents of /etc/protocols for protocol descriptions")) - proto.default = "all" - proto.rmempty = false - proto:value("all") - proto:value("ip") - proto:value("tcp") - proto:value("udp") - proto:value("icmp") - proto:value("esp") - cbiAddProtocol(proto) + translate("View the content of /etc/protocols for protocol description")) +proto.default = "all" +proto.rmempty = false +proto:value("all") +proto:value("tcp") +proto:value("udp") +proto:value("icmp") +proto:value("esp") sticky = mwan_rule:option(ListValue, "sticky", translate("Sticky"), translate("Traffic from the same source IP address that previously matched this rule within the sticky timeout period will use the same WAN interface")) - sticky.default = "0" - sticky:value("1", translate("Yes")) - sticky:value("0", translate("No")) +sticky.default = "0" +sticky:value("1", translate("Yes")) +sticky:value("0", translate("No")) timeout = mwan_rule:option(Value, "timeout", translate("Sticky timeout"), translate("Seconds. Acceptable values: 1-1000000. Defaults to 600 if not set")) - timeout.datatype = "range(1, 1000000)" +timeout.datatype = "range(1, 1000000)" ipset = mwan_rule:option(Value, "ipset", translate("IPset"), translate("Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/youtube.com/youtube\")")) -use_policy = mwan_rule:option(Value, "use_policy", translate("Policy assigned")) - cbiAddPolicy(use_policy) - use_policy:value("unreachable", translate("unreachable (reject)")) - use_policy:value("blackhole", translate("blackhole (drop)")) - use_policy:value("default", translate("default (use main routing table)")) - - --- ------ currently configured policies ------ -- - -mwan_policy = m5:section(TypedSection, "policy", translate("Currently Configured Policies")) - mwan_policy.addremove = false - mwan_policy.dynamic = false - mwan_policy.sortable = false - mwan_policy.template = "cbi/tblsection" - +policy = mwan_rule:option(Value, "use_policy", translate("Policy assigned")) +m5.uci:foreach("mwan3", "policy", + function(s) + policy:value(s['.name'], s['.name']) + end +) +policy:value("unreachable", translate("unreachable (reject)")) +policy:value("blackhole", translate("blackhole (drop)")) +policy:value("default", translate("default (use main routing table)")) return m5 diff --git a/applications/luci-app-mwan3/luasrc/view/admin_status/index/mwan.htm b/applications/luci-app-mwan3/luasrc/view/admin_status/index/mwan.htm index 53b997af90..d76db724bd 100644 --- a/applications/luci-app-mwan3/luasrc/view/admin_status/index/mwan.htm +++ b/applications/luci-app-mwan3/luasrc/view/admin_status/index/mwan.htm @@ -1 +1 @@ -<%+mwan/openwrt_overview_status%> +<%+mwan/overview_status_interface%> diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/config_css.htm b/applications/luci-app-mwan3/luasrc/view/mwan/config_css.htm deleted file mode 100644 index 5d91c536eb..0000000000 --- a/applications/luci-app-mwan3/luasrc/view/mwan/config_css.htm +++ /dev/null @@ -1,28 +0,0 @@ -<style type="text/css"> - table td { /* cells showing the configuration values */ - padding: 0px; - text-align: center; - vertical-align: middle; - } - table th { /* column for configuration section name */ - padding: 0px; - text-align: center; - vertical-align: middle; - } - table tbody th { /* column for configuration section name */ - padding: 0px; - vertical-align: middle; - } - .cbi-section-node table div { /* rows */ - padding-top: 5px; - } - table.cbi-section-table td.cbi-section-table-cell { /* sort buttons column */ - text-align: center; - } - .cbi-section h3 { - color: rgb(85, 85, 85); - font-family: Trebuchet MS,Verdana,sans-serif; - font-style: italic; - font-weight: normal; - } -</style> diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/openwrt_overview_status.htm b/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm index 335c95c8fd..279f140bab 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/openwrt_overview_status.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm @@ -1,44 +1,46 @@ <script type="text/javascript">//<![CDATA[ - XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface_status")%>', null, - function(x, mArray) +XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface_status")%>', null, + function(x, status) { - var status = document.getElementById('mwan_status_text'); - if (mArray.wans) + var statusDiv = document.getElementById('mwan_status_text'); + if (status.interfaces) { - var temp = ''; - for ( var i = 0; i < mArray.wans.length; i++ ) + var statusview = ''; + for ( var iface in status.interfaces) { - var stat = ''; - var cssc = ''; - switch (mArray.wans[i].status) + var state = ''; + var css = ''; + switch (status.interfaces[iface].status) { case 'online': - stat = '<%:Online (tracking active)%>'; - cssc = 'wanon'; + state = '<%:Online (tracking active)%>'; + css = 'wanon'; break; case 'notMonitored': - stat = '<%:Online (tracking off)%>'; - cssc = 'wanon'; + state = '<%:Online (tracking off)%>'; + css = 'wanon'; break; case 'offline': - stat = '<%:Offline%>'; - cssc = 'wanoff'; + state = '<%:Offline%>'; + css = 'wanoff'; break; - case 'notEnabled': - stat = '<%:Disabled%>'; - cssc = 'wanoff'; + default: + state = '<%:Disabled%>'; + css = 'wanoff'; break; } - temp += String.format( - '<span class="%s"><strong>%s (<a href="%q">%s</a>)</strong><br />%s</span>', - cssc, mArray.wans[i].name, mArray.wans[i].link, mArray.wans[i].ifname, stat + statusview += String.format( + '<span class="%s"><strong>%s</strong><br />%s</span>', + css, + iface, + state ); } - status.innerHTML = temp; + statusDiv.innerHTML = statusview; } else { - status.innerHTML = '<strong><%:No MWAN interfaces found%></strong>'; + statusDiv.innerHTML = '<strong><%:No MWAN interfaces found%></strong>'; } } ); diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm index 0ff2824ed2..708479cf84 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm @@ -1,8 +1,8 @@ <%+header%> <ul class="cbi-tabmenu"> - <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/overview")%>"><%:Interface Status%></a></li> - <li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/detail")%>"><%:Detailed Status%></a></li> + <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/overview")%>"><%:Interface%></a></li> + <li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/detail")%>"><%:Detail%></a></li> <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/diagnostics")%>"><%:Diagnostics%></a></li> <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/troubleshooting")%>"><%:Troubleshooting%></a></li> </ul> @@ -10,33 +10,24 @@ <script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript">//<![CDATA[ XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "detailed_status")%>', null, - function(x, mArray) + function(x) { - var status = document.getElementById('mwan_detail_text'); - if (mArray.mwandetail) - { - status.innerHTML = String.format('<pre>%s</pre>', mArray.mwandetail[0]); - } - else - { - status.innerHTML = '<strong><%:No detailed status information available%></strong>'; - } + var legend = document.getElementById('diag-rc-legend'); + var output = document.getElementById('diag-rc-output'); + legend.style.display = 'none'; + output.innerHTML = String.format('<pre>%h</pre>', x.responseText); } ); //]]></script> -<div id="mwan_detail_status"> +<div class="cbi-map"> + <h2 name="content"><%:MWAN Status - Detail%></h2> <fieldset class="cbi-section"> - <legend><%:MWAN Detailed Status%></legend> - <div id="mwan_detail_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /><%:Collecting data...%></div> + <legend id="diag-rc-legend"><%:Collecting data...%></legend> + <span id="diag-rc-output"> + <img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align: middle;" /> + </span> </fieldset> </div> -<style type="text/css"> - #mwan_detail_text { - padding: 20px; - text-align: left; - } -</style> - <%+footer%> diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm index 19433f4d9f..d524e101eb 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm @@ -1,8 +1,8 @@ <%+header%> <ul class="cbi-tabmenu"> - <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/overview")%>"><%:Interface Status%></a></li> - <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/detail")%>"><%:Detailed Status%></a></li> + <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/overview")%>"><%:Interface%></a></li> + <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/detail")%>"><%:Detail%></a></li> <li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/diagnostics")%>"><%:Diagnostics%></a></li> <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/troubleshooting")%>"><%:Troubleshooting%></a></li> </ul> @@ -10,10 +10,11 @@ <% local uci = require "luci.model.uci" - interfaceNames = "" + local iface = {} + uci.cursor():foreach("mwan3", "interface", function (section) - interfaceNames = interfaceNames .. section[".name"] .. " " + table.insert(iface, section[".name"]) end ) %> @@ -22,92 +23,64 @@ <script type="text/javascript">//<![CDATA[ var stxhr = new XHR(); - function update_status(tool, task, task_name) + function update_status(iface, task) { - var iface = document.getElementById('mwaniface').value; - var output = document.getElementById('diag_output'); + var legend = document.getElementById('diag-rc-legend'); + var output = document.getElementById('diag-rc-output'); - if (tool == "service") - { - output.innerHTML = - '<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="padding: 20px; vertical-align: middle;" /> ' + - String.format("<%:Waiting for MWAN to %s...%>", task_name) - ; - } - else - { - output.innerHTML = - '<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="padding: 20px; vertical-align: middle;" /> ' + - "<%:Waiting for diagnostic results...%>" - ; - } + output.innerHTML = + '<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align: middle;" />' + + "<%:Waiting for command to complete...%>" + ; output.parentNode.style.display = 'block'; output.style.display = 'inline'; - stxhr.get('<%=luci.dispatcher.build_url("admin", "status", "mwan")%>/diagnostics_display' + '/' + iface + '/' + tool + '/' + task, null, - function(x, mArray) + stxhr.post('<%=url('admin/status/mwan')%>/diagnostics_display' + '/' + iface + '/' + task, { token: '<%=token%>' }, + function(x) { - if (mArray.diagnostics) - { - output.innerHTML = String.format('<pre id="diag_output_css">%h</pre>', mArray.diagnostics[0]); - } - else - { - output.innerHTML = '<pre id="diag_output_css"><strong><%:No diagnostic results returned%></strong></pre>'; - } + legend.style.display = 'none'; + output.innerHTML = String.format('<pre>%h</pre>', x.responseText); } ); } //]]></script> -<div id="mwan_diagnostics" class="cbi-map"> - <fieldset id="diag_select" class="cbi-section"> - <legend><%:MWAN Interface Diagnostics%></legend> - <select id="mwaniface"> - <% for z in interfaceNames:gmatch("[^ ]+") do -%><option value="<%=z%>"><%=z%></option><%- end %> - </select> - <div id="buttoncss"> - <input type="button" value="<%:Ping default gateway%>" class="cbi-button cbi-button-apply" onclick="update_status('ping', 'gateway', null)" /> - <input type="button" value="<%:Ping tracking IP%>" class="cbi-button cbi-button-apply" onclick="update_status('ping', 'track_ip', null)" /> - <input type="button" value="<%:Check IP rules%>" class="cbi-button cbi-button-apply" onclick="update_status('rulechk', null, null)" /> - <input type="button" value="<%:Check routing table%>" class="cbi-button cbi-button-apply" onclick="update_status('routechk', null, null)" /> - <input type="button" value="<%:Hotplug ifup%>" class="cbi-button cbi-button-apply" onclick="update_status('hotplug', 'ifup', null)" /> - <input type="button" value="<%:Hotplug ifdown%>" class="cbi-button cbi-button-apply" onclick="update_status('hotplug', 'ifdown', null)" /> - </div> - </fieldset> - <fieldset id="diag_select" class="cbi-section"> - <legend><%:MWAN Service Control%></legend> - <div id="buttoncss"> - <input type="button" value="<%:Restart MWAN%>" class="cbi-button cbi-button-apply" onclick="update_status('service', 'restart', '<%:restart%>')" /> - <input type="button" value="<%:Stop MWAN%>" class="cbi-button cbi-button-apply" onclick="update_status('service', 'stop', '<%:stop%>')" /> - <input type="button" value="<%:Start MWAN%>" class="cbi-button cbi-button-apply" onclick="update_status('service', 'start', '<%:start%>')" /> - </div> - </fieldset> +<form method="post" action="<%=url('admin/network/diagnostics')%>"> + <div class="cbi-map"> + <h2 name="content"><%:MWAN Status - Diagnostics%></h2> + + <fieldset class="cbi-section"> + <br /> + + <div style="width:30%; float:left"> + <label class="cbi-value-title"><%:Interface%></label> + <select name="iface" style="width:auto"> + <% for _, z in ipairs(iface) do -%><option value="<%=z%>"><%=z%></option><%- end %> + </select> + </div> + + <div style="width:30%; float:left"> + <label class="cbi-value-title"><%:Task%></label> + <select name="task" style="width:auto"> + <option value="ping_gateway"><%:Ping default gateway%></option> + <option value="ping_trackips"><%:Ping tracking IP%></option> + <option value="check_rules"><%:Check IP rules%></option> + <option value="check_routes"><%:Check routing table%></option> + <option value="hotplug_ifup"><%:Hotplug ifup%>"</option> + <option value="hotplug_ifdown"><%:Hotplug ifdown%></option> + </select> + </div> + + <div style="width:30%; float:left"> + <input type="button" value="<%:Execute%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.iface.value, this.form.task.value)"/> + </div> + </fieldset> + </div> <fieldset class="cbi-section" style="display:none"> - <legend><%:Diagnostic Results%></legend> - <div id="diag_output"></div> + <legend id="diag-rc-legend"><%:Collecting data...%></legend> + <span id="diag-rc-output"></span> </fieldset> -</div> - -<style type="text/css"> - #mwaniface { - float: left; - margin: 8px 20px 0px 0px; - } - #buttoncss { - display: table; - float: left; - text-align: left; - } - .cbi-button { - margin: 8px 20px 0px 0px; - min-width: 153px; - } - #diag_output_css { - padding: 20px; - text-align: left; - } -</style> +</form> <%+footer%> diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm index c7039f7a61..1c9123c709 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm @@ -1,8 +1,8 @@ <%+header%> <ul class="cbi-tabmenu"> - <li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/overview")%>"><%:Interface Status%></a></li> - <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/detail")%>"><%:Detailed Status%></a></li> + <li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/overview")%>"><%:Interface%></a></li> + <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/detail")%>"><%:Detail%></a></li> <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/diagnostics")%>"><%:Diagnostics%></a></li> <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/troubleshooting")%>"><%:Troubleshooting%></a></li> </ul> @@ -10,70 +10,57 @@ <script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript">//<![CDATA[ XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface_status")%>', null, - function(x, mArray) + function(x, status) { var statusDiv = document.getElementById('mwan_status_text'); - if (mArray.wans) + if (status.interfaces) { - var interfaceStatus = ''; - for ( var i = 0; i < mArray.wans.length; i++ ) + var statusview = ''; + for ( var iface in status.interfaces) { - var status = ''; + var state = ''; var css = ''; - switch (mArray.wans[i].status) + switch (status.interfaces[iface].status) { case 'online': - status = '<%:Online (tracking active)%>'; + state = '<%:Online (tracking active)%>'; css = 'wanon'; break; case 'notMonitored': - status = '<%:Online (tracking off)%>'; + state = '<%:Online (tracking off)%>'; css = 'wanon'; break; case 'offline': - status = '<%:Offline%>'; + state = '<%:Offline%>'; css = 'wanoff'; break; - case 'notEnabled': - status = '<%:Disabled%>'; + default: + state = '<%:Disabled%>'; css = 'wanoff'; break; } - interfaceStatus += String.format( - '<span class="%s"><strong>%s (<a href="%q">%s</a>)</strong><br />%s</span>', - css, mArray.wans[i].name, mArray.wans[i].link, mArray.wans[i].ifname, status + statusview += String.format( + '<span class="%s"><strong>%s</strong><br />%s</span>', + css, + iface, + state ); } - statusDiv.innerHTML = interfaceStatus; + statusDiv.innerHTML = statusview; } else { statusDiv.innerHTML = '<strong><%:No MWAN interfaces found%></strong>'; } - - var logs = document.getElementById('mwan_statuslog_text'); - if (mArray.mwanlog) - { - var mwanLog = '<%:Last 50 MWAN systemlog entries. Newest entries sorted at the top :%>'; - logs.innerHTML = String.format('<pre>%s<br /><br />%s</pre>', mwanLog, mArray.mwanlog[0]); - } - else - { - logs.innerHTML = '<strong><%:No MWAN systemlog history found%></strong>'; - } } ); //]]></script> <div id="mwan_interface_status"> <fieldset id="interface_field" class="cbi-section"> - <legend><%:MWAN Interface Live Status%></legend> + <legend><%:MWAN status - Interface Live Status%></legend> <div id="mwan_status_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /><%:Collecting data...%></div> </fieldset> - <fieldset class="cbi-section"> - <legend><%:MWAN Interface Systemlog%></legend> - <div id="mwan_statuslog_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /><%:Collecting data...%></div> - </fieldset> </div> <style type="text/css"> diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm index 483e289493..348bf947fb 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm @@ -1,8 +1,8 @@ <%+header%> <ul class="cbi-tabmenu"> - <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/overview")%>"><%:Interface Status%></a></li> - <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/detail")%>"><%:Detailed Status%></a></li> + <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/overview")%>"><%:Interface%></a></li> + <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/detail")%>"><%:Detail%></a></li> <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/diagnostics")%>"><%:Diagnostics%></a></li> <li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/troubleshooting")%>"><%:Troubleshooting%></a></li> </ul> @@ -10,52 +10,24 @@ <script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript">//<![CDATA[ XHR.poll(15, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "troubleshooting_display")%>', null, - function(x, mArray) + function(x) { - var tshoot = document.getElementById('troubleshoot_text'); - if (mArray.versions) - { - var versions = '<span class="description">Software versions : </span><br /><br />'; - var mwanConfig = '<br /><br /><span class="description">Output of "cat /etc/config/mwan3" : </span><br /><br />'; - var netConfig = '<br /><br /><span class="description">Output of "cat /etc/config/network" : </span><br /><br />'; - var wifiConfig = '<br /><br /><span class="description">Output of "cat /etc/config/wireless" : </span><br /><br />'; - var ifconfig = '<br /><br /><span class="description">Output of "ifconfig" : </span><br /><br />'; - var ipRoute = '<br /><br /><span class="description">Output of "route -n" : </span><br /><br />'; - var ipRuleShow = '<br /><br /><span class="description">Output of "ip rule show" : </span><br /><br />'; - var routeListTable = '<br /><br /><span class="description">Output of "ip route list table 1-250" : </span><br /><br />'; - var firewallOut = '<br /><br /><span class="description">Firewall default output policy (must be ACCEPT) : </span><br /><br />'; - var iptables = '<br /><br /><span class="description">Output of "iptables -L -t mangle -v -n" : </span><br /><br />'; - tshoot.innerHTML = String.format( - '<pre>%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s</pre>', - versions, mArray.versions[0], mwanConfig, mArray.mwanconfig[0], netConfig, mArray.netconfig[0], - wifiConfig, mArray.wificonfig[0], ifconfig, mArray.ifconfig[0], ipRoute, mArray.routeshow[0], - ipRuleShow, mArray.iprule[0], routeListTable, mArray.routelist[0], firewallOut, mArray.firewallout[0], - iptables, mArray.iptables[0] - ); - } - else - { - tshoot.innerHTML = '<strong><%:Error collecting troubleshooting information%></strong>'; - } + var legend = document.getElementById('diag-rc-legend'); + var output = document.getElementById('diag-rc-output'); + legend.style.display = 'none'; + output.innerHTML = String.format('<pre>%h</pre>', x.responseText); } ); //]]></script> -<div id="troubleshoot"> +<div class="cbi-map"> + <h2 name="content"><%:MWAN Status - Troubleshooting%></h2> <fieldset class="cbi-section"> - <legend><%:Troubleshooting Data%></legend> - <div id="troubleshoot_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /><%:Collecting data...%></div> + <legend id="diag-rc-legend"><%:Collecting data...%></legend> + <span id="diag-rc-output"> + <img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align: middle;" /> + </span> </fieldset> </div> -<style type="text/css"> - #troubleshoot_text { - padding: 20px; - text-align: left; - } - .description { - background-color: rgb(78, 186, 241); - } -</style> - <%+footer%> diff --git a/applications/luci-app-mwan3/po/ja/mwan3.po b/applications/luci-app-mwan3/po/ja/mwan3.po index f7f544da22..4b3662a425 100644 --- a/applications/luci-app-mwan3/po/ja/mwan3.po +++ b/applications/luci-app-mwan3/po/ja/mwan3.po @@ -49,26 +49,14 @@ msgstr "ルーティング テーブルのチェック" msgid "Collecting data..." msgstr "データ収集中です..." -msgid "Currently Configured Interfaces" -msgstr "設定済みインターフェース" - -msgid "Currently Configured Members" -msgstr "設定済みメンバー" - -msgid "Currently Configured Policies" -msgstr "設定済みポリシー" - msgid "Destination address" msgstr "宛先アドレス" msgid "Destination port" msgstr "宛先ポート" -msgid "Detailed Status" -msgstr "詳細ステータス" - -msgid "Diagnostic Results" -msgstr "診断結果" +msgid "Detail" +msgstr "" msgid "Diagnostics" msgstr "診断機能" @@ -88,11 +76,8 @@ msgstr "有効" msgid "Enter value in hex, starting with <code>0x</code>" msgstr "<code>0x</code> で始まる16進数の値を入力してください。" -msgid "Error collecting troubleshooting information" -msgstr "トラブルシューティング情報の収集エラー" - -msgid "Errors" -msgstr "エラー" +msgid "Execute" +msgstr "" msgid "Expect interface state on up event" msgstr "Up イベント時に予想されるインターフェースの状態です。" @@ -112,9 +97,6 @@ msgstr "" msgid "Globals" msgstr "全般" -msgid "Globals mwan3 options" -msgstr "MWAN3 全般オプション" - msgid "Hotplug ifdown" msgstr "ホットプラグ ifdown" @@ -136,9 +118,6 @@ msgstr "初期状態" msgid "Interface" msgstr "インターフェース" -msgid "Interface Status" -msgstr "インターフェース ステータス" - msgid "Interface down" msgstr "インターフェース Down" @@ -162,9 +141,6 @@ msgstr "" msgid "Keep ping failure interval during failure state" msgstr "" -msgid "Last 50 MWAN systemlog entries. Newest entries sorted at the top :" -msgstr "直近の MWAN システムログ（50行）です。一番上が最新の行です:" - msgid "Last resort" msgstr "最終手段" @@ -177,47 +153,50 @@ msgstr "読込中" msgid "Local source interface" msgstr "" -msgid "MWAN Detailed Status" -msgstr "MWAN 詳細ステータス" +msgid "MWAN - Globals" +msgstr "" + +msgid "MWAN - Interfaces" +msgstr "" + +msgid "MWAN - Members" +msgstr "" -msgid "MWAN Interface Configuration" -msgstr "MWAN インターフェース設定" +msgid "MWAN - Notification" +msgstr "" + +msgid "MWAN - Policies" +msgstr "" + +msgid "MWAN - Rules" +msgstr "" msgid "MWAN Interface Configuration - %s" msgstr "MWAN インターフェース設定 - %s" -msgid "MWAN Interface Diagnostics" -msgstr "MWAN インターフェース診断" - msgid "MWAN Interface Live Status" msgstr "MWAN インターフェース Live ステータス" -msgid "MWAN Interface Systemlog" -msgstr "MWAN インターフェース システムログ" - -msgid "MWAN Member Configuration" -msgstr "MWAN メンバー設定" - msgid "MWAN Member Configuration - %s" msgstr "MWAN メンバー設定 - %s" -msgid "MWAN Notification" -msgstr "" - -msgid "MWAN Policy Configuration" -msgstr "MWAN ポリシー設定" - msgid "MWAN Policy Configuration - %s" msgstr "MWAN ポリシー設定 - %s" -msgid "MWAN Rule Configuration" -msgstr "MWAN ルール設定" - msgid "MWAN Rule Configuration - %s" msgstr "MWAN ルール設定 - %s" -msgid "MWAN Service Control" -msgstr "MWAN サービス コントロール" +msgid "MWAN Status - Detail" +msgstr "" + +msgid "MWAN Status - Diagnostics" +msgstr "" + +msgid "MWAN Status - Troubleshooting" +msgstr "" + +msgid "MWAN status - Interface Live Status" +msgstr "" msgid "" "MWAN supports up to 250 physical and/or logical interfaces<br />MWAN " @@ -280,18 +259,6 @@ msgstr "いいえ" msgid "No MWAN interfaces found" msgstr "MWAN インターフェースが見つかりません" -msgid "No MWAN systemlog history found" -msgstr "MWAN システムログの履歴が見つかりません" - -msgid "No detailed status information available" -msgstr "詳細ステータス情報は利用できません" - -msgid "No diagnostic results returned" -msgstr "診断結果がありません" - -msgid "No protocol specified" -msgstr "プロトコルが設定されていません" - msgid "Notification" msgstr "" @@ -364,9 +331,6 @@ msgstr "プロトコル" msgid "Recovery interval" msgstr "障害復旧 インターバル" -msgid "Restart MWAN" -msgstr "MWAN の再起動" - msgid "Rule" msgstr "ルール" @@ -374,25 +338,16 @@ msgid "Rules" msgstr "ルール" msgid "" -"Rules specify which traffic will use a particular MWAN policy based on IP " -"address, port or protocol<br />Rules are matched from top to bottom. Rules " -"below a matching rule are ignored. Traffic not matching any rule is routed " -"using the main routing table<br />Traffic destined for known (other than " -"default) networks is handled by the main routing table. Traffic matching a " -"rule, but all WAN interfaces for that policy are down will be blackholed<br /" -">Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br />Rules may " -"not share the same name as configured interfaces, members or policies" -msgstr "" -"ルールは IP アドレスやポート、プロトコルを基に、トラフィックがどの MWAN ポリ" -"シーを使用するかを設定します。<br />ルールは上から下へマッチングが行われ、合" -"致したルールより下のルールは無視されます。全てのルールに合致しないトラフィッ" -"クは、メインのルーティング テーブルを使用してルートが決定されます。<br />既知" -"（デフォルト以外）のネットワークへのトラフィックは、メインのルーティング テー" -"ブルによって制御されます。ルールに合致したトラフィックでも、当該ポリシーの全 " -"WAN インターフェースが Down 状態の場合は blackhole 状態となります。<br />名前" -"は A-Z, a-z, 0-9, _ を含むことができますが、スペースは使用できません。<br />" -"ルールは、設定済みのインターフェースやメンバー、ポリシーと同じ名前を使用する" -"ことはできません。" +"Rules specify which traffic will use a particular MWAN policy<br />Rules are " +"based on IP address, port or protocol<br />Rules are matched from top to " +"bottom<br />Rules below a matching rule are ignored<br />Traffic not " +"matching any rule is routed using the main routing table<br />Traffic " +"destined for known (other than default) networks is handled by the main " +"routing table<br />Traffic matching a rule, but all WAN interfaces for that " +"policy are down will be blackholed<br />Names may contain characters A-Z, a-" +"z, 0-9, _ and no spaces<br />Rules may not share the same name as configured " +"interfaces, members or policies" +msgstr "" msgid "Seconds. Acceptable values: 1-1000000. Defaults to 600 if not set" msgstr "秒。利用可能な値: 1-1000000。空欄の場合のデフォルト値は600です。" @@ -403,21 +358,18 @@ msgstr "送信元アドレス" msgid "Source port" msgstr "送信元ポート" -msgid "Start MWAN" -msgstr "MWAN の起動" - msgid "Sticky" msgstr "Sticky" msgid "Sticky timeout" msgstr "Sticky タイムアウト" -msgid "Stop MWAN" -msgstr "MWAN の停止" - msgid "Supports CIDR notation (eg \"192.168.100.0/24\") without quotes" msgstr "CIDR 表記のサポート（例: \"192.168.100.0/24\"）" +msgid "Task" +msgstr "" + msgid "There are currently %d of 250 supported interfaces configured" msgstr "現在、250個中 %d 個のサポートされたインターフェースが設定済みです。" @@ -459,9 +411,6 @@ msgstr "" "\"wwan\"）<br />$DEVICE - Up または Down が行われた物理デバイス名（例: " "\"eth0\" や \"wwan0\"）<br /><br />" -msgid "Tracking IP" -msgstr "追跡 IP" - msgid "Tracking hostname or IP address" msgstr "追跡ホスト名または IP アドレス" @@ -471,9 +420,6 @@ msgstr "追跡方式" msgid "Tracking reliability" msgstr "追跡の信頼性" -msgid "Traffic Rules" -msgstr "トラフィック ルール" - msgid "" "Traffic from the same source IP address that previously matched this rule " "within the sticky timeout period will use the same WAN interface" @@ -485,9 +431,6 @@ msgstr "" msgid "Troubleshooting" msgstr "トラブルシューティング" -msgid "Troubleshooting Data" -msgstr "トラブルシューティング データ" - msgid "" "Use the IP address of this interface as source IP address for traffic " "initiated by the router itself" @@ -495,108 +438,37 @@ msgstr "" "ルーター自身によって発生するトラフィックのアクセス元 IP アドレスとして、この" "インターフェースの IP アドレスが使用されます。" -msgid "View the contents of /etc/protocols for protocol descriptions" -msgstr "プロトコルの説明については、 /etc/protocols の内容を確認してください。" +msgid "View the content of /etc/protocols for protocol description" +msgstr "" msgid "WARNING: %d interfaces are configured exceeding the maximum of 250!" msgstr "" "警告: %d 個のインターフェースが、最大個数の 250個 を超えて設定されています！" -msgid "" -"WARNING: Some interfaces are configured incorrectly or not at all in /etc/" -"config/network!" -msgstr "" -"警告: 設定を誤っているか、もしくは完全に設定されていないインターフェースがあ" -"ります！" - -msgid "" -"WARNING: Some interfaces have a higher reliability requirement than there " -"are tracking IP addresses!" -msgstr "" -"警告: 追跡 IP アドレスの個数より大きい追跡信頼性の値が設定されたインター" -"フェースがあります！" - -msgid "" -"WARNING: Some interfaces have duplicate metrics configured in /etc/config/" -"network!" +msgid "WARNING: Interface %s are not found in /etc/config/network" msgstr "" -"警告: /etc/config/network で、重複するメトリックを設定されているインター" -"フェースがあります！" -msgid "" -"WARNING: Some interfaces have no default route in the main routing table!" +msgid "WARNING: Interface %s has a duplicate metric %s configured" msgstr "" -"警告: メインのルーティング テーブルで、デフォルト ルートを設定されていないイ" -"ンターフェースがあります！" msgid "" -"WARNING: Some interfaces have no metric configured in /etc/config/network!" +"WARNING: Interface %s has a higher reliability requirement than tracking " +"hosts (%d)" msgstr "" -"警告: /etc/config/network で、メトリックを設定されていないインターフェースが" -"あります！" -msgid "" -"WARNING: Some policies have names exceeding the maximum of 15 characters!" +msgid "WARNING: Interface %s has no default route in the main routing table" msgstr "" -"警告: 最大文字数の 15 文字を超える名前が設定されているポリシーがあります！" -msgid "" -"WARNING: Some rules have a port configured with no or improper protocol " -"specified! Please configure a specific protocol!" +msgid "WARNING: Policie %s has exceeding the maximum name of 15 characters" msgstr "" -"警告: 不適切なプロトコルが指定されている、または何も指定されていないポートを" -"設定されたルールがあります！プロトコルを指定し直してください！" msgid "" -"WARNING: This and other interfaces have duplicate metrics configured in /etc/" -"config/network!" +"WARNING: Rule %s have a port configured with no or improper protocol " +"specified!" msgstr "" -"警告: これと他のインターフェースで重複するメトリックが /etc/config/network に" -"設定されています！" -msgid "" -"WARNING: This interface has a higher reliability requirement than there are " -"tracking IP addresses!" +msgid "Waiting for command to complete..." msgstr "" -"警告: このインターフェースは、追跡 IP アドレスの個数より大きい追跡信頼性の値" -"を設定されています！" - -msgid "WARNING: This interface has no default route in the main routing table!" -msgstr "" -"警告: このインターフェースは、メインのルーティング テーブルにデフォルト ルー" -"トが設定されていません！" - -msgid "" -"WARNING: This interface has no metric configured in /etc/config/network!" -msgstr "" -"警告: このインターフェースは、 /etc/config/network でメトリックが設定されてい" -"ません！" - -msgid "" -"WARNING: This interface is configured incorrectly or not at all in /etc/" -"config/network!" -msgstr "" -"警告: このインターフェースは /etc/config/network で設定が誤っているか、もしく" -"は完全に設定されていません！" - -msgid "" -"WARNING: This policy's name is %d characters exceeding the maximum of 15!" -msgstr "" -"警告: このポリシーの名前は、最大文字数 15 文字を超える %d 文字が設定されてい" -"ます！" - -msgid "" -"WARNING: This rule is incorrectly configured with no or improper protocol " -"specified! Please configure a specific protocol!" -msgstr "" -"警告: このルールは不適切なプロトコルが指定されているか、または何も指定されて" -"いません！プロトコルを指定し直してください！" - -msgid "Waiting for MWAN to %s..." -msgstr "MWAN の %s を待っています..." - -msgid "Waiting for diagnostic results..." -msgstr "診断結果を待っています..." msgid "Weight" msgstr "ウエイト" @@ -628,17 +500,224 @@ msgstr "ifup" msgid "never" msgstr "never" -msgid "restart" -msgstr "再起動" +msgid "unreachable (reject)" +msgstr "unreachable (reject)" -msgid "start" -msgstr "起動" +#~ msgid "Currently Configured Interfaces" +#~ msgstr "設定済みインターフェース" -msgid "stop" -msgstr "停止" +#~ msgid "Currently Configured Members" +#~ msgstr "設定済みメンバー" -msgid "unreachable (reject)" -msgstr "unreachable (reject)" +#~ msgid "Currently Configured Policies" +#~ msgstr "設定済みポリシー" + +#~ msgid "Detailed Status" +#~ msgstr "詳細ステータス" + +#~ msgid "Diagnostic Results" +#~ msgstr "診断結果" + +#~ msgid "Error collecting troubleshooting information" +#~ msgstr "トラブルシューティング情報の収集エラー" + +#~ msgid "Errors" +#~ msgstr "エラー" + +#~ msgid "Globals mwan3 options" +#~ msgstr "MWAN3 全般オプション" + +#~ msgid "Interface Status" +#~ msgstr "インターフェース ステータス" + +#~ msgid "Last 50 MWAN systemlog entries. Newest entries sorted at the top :" +#~ msgstr "直近の MWAN システムログ（50行）です。一番上が最新の行です:" + +#~ msgid "MWAN Detailed Status" +#~ msgstr "MWAN 詳細ステータス" + +#~ msgid "MWAN Interface Configuration" +#~ msgstr "MWAN インターフェース設定" + +#~ msgid "MWAN Interface Diagnostics" +#~ msgstr "MWAN インターフェース診断" + +#~ msgid "MWAN Interface Systemlog" +#~ msgstr "MWAN インターフェース システムログ" + +#~ msgid "MWAN Member Configuration" +#~ msgstr "MWAN メンバー設定" + +#~ msgid "MWAN Policy Configuration" +#~ msgstr "MWAN ポリシー設定" + +#~ msgid "MWAN Rule Configuration" +#~ msgstr "MWAN ルール設定" + +#~ msgid "MWAN Service Control" +#~ msgstr "MWAN サービス コントロール" + +#~ msgid "No MWAN systemlog history found" +#~ msgstr "MWAN システムログの履歴が見つかりません" + +#~ msgid "No detailed status information available" +#~ msgstr "詳細ステータス情報は利用できません" + +#~ msgid "No diagnostic results returned" +#~ msgstr "診断結果がありません" + +#~ msgid "No protocol specified" +#~ msgstr "プロトコルが設定されていません" + +#~ msgid "Restart MWAN" +#~ msgstr "MWAN の再起動" + +#~ msgid "" +#~ "Rules specify which traffic will use a particular MWAN policy based on IP " +#~ "address, port or protocol<br />Rules are matched from top to bottom. " +#~ "Rules below a matching rule are ignored. Traffic not matching any rule is " +#~ "routed using the main routing table<br />Traffic destined for known " +#~ "(other than default) networks is handled by the main routing table. " +#~ "Traffic matching a rule, but all WAN interfaces for that policy are down " +#~ "will be blackholed<br />Names may contain characters A-Z, a-z, 0-9, _ and " +#~ "no spaces<br />Rules may not share the same name as configured " +#~ "interfaces, members or policies" +#~ msgstr "" +#~ "ルールは IP アドレスやポート、プロトコルを基に、トラフィックがどの MWAN ポ" +#~ "リシーを使用するかを設定します。<br />ルールは上から下へマッチングが行わ" +#~ "れ、合致したルールより下のルールは無視されます。全てのルールに合致しないト" +#~ "ラフィックは、メインのルーティング テーブルを使用してルートが決定されま" +#~ "す。<br />既知（デフォルト以外）のネットワークへのトラフィックは、メインの" +#~ "ルーティング テーブルによって制御されます。ルールに合致したトラフィックで" +#~ "も、当該ポリシーの全 WAN インターフェースが Down 状態の場合は blackhole 状" +#~ "態となります。<br />名前は A-Z, a-z, 0-9, _ を含むことができますが、スペー" +#~ "スは使用できません。<br />ルールは、設定済みのインターフェースやメンバー、" +#~ "ポリシーと同じ名前を使用することはできません。" + +#~ msgid "Start MWAN" +#~ msgstr "MWAN の起動" + +#~ msgid "Stop MWAN" +#~ msgstr "MWAN の停止" + +#~ msgid "Tracking IP" +#~ msgstr "追跡 IP" + +#~ msgid "Traffic Rules" +#~ msgstr "トラフィック ルール" + +#~ msgid "Troubleshooting Data" +#~ msgstr "トラブルシューティング データ" + +#~ msgid "View the contents of /etc/protocols for protocol descriptions" +#~ msgstr "" +#~ "プロトコルの説明については、 /etc/protocols の内容を確認してください。" + +#~ msgid "" +#~ "WARNING: Some interfaces are configured incorrectly or not at all in /etc/" +#~ "config/network!" +#~ msgstr "" +#~ "警告: 設定を誤っているか、もしくは完全に設定されていないインターフェースが" +#~ "あります！" + +#~ msgid "" +#~ "WARNING: Some interfaces have a higher reliability requirement than there " +#~ "are tracking IP addresses!" +#~ msgstr "" +#~ "警告: 追跡 IP アドレスの個数より大きい追跡信頼性の値が設定されたインター" +#~ "フェースがあります！" + +#~ msgid "" +#~ "WARNING: Some interfaces have duplicate metrics configured in /etc/config/" +#~ "network!" +#~ msgstr "" +#~ "警告: /etc/config/network で、重複するメトリックを設定されているインター" +#~ "フェースがあります！" + +#~ msgid "" +#~ "WARNING: Some interfaces have no default route in the main routing table!" +#~ msgstr "" +#~ "警告: メインのルーティング テーブルで、デフォルト ルートを設定されていない" +#~ "インターフェースがあります！" + +#~ msgid "" +#~ "WARNING: Some interfaces have no metric configured in /etc/config/network!" +#~ msgstr "" +#~ "警告: /etc/config/network で、メトリックを設定されていないインターフェース" +#~ "があります！" + +#~ msgid "" +#~ "WARNING: Some policies have names exceeding the maximum of 15 characters!" +#~ msgstr "" +#~ "警告: 最大文字数の 15 文字を超える名前が設定されているポリシーがあります！" + +#~ msgid "" +#~ "WARNING: Some rules have a port configured with no or improper protocol " +#~ "specified! Please configure a specific protocol!" +#~ msgstr "" +#~ "警告: 不適切なプロトコルが指定されている、または何も指定されていないポート" +#~ "を設定されたルールがあります！プロトコルを指定し直してください！" + +#~ msgid "" +#~ "WARNING: This and other interfaces have duplicate metrics configured in /" +#~ "etc/config/network!" +#~ msgstr "" +#~ "警告: これと他のインターフェースで重複するメトリックが /etc/config/" +#~ "network に設定されています！" + +#~ msgid "" +#~ "WARNING: This interface has a higher reliability requirement than there " +#~ "are tracking IP addresses!" +#~ msgstr "" +#~ "警告: このインターフェースは、追跡 IP アドレスの個数より大きい追跡信頼性の" +#~ "値を設定されています！" + +#~ msgid "" +#~ "WARNING: This interface has no default route in the main routing table!" +#~ msgstr "" +#~ "警告: このインターフェースは、メインのルーティング テーブルにデフォルト " +#~ "ルートが設定されていません！" + +#~ msgid "" +#~ "WARNING: This interface has no metric configured in /etc/config/network!" +#~ msgstr "" +#~ "警告: このインターフェースは、 /etc/config/network でメトリックが設定され" +#~ "ていません！" + +#~ msgid "" +#~ "WARNING: This interface is configured incorrectly or not at all in /etc/" +#~ "config/network!" +#~ msgstr "" +#~ "警告: このインターフェースは /etc/config/network で設定が誤っているか、も" +#~ "しくは完全に設定されていません！" + +#~ msgid "" +#~ "WARNING: This policy's name is %d characters exceeding the maximum of 15!" +#~ msgstr "" +#~ "警告: このポリシーの名前は、最大文字数 15 文字を超える %d 文字が設定されて" +#~ "います！" + +#~ msgid "" +#~ "WARNING: This rule is incorrectly configured with no or improper protocol " +#~ "specified! Please configure a specific protocol!" +#~ msgstr "" +#~ "警告: このルールは不適切なプロトコルが指定されているか、または何も指定され" +#~ "ていません！プロトコルを指定し直してください！" + +#~ msgid "Waiting for MWAN to %s..." +#~ msgstr "MWAN の %s を待っています..." + +#~ msgid "Waiting for diagnostic results..." +#~ msgstr "診断結果を待っています..." + +#~ msgid "restart" +#~ msgstr "再起動" + +#~ msgid "start" +#~ msgstr "起動" + +#~ msgid "stop" +#~ msgstr "停止" #~ msgid "Advanced" #~ msgstr "詳細設定" diff --git a/applications/luci-app-mwan3/po/ru/mwan3.po b/applications/luci-app-mwan3/po/ru/mwan3.po index 6a452c7bb5..8d5742c7e8 100644 --- a/applications/luci-app-mwan3/po/ru/mwan3.po +++ b/applications/luci-app-mwan3/po/ru/mwan3.po @@ -3,7 +3,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Project-Id-Version: LuCI: mwan3\n" "POT-Creation-Date: 2017-09-14 16:00+0300\n" -"PO-Revision-Date: 2018-01-13 12:56+0300\n" +"PO-Revision-Date: 2018-01-19 20:57+0300\n" "Language-Team: http://cyber-place.ru\n" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" @@ -12,6 +12,8 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "Language: ru\n" +"Project-Info: Это технический перевод, не дословный. Главное-удобный русский " +"интерфейс, все проверялось в графическом режиме, совместим с другими apps\n" msgid "%d hour" msgstr "%d час" @@ -32,8 +34,8 @@ msgid "" "Acceptable values: 1-100. This many Tracking IP addresses must respond for " "the link to be deemed up" msgstr "" -"Допустимые значения: 1-100. Установите количество ответов IP-адресов. " -"Сколько раз они должны ответить, чтобы соединение было признано активным." +"Допустимые значения: 1-100. Установите количество ответов IP-адресов. <br /" +">Сколько раз они должны ответить, чтобы соединение было признано активным." msgid "Acceptable values: 1-1000. Defaults to 1 if not set" msgstr "Допустимые значения: 1-1000. По умолчанию 1, если значение не задано." @@ -48,16 +50,7 @@ msgid "Check routing table" msgstr "Проверить таблицу маршрутизации" msgid "Collecting data..." -msgstr "Сбор информации..." - -msgid "Currently Configured Interfaces" -msgstr "Настроенные интерфейсы" - -msgid "Currently Configured Members" -msgstr "Настроенные узлы" - -msgid "Currently Configured Policies" -msgstr "Настроенных политики" +msgstr "Сбор данных..." msgid "Destination address" msgstr "Адрес назначения" @@ -65,11 +58,8 @@ msgstr "Адрес назначения" msgid "Destination port" msgstr "Порт назначения" -msgid "Detailed Status" -msgstr "Подробная Информация" - -msgid "Diagnostic Results" -msgstr "Результаты диагностики" +msgid "Detail" +msgstr "Подробно" msgid "Diagnostics" msgstr "Диагностика" @@ -88,11 +78,8 @@ msgstr "Включено" msgid "Enter value in hex, starting with <code>0x</code>" msgstr "Введите значение в шестнадцатеричной форме, начиная с <code>0x</code>." -msgid "Error collecting troubleshooting information" -msgstr "Сбор сведений об устранении неполадок." - -msgid "Errors" -msgstr "Ошибки" +msgid "Execute" +msgstr "Выполнить" msgid "Expect interface state on up event" msgstr "Ожидание " @@ -114,9 +101,6 @@ msgstr "" msgid "Globals" msgstr "Общие" -msgid "Globals mwan3 options" -msgstr "Общие mwan3 настройки" - msgid "Hotplug ifdown" msgstr "Hotplug ifdown" @@ -138,9 +122,6 @@ msgstr "Исходное состояние" msgid "Interface" msgstr "Интерфейс" -msgid "Interface Status" -msgstr "Состояние интерфейса" - msgid "Interface down" msgstr "Интерфейс отключить" @@ -163,11 +144,6 @@ msgstr "Сохранить интервал сбоя" msgid "Keep ping failure interval during failure state" msgstr "Сохранить интервал сбоя пинг-запроса, во время состояния сбоя." -msgid "Last 50 MWAN systemlog entries. Newest entries sorted at the top :" -msgstr "" -"Последние 50 записей системного журнала MWAN . Новые записи расположены " -"сверху :" - msgid "Last resort" msgstr "Последнее средство" @@ -180,47 +156,50 @@ msgstr "Загрузка" msgid "Local source interface" msgstr "Локальный исходящий интефейс" -msgid "MWAN Detailed Status" -msgstr "Детализация состояния MWAN" +msgid "MWAN - Globals" +msgstr "MWAN - Общие" -msgid "MWAN Interface Configuration" -msgstr "Настройка интерфейсов MWAN" +msgid "MWAN - Interfaces" +msgstr "MWAN - Интерфейсы" -msgid "MWAN Interface Configuration - %s" -msgstr "Настройка интерфейсов MWAN - %s" +msgid "MWAN - Members" +msgstr "MWAN - Узлы" -msgid "MWAN Interface Diagnostics" -msgstr "Диагностика интерфейса MWAN" +msgid "MWAN - Notification" +msgstr "MWAN - Уведомления" -msgid "MWAN Interface Live Status" -msgstr "Состояние интерфейса MWAN" +msgid "MWAN - Policies" +msgstr "MWAN - Политики" + +msgid "MWAN - Rules" +msgstr "MWAN - Правила" -msgid "MWAN Interface Systemlog" -msgstr "Системный журнал MWAN интерфейса" +msgid "MWAN Interface Configuration - %s" +msgstr "Настройка интерфейсов MWAN - %s" -msgid "MWAN Member Configuration" -msgstr "MWAN настройка узлов" +msgid "MWAN Interface Live Status" +msgstr "Состояние интерфейса MWAN в настоящее время" msgid "MWAN Member Configuration - %s" msgstr "MWAN настройка узлов - %s" -msgid "MWAN Notification" -msgstr "Уведомления MWAN" - -msgid "MWAN Policy Configuration" -msgstr "MWAN настройка политики" - msgid "MWAN Policy Configuration - %s" msgstr "MWAN настройка политики - %s" -msgid "MWAN Rule Configuration" -msgstr "MWAN настройка правил" - msgid "MWAN Rule Configuration - %s" msgstr "MWAN настройка правил - %s" -msgid "MWAN Service Control" -msgstr "Управление службой MWAN" +msgid "MWAN Status - Detail" +msgstr "Состояние MWAN - Подробно" + +msgid "MWAN Status - Diagnostics" +msgstr "Состояние MWAN - Диагностика" + +msgid "MWAN Status - Troubleshooting" +msgstr "Состояние MWAN - Устранение неполадок" + +msgid "MWAN status - Interface Live Status" +msgstr "Состояние MWAN - Интерфейс в настоящее время" msgid "" "MWAN supports up to 250 physical and/or logical interfaces<br />MWAN " @@ -267,14 +246,14 @@ msgid "Members assigned" msgstr "Назначенные узлы" msgid "Metric" -msgstr "Metric" +msgstr "Метрика" msgid "" "Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/" "youtube.com/youtube\")" msgstr "" -"Имя IPset правила. Требуется правило IPset в /etc/dnsmasq.conf (eg \"ipset=/" -"youtube.com/youtube\")." +"Имя IPset правила. Требуется правило IPset в /etc/dnsmasq.conf (например " +"\"ipset=/youtube.com/youtube\")." msgid "No" msgstr "Нет" @@ -282,18 +261,6 @@ msgstr "Нет" msgid "No MWAN interfaces found" msgstr "Интерфейсы MWAN не найдены" -msgid "No MWAN systemlog history found" -msgstr "Не найдено записей в системном журнале MWAN" - -msgid "No detailed status information available" -msgstr "Подробная информация о состоянии отсутствует" - -msgid "No diagnostic results returned" -msgstr "Результаты диагностики не возвращаются" - -msgid "No protocol specified" -msgstr "Протокол не указан" - msgid "Notification" msgstr "Уведомления" @@ -301,13 +268,13 @@ msgid "Offline" msgstr "Отключен" msgid "Online" -msgstr "Включен" +msgstr "Онлайн" msgid "Online (tracking active)" -msgstr "Включен (отслеживание активно)" +msgstr "Онлайн (отслеживание активно)" msgid "Online (tracking off)" -msgstr "Включен (отслеживание отключено)" +msgstr "Онлайн (отслеживание отключено)" msgid "Ping count" msgstr "Кол-во пинг-запросов" @@ -366,9 +333,6 @@ msgstr "Протокол" msgid "Recovery interval" msgstr "Интервал восстановления" -msgid "Restart MWAN" -msgstr "Рестарт MWAN" - msgid "Rule" msgstr "Правило" @@ -376,39 +340,38 @@ msgid "Rules" msgstr "Правила" msgid "" -"Rules specify which traffic will use a particular MWAN policy based on IP " -"address, port or protocol<br />Rules are matched from top to bottom. Rules " -"below a matching rule are ignored. Traffic not matching any rule is routed " -"using the main routing table<br />Traffic destined for known (other than " -"default) networks is handled by the main routing table. Traffic matching a " -"rule, but all WAN interfaces for that policy are down will be blackholed<br /" -">Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br />Rules may " -"not share the same name as configured interfaces, members or policies" -msgstr "" -"Правила определяют, какой трафик будет использовать конкретную политику MWAN " -"на основе IP-адреса, порта или протокола.<br />Список правил исполняется " -"сверху вниз. Правила, расположенные ниже правила сопоставления, " -"игнорируются. Трафик, не совпадающий с каким-либо правилом, перенаправляется " -"с помощью основной таблицы маршрутизации.<br />Трафик, предназначенный для " -"известных (не по умолчанию) сетей, обрабатывается основной таблицей " -"маршрутизации. Трафик соответствует правилам, но все интерфейсы WAN для этой " -"политики будут заблокированы.<br />Имена могут содержать символы A-Z, a-z, " -"0-9, _ , пробелы запрещены.<br />Правила не могут иметь одинаковые имена с " -"настроенными интерфейсами, узлами или политиками." +"Rules specify which traffic will use a particular MWAN policy<br />Rules are " +"based on IP address, port or protocol<br />Rules are matched from top to " +"bottom<br />Rules below a matching rule are ignored<br />Traffic not " +"matching any rule is routed using the main routing table<br />Traffic " +"destined for known (other than default) networks is handled by the main " +"routing table<br />Traffic matching a rule, but all WAN interfaces for that " +"policy are down will be blackholed<br />Names may contain characters A-Z, a-" +"z, 0-9, _ and no spaces<br />Rules may not share the same name as configured " +"interfaces, members or policies" +msgstr "" +"Правила определяют, какой трафик будет использовать конкретную политику MWAN." +"<br />Правила основываются на IP-адресе, порту или протоколе.<br />Список " +"правил исполняется сверху вниз.<br />Правила, расположенные ниже правила " +"сопоставления, игнорируются.<br />Трафик, не соответствующий никакому " +"правилу, маршрутизируется с помощью основной таблицы маршрутизации.<br /" +">Трафик, предназначенный для известных (не по умолчанию) сетей, " +"обрабатывается основной таблицей маршрутизации.<br />Трафик соответствует " +"правилам, но все интерфейсы WAN для этой политики будут заблокированы.<br /" +">Имена могут содержать символы A-Z, a-z, 0-9, _ , пробелы запрещены.<br /" +">Правила не могут иметь одинаковые имена с настроенными интерфейсами, узлами " +"или политиками." msgid "Seconds. Acceptable values: 1-1000000. Defaults to 600 if not set" msgstr "" -"Секунды. Допустимые значения: 1-1000000. По умолчанию 600, если значение не " +"Секунд. Допустимые значения: 1-1000000. По умолчанию 600, если значение не " "установлено." msgid "Source address" -msgstr "Исходящий адрес" +msgstr "Адрес источника" msgid "Source port" -msgstr "Исходящий порт" - -msgid "Start MWAN" -msgstr "Старт MWAN" +msgstr "Порт источника" msgid "Sticky" msgstr "Липкий" @@ -416,12 +379,12 @@ msgstr "Липкий" msgid "Sticky timeout" msgstr "Липкое значение времени ожидания" -msgid "Stop MWAN" -msgstr "Стоп MWAN" - msgid "Supports CIDR notation (eg \"192.168.100.0/24\") without quotes" msgstr "Поддерживает CIDR нотацию (например '192.168.100.0/24') без кавычек." +msgid "Task" +msgstr "Задача" + msgid "There are currently %d of 250 supported interfaces configured" msgstr "В настоящее время настроено %d из 250 поддерживаемых интерфейсов." @@ -435,9 +398,9 @@ msgid "" "This hostname or IP address will be pinged to determine if the link is up or " "down. Leave blank to assume interface is always online" msgstr "" -"Это имя хоста или IP-адрес для пинга, чтобы определить активно ли соединение " -"или нет. Оставьте пустым, чтобы предположить, что интерфейс всегда находится " -"в сети." +"Это имя хоста или IP-адрес для пинг-запроса, чтобы определить активно ли " +"соединение или нет.<br />Оставьте пустым, чтобы предположить, что интерфейс " +"всегда находится в сети." msgid "" "This section allows you to modify the content of \"/etc/mwan3.user\".<br /" @@ -466,9 +429,6 @@ msgstr "" "устройства, чей интерфейс включили или отключили (например, 'eth0' или " "'wwan0')<br /><br />." -msgid "Tracking IP" -msgstr "Отслеживание IP" - msgid "Tracking hostname or IP address" msgstr "Отслеживание имени хоста или IP-адреса" @@ -478,9 +438,6 @@ msgstr "Метод отслеживания" msgid "Tracking reliability" msgstr "Надежность отслеживания" -msgid "Traffic Rules" -msgstr "Правила трафика" - msgid "" "Traffic from the same source IP address that previously matched this rule " "within the sticky timeout period will use the same WAN interface" @@ -492,9 +449,6 @@ msgstr "" msgid "Troubleshooting" msgstr "Устранение неполадок" -msgid "Troubleshooting Data" -msgstr "Устранение неполадок данных" - msgid "" "Use the IP address of this interface as source IP address for traffic " "initiated by the router itself" @@ -502,109 +456,44 @@ msgstr "" "Используйте IP-адрес этого интерфейса в качестве IP-адреса источника для " "трафика, инициированного самим маршрутизатором." -msgid "View the contents of /etc/protocols for protocol descriptions" -msgstr "Просмотреть содержимое файла /etc/protocols для описания протокола." +msgid "View the content of /etc/protocols for protocol description" +msgstr "Просмотр содержимого файла /etc/protocols для описания протокола." msgid "WARNING: %d interfaces are configured exceeding the maximum of 250!" msgstr "" -"ВНИМАНИЕ: интерфейсы %d настроены, превышая установленное ограничение в " +"ВНИМАНИЕ: Интерфейсы %d настроены, превышая установленное ограничение в " "количестве 250шт.!" -msgid "" -"WARNING: Some interfaces are configured incorrectly or not at all in /etc/" -"config/network!" -msgstr "" -"ВНИМАНИЕ: Некоторые интерфейсы настроены неправильно или вовсе отсутствуют в " -"config файле /etc/config/network!" +msgid "WARNING: Interface %s are not found in /etc/config/network" +msgstr "ВНИМАНИЕ: Интерфейс %s не настроен в config файле /etc/config/network." -msgid "" -"WARNING: Some interfaces have a higher reliability requirement than there " -"are tracking IP addresses!" +msgid "WARNING: Interface %s has a duplicate metric %s configured" msgstr "" -"ВНИМАНИЕ: Некоторые интерфейсы имеют более высокое требования к надежности " -"чем простое отслеживание IP-адреса!" +"ВНИМАНИЕ: Интерфейс %s имеет дублирующие метрики настройки %s config файла." msgid "" -"WARNING: Some interfaces have duplicate metrics configured in /etc/config/" -"network!" +"WARNING: Interface %s has a higher reliability requirement than tracking " +"hosts (%d)" msgstr "" -"ВНИМАНИЕ: Некоторые интерфейсы имеют одинаковые настройки в config файле /" -"etc/config/network!" +"ВНИМАНИЕ: Интерфейс %s имеет более высокое требование надежности, чем узлы " +"отслеживания (%d)." -msgid "" -"WARNING: Some interfaces have no default route in the main routing table!" +msgid "WARNING: Interface %s has no default route in the main routing table" msgstr "" -"ВНИМАНИЕ: Некоторые интерфейсы не имеют маршрута по умолчанию в основной " -"таблице маршрутизации!" +"ВНИМАНИЕ: Интерфейс %s не имеет маршрута по умолчанию в основной таблице " +"маршрутизации." -msgid "" -"WARNING: Some interfaces have no metric configured in /etc/config/network!" +msgid "WARNING: Policie %s has exceeding the maximum name of 15 characters" msgstr "" -"ВНИМАНИЕ: Некоторые интерфейсы не настроены в config файле /etc/config/" -"network!" +"ВНИМАНИЕ: Имя политики %s превышает установленное ограничение в 15 символов." msgid "" -"WARNING: Some policies have names exceeding the maximum of 15 characters!" -msgstr "" -"ВНИМАНИЕ: Некоторые политики имеют имена, превышающие заданный максимум в 15 " -"символов!" +"WARNING: Rule %s have a port configured with no or improper protocol " +"specified!" +msgstr "ВНИМАНИЕ: Для правила %s порта не задан протокол или указан неверный!" -msgid "" -"WARNING: Some rules have a port configured with no or improper protocol " -"specified! Please configure a specific protocol!" -msgstr "" -"ВНИМАНИЕ: некоторые правила имеют порт для которого неправильно указан или " -"отсутствует протокол! Настройте конкретный протокол!" - -msgid "" -"WARNING: This and other interfaces have duplicate metrics configured in /etc/" -"config/network!" -msgstr "" -"ВНИМАНИЕ: этот и другие интерфейсы имеют одинаковые настройки в config " -"файле /etc/config/network!" - -msgid "" -"WARNING: This interface has a higher reliability requirement than there are " -"tracking IP addresses!" -msgstr "" -"ВНИМАНИЕ: этот интерфейс имеет более высокое требование к надежности, чем " -"простое отслеживание IP-адресов!" - -msgid "WARNING: This interface has no default route in the main routing table!" -msgstr "" -"ВНИМАНИЕ: этот интерфейс не имеет маршрута по умолчанию в основной таблице " -"маршрутизации!" - -msgid "" -"WARNING: This interface has no metric configured in /etc/config/network!" -msgstr "" -"ВНИМАНИЕ: этот интерфейс не настроен в config файле /etc/config/network!" - -msgid "" -"WARNING: This interface is configured incorrectly or not at all in /etc/" -"config/network!" -msgstr "" -"ВНИМАНИЕ: этот интерфейс настроен неправильно или он вообще отсутствует в " -"config файле /etc/config/network!" - -msgid "" -"WARNING: This policy's name is %d characters exceeding the maximum of 15!" -msgstr "" -"ВНИМАНИЕ: имя этой политики содержит- % D символов, что превышает заданный " -"максимум в 15 символов!" - -msgid "" -"WARNING: This rule is incorrectly configured with no or improper protocol " -"specified! Please configure a specific protocol!" -msgstr "" -"ВНИМАНИЕ: это правило неправильно настроено или неправильно указан протокол! " -"Настройте конкретный протокол!" - -msgid "Waiting for MWAN to %s..." -msgstr "Ожидание MWAN до %s..." - -msgid "Waiting for diagnostic results..." -msgstr "Ожидание результатов диагностики..." +msgid "Waiting for command to complete..." +msgstr "Ожидание завершения выполнения команды..." msgid "Weight" msgstr "Вес" @@ -636,14 +525,5 @@ msgstr "ifup" msgid "never" msgstr "никогда" -msgid "restart" -msgstr "рестарт" - -msgid "start" -msgstr "cтарт" - -msgid "stop" -msgstr "стоп" - msgid "unreachable (reject)" msgstr "недоступен (отклонить)" diff --git a/applications/luci-app-mwan3/po/templates/mwan3.pot b/applications/luci-app-mwan3/po/templates/mwan3.pot index 9f2b9ea04b..b7266240f9 100644 --- a/applications/luci-app-mwan3/po/templates/mwan3.pot +++ b/applications/luci-app-mwan3/po/templates/mwan3.pot @@ -36,25 +36,13 @@ msgstr "" msgid "Collecting data..." msgstr "" -msgid "Currently Configured Interfaces" -msgstr "" - -msgid "Currently Configured Members" -msgstr "" - -msgid "Currently Configured Policies" -msgstr "" - msgid "Destination address" msgstr "" msgid "Destination port" msgstr "" -msgid "Detailed Status" -msgstr "" - -msgid "Diagnostic Results" +msgid "Detail" msgstr "" msgid "Diagnostics" @@ -73,10 +61,7 @@ msgstr "" msgid "Enter value in hex, starting with <code>0x</code>" msgstr "" -msgid "Error collecting troubleshooting information" -msgstr "" - -msgid "Errors" +msgid "Execute" msgstr "" msgid "Expect interface state on up event" @@ -97,9 +82,6 @@ msgstr "" msgid "Globals" msgstr "" -msgid "Globals mwan3 options" -msgstr "" - msgid "Hotplug ifdown" msgstr "" @@ -121,9 +103,6 @@ msgstr "" msgid "Interface" msgstr "" -msgid "Interface Status" -msgstr "" - msgid "Interface down" msgstr "" @@ -145,9 +124,6 @@ msgstr "" msgid "Keep ping failure interval during failure state" msgstr "" -msgid "Last 50 MWAN systemlog entries. Newest entries sorted at the top :" -msgstr "" - msgid "Last resort" msgstr "" @@ -160,46 +136,49 @@ msgstr "" msgid "Local source interface" msgstr "" -msgid "MWAN Detailed Status" +msgid "MWAN - Globals" msgstr "" -msgid "MWAN Interface Configuration" +msgid "MWAN - Interfaces" msgstr "" -msgid "MWAN Interface Configuration - %s" +msgid "MWAN - Members" msgstr "" -msgid "MWAN Interface Diagnostics" +msgid "MWAN - Notification" msgstr "" -msgid "MWAN Interface Live Status" +msgid "MWAN - Policies" msgstr "" -msgid "MWAN Interface Systemlog" +msgid "MWAN - Rules" msgstr "" -msgid "MWAN Member Configuration" +msgid "MWAN Interface Configuration - %s" +msgstr "" + +msgid "MWAN Interface Live Status" msgstr "" msgid "MWAN Member Configuration - %s" msgstr "" -msgid "MWAN Notification" +msgid "MWAN Policy Configuration - %s" msgstr "" -msgid "MWAN Policy Configuration" +msgid "MWAN Rule Configuration - %s" msgstr "" -msgid "MWAN Policy Configuration - %s" +msgid "MWAN Status - Detail" msgstr "" -msgid "MWAN Rule Configuration" +msgid "MWAN Status - Diagnostics" msgstr "" -msgid "MWAN Rule Configuration - %s" +msgid "MWAN Status - Troubleshooting" msgstr "" -msgid "MWAN Service Control" +msgid "MWAN status - Interface Live Status" msgstr "" msgid "" @@ -248,18 +227,6 @@ msgstr "" msgid "No MWAN interfaces found" msgstr "" -msgid "No MWAN systemlog history found" -msgstr "" - -msgid "No detailed status information available" -msgstr "" - -msgid "No diagnostic results returned" -msgstr "" - -msgid "No protocol specified" -msgstr "" - msgid "Notification" msgstr "" @@ -324,9 +291,6 @@ msgstr "" msgid "Recovery interval" msgstr "" -msgid "Restart MWAN" -msgstr "" - msgid "Rule" msgstr "" @@ -334,14 +298,15 @@ msgid "Rules" msgstr "" msgid "" -"Rules specify which traffic will use a particular MWAN policy based on IP " -"address, port or protocol<br />Rules are matched from top to bottom. Rules " -"below a matching rule are ignored. Traffic not matching any rule is routed " -"using the main routing table<br />Traffic destined for known (other than " -"default) networks is handled by the main routing table. Traffic matching a " -"rule, but all WAN interfaces for that policy are down will be blackholed<br /" -">Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br />Rules may " -"not share the same name as configured interfaces, members or policies" +"Rules specify which traffic will use a particular MWAN policy<br />Rules are " +"based on IP address, port or protocol<br />Rules are matched from top to " +"bottom<br />Rules below a matching rule are ignored<br />Traffic not " +"matching any rule is routed using the main routing table<br />Traffic " +"destined for known (other than default) networks is handled by the main " +"routing table<br />Traffic matching a rule, but all WAN interfaces for that " +"policy are down will be blackholed<br />Names may contain characters A-Z, a-" +"z, 0-9, _ and no spaces<br />Rules may not share the same name as configured " +"interfaces, members or policies" msgstr "" msgid "Seconds. Acceptable values: 1-1000000. Defaults to 600 if not set" @@ -353,19 +318,16 @@ msgstr "" msgid "Source port" msgstr "" -msgid "Start MWAN" -msgstr "" - msgid "Sticky" msgstr "" msgid "Sticky timeout" msgstr "" -msgid "Stop MWAN" +msgid "Supports CIDR notation (eg \"192.168.100.0/24\") without quotes" msgstr "" -msgid "Supports CIDR notation (eg \"192.168.100.0/24\") without quotes" +msgid "Task" msgstr "" msgid "There are currently %d of 250 supported interfaces configured" @@ -394,9 +356,6 @@ msgid "" "which interface went up or down (e.g. \"eth0\" or \"wwan0\")<br /><br />" msgstr "" -msgid "Tracking IP" -msgstr "" - msgid "Tracking hostname or IP address" msgstr "" @@ -406,9 +365,6 @@ msgstr "" msgid "Tracking reliability" msgstr "" -msgid "Traffic Rules" -msgstr "" - msgid "" "Traffic from the same source IP address that previously matched this rule " "within the sticky timeout period will use the same WAN interface" @@ -417,87 +373,40 @@ msgstr "" msgid "Troubleshooting" msgstr "" -msgid "Troubleshooting Data" -msgstr "" - msgid "" "Use the IP address of this interface as source IP address for traffic " "initiated by the router itself" msgstr "" -msgid "View the contents of /etc/protocols for protocol descriptions" +msgid "View the content of /etc/protocols for protocol description" msgstr "" msgid "WARNING: %d interfaces are configured exceeding the maximum of 250!" msgstr "" -msgid "" -"WARNING: Some interfaces are configured incorrectly or not at all in /etc/" -"config/network!" -msgstr "" - -msgid "" -"WARNING: Some interfaces have a higher reliability requirement than there " -"are tracking IP addresses!" -msgstr "" - -msgid "" -"WARNING: Some interfaces have duplicate metrics configured in /etc/config/" -"network!" -msgstr "" - -msgid "" -"WARNING: Some interfaces have no default route in the main routing table!" -msgstr "" - -msgid "" -"WARNING: Some interfaces have no metric configured in /etc/config/network!" -msgstr "" - -msgid "" -"WARNING: Some policies have names exceeding the maximum of 15 characters!" -msgstr "" - -msgid "" -"WARNING: Some rules have a port configured with no or improper protocol " -"specified! Please configure a specific protocol!" -msgstr "" - -msgid "" -"WARNING: This and other interfaces have duplicate metrics configured in /etc/" -"config/network!" -msgstr "" - -msgid "" -"WARNING: This interface has a higher reliability requirement than there are " -"tracking IP addresses!" +msgid "WARNING: Interface %s are not found in /etc/config/network" msgstr "" -msgid "WARNING: This interface has no default route in the main routing table!" +msgid "WARNING: Interface %s has a duplicate metric %s configured" msgstr "" msgid "" -"WARNING: This interface has no metric configured in /etc/config/network!" +"WARNING: Interface %s has a higher reliability requirement than tracking " +"hosts (%d)" msgstr "" -msgid "" -"WARNING: This interface is configured incorrectly or not at all in /etc/" -"config/network!" +msgid "WARNING: Interface %s has no default route in the main routing table" msgstr "" -msgid "" -"WARNING: This policy's name is %d characters exceeding the maximum of 15!" +msgid "WARNING: Policie %s has exceeding the maximum name of 15 characters" msgstr "" msgid "" -"WARNING: This rule is incorrectly configured with no or improper protocol " -"specified! Please configure a specific protocol!" +"WARNING: Rule %s have a port configured with no or improper protocol " +"specified!" msgstr "" -msgid "Waiting for MWAN to %s..." -msgstr "" - -msgid "Waiting for diagnostic results..." +msgid "Waiting for command to complete..." msgstr "" msgid "Weight" @@ -528,14 +437,5 @@ msgstr "" msgid "never" msgstr "" -msgid "restart" -msgstr "" - -msgid "start" -msgstr "" - -msgid "stop" -msgstr "" - msgid "unreachable (reject)" msgstr "" diff --git a/applications/luci-app-mwan3/po/zh-cn/mwan3.po b/applications/luci-app-mwan3/po/zh-cn/mwan3.po index af7ee7fb28..c838bdb563 100644 --- a/applications/luci-app-mwan3/po/zh-cn/mwan3.po +++ b/applications/luci-app-mwan3/po/zh-cn/mwan3.po @@ -47,26 +47,14 @@ msgstr "检查路由表" msgid "Collecting data..." msgstr "正在收集数据..." -msgid "Currently Configured Interfaces" -msgstr "当前配置的接口" - -msgid "Currently Configured Members" -msgstr "当前配置的成员" - -msgid "Currently Configured Policies" -msgstr "当前配置的策略" - msgid "Destination address" msgstr "目标地址" msgid "Destination port" msgstr "目标端口" -msgid "Detailed Status" -msgstr "详细状态" - -msgid "Diagnostic Results" -msgstr "诊断结果" +msgid "Detail" +msgstr "" msgid "Diagnostics" msgstr "诊断" @@ -84,11 +72,8 @@ msgstr "已启用" msgid "Enter value in hex, starting with <code>0x</code>" msgstr "输入十六进制值，以 <code>0x</code> 开头" -msgid "Error collecting troubleshooting information" -msgstr "收集故障排除信息时出错" - -msgid "Errors" -msgstr "错误" +msgid "Execute" +msgstr "" msgid "Expect interface state on up event" msgstr "在 up 事件发生时的预期接口状态" @@ -108,9 +93,6 @@ msgstr "在接口事件触发时刷新全局防火墙连接跟踪表" msgid "Globals" msgstr "全局" -msgid "Globals mwan3 options" -msgstr "全局 mwan3 选项" - msgid "Hotplug ifdown" msgstr "Hotplug ifdown" @@ -132,9 +114,6 @@ msgstr "初始状态" msgid "Interface" msgstr "接口" -msgid "Interface Status" -msgstr "接口状态" - msgid "Interface down" msgstr "接口离线" @@ -156,9 +135,6 @@ msgstr "保持故障检测间隔" msgid "Keep ping failure interval during failure state" msgstr "在故障状态期间保持的 Ping 故障检测间隔" -msgid "Last 50 MWAN systemlog entries. Newest entries sorted at the top :" -msgstr "最近 50 条 MWAN 系统日志，最新条目排在顶部：" - msgid "Last resort" msgstr "备用成员" @@ -171,47 +147,50 @@ msgstr "载入中" msgid "Local source interface" msgstr "本地源接口" -msgid "MWAN Detailed Status" -msgstr "MWAN 详细状态" +msgid "MWAN - Globals" +msgstr "" + +msgid "MWAN - Interfaces" +msgstr "" + +msgid "MWAN - Members" +msgstr "" + +msgid "MWAN - Notification" +msgstr "" + +msgid "MWAN - Policies" +msgstr "" -msgid "MWAN Interface Configuration" -msgstr "MWAN 接口配置" +msgid "MWAN - Rules" +msgstr "" msgid "MWAN Interface Configuration - %s" msgstr "MWAN 接口配置 - %s" -msgid "MWAN Interface Diagnostics" -msgstr "MWAN 接口诊断" - msgid "MWAN Interface Live Status" msgstr "MWAN 接口实时状态" -msgid "MWAN Interface Systemlog" -msgstr "MWAN 接口系统日志" - -msgid "MWAN Member Configuration" -msgstr "MWAN 成员配置" - msgid "MWAN Member Configuration - %s" msgstr "MWAN 成员配置 - %s" -msgid "MWAN Notification" -msgstr "" - -msgid "MWAN Policy Configuration" -msgstr "MWAN 策略配置" - msgid "MWAN Policy Configuration - %s" msgstr "MWAN 策略配置 - %s" -msgid "MWAN Rule Configuration" -msgstr "MWAN 规则配置" - msgid "MWAN Rule Configuration - %s" msgstr "MWAN 规则配置 - %s" -msgid "MWAN Service Control" -msgstr "MWAN 服务控制" +msgid "MWAN Status - Detail" +msgstr "" + +msgid "MWAN Status - Diagnostics" +msgstr "" + +msgid "MWAN Status - Troubleshooting" +msgstr "" + +msgid "MWAN status - Interface Live Status" +msgstr "" msgid "" "MWAN supports up to 250 physical and/or logical interfaces<br />MWAN " @@ -271,18 +250,6 @@ msgstr "否" msgid "No MWAN interfaces found" msgstr "没有找到 MWAN 接口" -msgid "No MWAN systemlog history found" -msgstr "没有在系统日志中找到 MWAN 历史信息" - -msgid "No detailed status information available" -msgstr "没有状态详细信息可用" - -msgid "No diagnostic results returned" -msgstr "没有返回诊断结果" - -msgid "No protocol specified" -msgstr "未指定协议" - msgid "Notification" msgstr "" @@ -352,9 +319,6 @@ msgstr "通信协议" msgid "Recovery interval" msgstr "故障恢复间隔" -msgid "Restart MWAN" -msgstr "重启 MWAN" - msgid "Rule" msgstr "规则" @@ -362,22 +326,16 @@ msgid "Rules" msgstr "规则" msgid "" -"Rules specify which traffic will use a particular MWAN policy based on IP " -"address, port or protocol<br />Rules are matched from top to bottom. Rules " -"below a matching rule are ignored. Traffic not matching any rule is routed " -"using the main routing table<br />Traffic destined for known (other than " -"default) networks is handled by the main routing table. Traffic matching a " -"rule, but all WAN interfaces for that policy are down will be blackholed<br /" -">Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br />Rules may " -"not share the same name as configured interfaces, members or policies" -msgstr "" -"“规则”基于 IP 地址、协议、端口把流量划分到指定的“策略”中。<br />规则按照从上" -"到下的顺序进行匹配。除了第一条能够匹配一次通信的规则以外，其它规则将被忽略。" -"不匹配任何规则的通信将会由系统默认路由表进行。<br />来自已知的网络的转发流量" -"由系统默认路由表接手，然后 MWAN 从中匹配出相应的流量并转移到 MWAN 自己的路由" -"表。但是所有被划分到一个无法使用的策略的流量将会无法正常进行路由。<br />名称" -"允许包括A-Z、a-z、0-9、_ 但是不能有空格。<br />规则不应该与接口、成员、策略中" -"的任意一个设置项使用相同的名称" +"Rules specify which traffic will use a particular MWAN policy<br />Rules are " +"based on IP address, port or protocol<br />Rules are matched from top to " +"bottom<br />Rules below a matching rule are ignored<br />Traffic not " +"matching any rule is routed using the main routing table<br />Traffic " +"destined for known (other than default) networks is handled by the main " +"routing table<br />Traffic matching a rule, but all WAN interfaces for that " +"policy are down will be blackholed<br />Names may contain characters A-Z, a-" +"z, 0-9, _ and no spaces<br />Rules may not share the same name as configured " +"interfaces, members or policies" +msgstr "" msgid "Seconds. Acceptable values: 1-1000000. Defaults to 600 if not set" msgstr "单位为秒。接受的值：1-1000000。留空则使用默认值 600 秒" @@ -388,21 +346,18 @@ msgstr "源地址" msgid "Source port" msgstr "源端口" -msgid "Start MWAN" -msgstr "启动 MWAN" - msgid "Sticky" msgstr "粘滞模式" msgid "Sticky timeout" msgstr "粘滞超时" -msgid "Stop MWAN" -msgstr "停止 MWAN" - msgid "Supports CIDR notation (eg \"192.168.100.0/24\") without quotes" msgstr "支持 CIDR 记法（例如：\"192.168.100.0/24\"）不含引号" +msgid "Task" +msgstr "" + msgid "There are currently %d of 250 supported interfaces configured" msgstr "当前已配置 %d 个接口，最大支持 250 个" @@ -437,9 +392,6 @@ msgstr "" "（例如“wan”或“wwan”）<br />$DEVICE 启动或停止接口的物理设备名（例" "如“eth0”或“wwan0”）<br /><br />" -msgid "Tracking IP" -msgstr "跟踪的 IP" - msgid "Tracking hostname or IP address" msgstr "跟踪的主机或 IP 地址" @@ -449,9 +401,6 @@ msgstr "跟踪方式" msgid "Tracking reliability" msgstr "跟踪可靠性" -msgid "Traffic Rules" -msgstr "流量规则" - msgid "" "Traffic from the same source IP address that previously matched this rule " "within the sticky timeout period will use the same WAN interface" @@ -462,89 +411,41 @@ msgstr "" msgid "Troubleshooting" msgstr "故障排除" -msgid "Troubleshooting Data" -msgstr "故障排除数据" - msgid "" "Use the IP address of this interface as source IP address for traffic " "initiated by the router itself" msgstr "使用该接口的 IP 地址作为路由器本身发起的流量的源 IP 地址" -msgid "View the contents of /etc/protocols for protocol descriptions" -msgstr "请查看 /etc/protocols 获取可选协议详情" +msgid "View the content of /etc/protocols for protocol description" +msgstr "" msgid "WARNING: %d interfaces are configured exceeding the maximum of 250!" msgstr "警告：已配置 %d 个接口，超过最大值 250！" -msgid "" -"WARNING: Some interfaces are configured incorrectly or not at all in /etc/" -"config/network!" -msgstr "警告：某些接口配置不正确或未配置到 /etc/config/network！" - -msgid "" -"WARNING: Some interfaces have a higher reliability requirement than there " -"are tracking IP addresses!" -msgstr "警告：某些接口的跟踪可靠性要求大于了跟踪 IP 地址总数！" - -msgid "" -"WARNING: Some interfaces have duplicate metrics configured in /etc/config/" -"network!" -msgstr "警告：某些接口在 /etc/config/network 中配置了相同的跃点数！" - -msgid "" -"WARNING: Some interfaces have no default route in the main routing table!" -msgstr "警告：某些接口在主路由表中没有默认路由！" - -msgid "" -"WARNING: Some interfaces have no metric configured in /etc/config/network!" -msgstr "警告：某些接口没有在 /etc/config/network 中配置跃点数！" - -msgid "" -"WARNING: Some policies have names exceeding the maximum of 15 characters!" -msgstr "警告：某些策略的名称超过了 15 个字符！" - -msgid "" -"WARNING: Some rules have a port configured with no or improper protocol " -"specified! Please configure a specific protocol!" +msgid "WARNING: Interface %s are not found in /etc/config/network" msgstr "" -"警告：某些规则指定了端口却没有配置或配置了不正确的协议，请重新指定协议！" - -msgid "" -"WARNING: This and other interfaces have duplicate metrics configured in /etc/" -"config/network!" -msgstr "警告：此接口和其他接口在 /etc/config/network 中配置了相同的跃点数！" -msgid "" -"WARNING: This interface has a higher reliability requirement than there are " -"tracking IP addresses!" -msgstr "警告：此接口的跟踪可靠性要求大于了跟踪 IP 地址总数！" - -msgid "WARNING: This interface has no default route in the main routing table!" -msgstr "警告：此接口在主路由表中没有默认路由！" +msgid "WARNING: Interface %s has a duplicate metric %s configured" +msgstr "" msgid "" -"WARNING: This interface has no metric configured in /etc/config/network!" -msgstr "警告：此接口没有在 /etc/config/network 中配置跃点数！" +"WARNING: Interface %s has a higher reliability requirement than tracking " +"hosts (%d)" +msgstr "" -msgid "" -"WARNING: This interface is configured incorrectly or not at all in /etc/" -"config/network!" -msgstr "警告：此接口配置不正确或未配置到 /etc/config/network！" +msgid "WARNING: Interface %s has no default route in the main routing table" +msgstr "" -msgid "" -"WARNING: This policy's name is %d characters exceeding the maximum of 15!" -msgstr "警告：此策略的名称具有 %d 个字符，超过了 15 个字符！" +msgid "WARNING: Policie %s has exceeding the maximum name of 15 characters" +msgstr "" msgid "" -"WARNING: This rule is incorrectly configured with no or improper protocol " -"specified! Please configure a specific protocol!" -msgstr "警告：此规则没有配置或配置了不正确的协议，请重新指定协议！" - -msgid "Waiting for MWAN to %s..." -msgstr "等待 MWAN %s..." +"WARNING: Rule %s have a port configured with no or improper protocol " +"specified!" +msgstr "" -msgid "Waiting for diagnostic results..." -msgstr "等待诊断结果..." +msgid "Waiting for command to complete..." +msgstr "" msgid "Weight" msgstr "比重" @@ -574,17 +475,194 @@ msgstr "ifup" msgid "never" msgstr "从不" -msgid "restart" -msgstr "重启" +msgid "unreachable (reject)" +msgstr "不可达（拒绝）" -msgid "start" -msgstr "启动" +#~ msgid "Currently Configured Interfaces" +#~ msgstr "当前配置的接口" -msgid "stop" -msgstr "停止" +#~ msgid "Currently Configured Members" +#~ msgstr "当前配置的成员" -msgid "unreachable (reject)" -msgstr "不可达（拒绝）" +#~ msgid "Currently Configured Policies" +#~ msgstr "当前配置的策略" + +#~ msgid "Detailed Status" +#~ msgstr "详细状态" + +#~ msgid "Diagnostic Results" +#~ msgstr "诊断结果" + +#~ msgid "Error collecting troubleshooting information" +#~ msgstr "收集故障排除信息时出错" + +#~ msgid "Errors" +#~ msgstr "错误" + +#~ msgid "Globals mwan3 options" +#~ msgstr "全局 mwan3 选项" + +#~ msgid "Interface Status" +#~ msgstr "接口状态" + +#~ msgid "Last 50 MWAN systemlog entries. Newest entries sorted at the top :" +#~ msgstr "最近 50 条 MWAN 系统日志，最新条目排在顶部：" + +#~ msgid "MWAN Detailed Status" +#~ msgstr "MWAN 详细状态" + +#~ msgid "MWAN Interface Configuration" +#~ msgstr "MWAN 接口配置" + +#~ msgid "MWAN Interface Diagnostics" +#~ msgstr "MWAN 接口诊断" + +#~ msgid "MWAN Interface Systemlog" +#~ msgstr "MWAN 接口系统日志" + +#~ msgid "MWAN Member Configuration" +#~ msgstr "MWAN 成员配置" + +#~ msgid "MWAN Policy Configuration" +#~ msgstr "MWAN 策略配置" + +#~ msgid "MWAN Rule Configuration" +#~ msgstr "MWAN 规则配置" + +#~ msgid "MWAN Service Control" +#~ msgstr "MWAN 服务控制" + +#~ msgid "No MWAN systemlog history found" +#~ msgstr "没有在系统日志中找到 MWAN 历史信息" + +#~ msgid "No detailed status information available" +#~ msgstr "没有状态详细信息可用" + +#~ msgid "No diagnostic results returned" +#~ msgstr "没有返回诊断结果" + +#~ msgid "No protocol specified" +#~ msgstr "未指定协议" + +#~ msgid "Restart MWAN" +#~ msgstr "重启 MWAN" + +#~ msgid "" +#~ "Rules specify which traffic will use a particular MWAN policy based on IP " +#~ "address, port or protocol<br />Rules are matched from top to bottom. " +#~ "Rules below a matching rule are ignored. Traffic not matching any rule is " +#~ "routed using the main routing table<br />Traffic destined for known " +#~ "(other than default) networks is handled by the main routing table. " +#~ "Traffic matching a rule, but all WAN interfaces for that policy are down " +#~ "will be blackholed<br />Names may contain characters A-Z, a-z, 0-9, _ and " +#~ "no spaces<br />Rules may not share the same name as configured " +#~ "interfaces, members or policies" +#~ msgstr "" +#~ "“规则”基于 IP 地址、协议、端口把流量划分到指定的“策略”中。<br />规则按照从" +#~ "上到下的顺序进行匹配。除了第一条能够匹配一次通信的规则以外，其它规则将被忽" +#~ "略。不匹配任何规则的通信将会由系统默认路由表进行。<br />来自已知的网络的转" +#~ "发流量由系统默认路由表接手，然后 MWAN 从中匹配出相应的流量并转移到 MWAN 自" +#~ "己的路由表。但是所有被划分到一个无法使用的策略的流量将会无法正常进行路由。" +#~ "<br />名称允许包括A-Z、a-z、0-9、_ 但是不能有空格。<br />规则不应该与接" +#~ "口、成员、策略中的任意一个设置项使用相同的名称" + +#~ msgid "Start MWAN" +#~ msgstr "启动 MWAN" + +#~ msgid "Stop MWAN" +#~ msgstr "停止 MWAN" + +#~ msgid "Tracking IP" +#~ msgstr "跟踪的 IP" + +#~ msgid "Traffic Rules" +#~ msgstr "流量规则" + +#~ msgid "Troubleshooting Data" +#~ msgstr "故障排除数据" + +#~ msgid "View the contents of /etc/protocols for protocol descriptions" +#~ msgstr "请查看 /etc/protocols 获取可选协议详情" + +#~ msgid "" +#~ "WARNING: Some interfaces are configured incorrectly or not at all in /etc/" +#~ "config/network!" +#~ msgstr "警告：某些接口配置不正确或未配置到 /etc/config/network！" + +#~ msgid "" +#~ "WARNING: Some interfaces have a higher reliability requirement than there " +#~ "are tracking IP addresses!" +#~ msgstr "警告：某些接口的跟踪可靠性要求大于了跟踪 IP 地址总数！" + +#~ msgid "" +#~ "WARNING: Some interfaces have duplicate metrics configured in /etc/config/" +#~ "network!" +#~ msgstr "警告：某些接口在 /etc/config/network 中配置了相同的跃点数！" + +#~ msgid "" +#~ "WARNING: Some interfaces have no default route in the main routing table!" +#~ msgstr "警告：某些接口在主路由表中没有默认路由！" + +#~ msgid "" +#~ "WARNING: Some interfaces have no metric configured in /etc/config/network!" +#~ msgstr "警告：某些接口没有在 /etc/config/network 中配置跃点数！" + +#~ msgid "" +#~ "WARNING: Some policies have names exceeding the maximum of 15 characters!" +#~ msgstr "警告：某些策略的名称超过了 15 个字符！" + +#~ msgid "" +#~ "WARNING: Some rules have a port configured with no or improper protocol " +#~ "specified! Please configure a specific protocol!" +#~ msgstr "" +#~ "警告：某些规则指定了端口却没有配置或配置了不正确的协议，请重新指定协议！" + +#~ msgid "" +#~ "WARNING: This and other interfaces have duplicate metrics configured in /" +#~ "etc/config/network!" +#~ msgstr "警告：此接口和其他接口在 /etc/config/network 中配置了相同的跃点数！" + +#~ msgid "" +#~ "WARNING: This interface has a higher reliability requirement than there " +#~ "are tracking IP addresses!" +#~ msgstr "警告：此接口的跟踪可靠性要求大于了跟踪 IP 地址总数！" + +#~ msgid "" +#~ "WARNING: This interface has no default route in the main routing table!" +#~ msgstr "警告：此接口在主路由表中没有默认路由！" + +#~ msgid "" +#~ "WARNING: This interface has no metric configured in /etc/config/network!" +#~ msgstr "警告：此接口没有在 /etc/config/network 中配置跃点数！" + +#~ msgid "" +#~ "WARNING: This interface is configured incorrectly or not at all in /etc/" +#~ "config/network!" +#~ msgstr "警告：此接口配置不正确或未配置到 /etc/config/network！" + +#~ msgid "" +#~ "WARNING: This policy's name is %d characters exceeding the maximum of 15!" +#~ msgstr "警告：此策略的名称具有 %d 个字符，超过了 15 个字符！" + +#~ msgid "" +#~ "WARNING: This rule is incorrectly configured with no or improper protocol " +#~ "specified! Please configure a specific protocol!" +#~ msgstr "警告：此规则没有配置或配置了不正确的协议，请重新指定协议！" + +#~ msgid "Waiting for MWAN to %s..." +#~ msgstr "等待 MWAN %s..." + +#~ msgid "Waiting for diagnostic results..." +#~ msgstr "等待诊断结果..." + +#~ msgid "restart" +#~ msgstr "重启" + +#~ msgid "start" +#~ msgstr "启动" + +#~ msgid "stop" +#~ msgstr "停止" #~ msgid "Advanced" #~ msgstr "高级" diff --git a/applications/luci-app-mwan3/po/zh-tw/mwan3.po b/applications/luci-app-mwan3/po/zh-tw/mwan3.po index a7f3d86d0f..d28bd82bdc 100644 --- a/applications/luci-app-mwan3/po/zh-tw/mwan3.po +++ b/applications/luci-app-mwan3/po/zh-tw/mwan3.po @@ -47,26 +47,14 @@ msgstr "檢查路由表" msgid "Collecting data..." msgstr "正在收集資料..." -msgid "Currently Configured Interfaces" -msgstr "當前配置的介面" - -msgid "Currently Configured Members" -msgstr "當前配置的成員" - -msgid "Currently Configured Policies" -msgstr "當前配置的策略" - msgid "Destination address" msgstr "目標位址" msgid "Destination port" msgstr "目標埠" -msgid "Detailed Status" -msgstr "詳細狀態" - -msgid "Diagnostic Results" -msgstr "診斷結果" +msgid "Detail" +msgstr "" msgid "Diagnostics" msgstr "診斷" @@ -84,11 +72,8 @@ msgstr "已啟用" msgid "Enter value in hex, starting with <code>0x</code>" msgstr "輸入十六進位制值，以 <code>0x</code> 開頭" -msgid "Error collecting troubleshooting information" -msgstr "收集故障排除資訊時出錯" - -msgid "Errors" -msgstr "錯誤" +msgid "Execute" +msgstr "" msgid "Expect interface state on up event" msgstr "在 up 事件發生時的預期介面狀態" @@ -108,9 +93,6 @@ msgstr "在介面事件觸發時重新整理全域性防火牆連線跟蹤表" msgid "Globals" msgstr "全域性" -msgid "Globals mwan3 options" -msgstr "全域性 mwan3 選項" - msgid "Hotplug ifdown" msgstr "Hotplug ifdown" @@ -132,9 +114,6 @@ msgstr "初始狀態" msgid "Interface" msgstr "介面" -msgid "Interface Status" -msgstr "介面狀態" - msgid "Interface down" msgstr "介面離線" @@ -156,9 +135,6 @@ msgstr "保持故障檢測間隔" msgid "Keep ping failure interval during failure state" msgstr "在故障狀態期間保持的 Ping 故障檢測間隔" -msgid "Last 50 MWAN systemlog entries. Newest entries sorted at the top :" -msgstr "最近 50 條 MWAN 系統日誌，最新條目排在頂部：" - msgid "Last resort" msgstr "備用成員" @@ -171,47 +147,50 @@ msgstr "載入中" msgid "Local source interface" msgstr "本地源介面" -msgid "MWAN Detailed Status" -msgstr "MWAN 詳細狀態" +msgid "MWAN - Globals" +msgstr "" + +msgid "MWAN - Interfaces" +msgstr "" + +msgid "MWAN - Members" +msgstr "" + +msgid "MWAN - Notification" +msgstr "" + +msgid "MWAN - Policies" +msgstr "" -msgid "MWAN Interface Configuration" -msgstr "MWAN 介面配置" +msgid "MWAN - Rules" +msgstr "" msgid "MWAN Interface Configuration - %s" msgstr "MWAN 介面配置 - %s" -msgid "MWAN Interface Diagnostics" -msgstr "MWAN 介面診斷" - msgid "MWAN Interface Live Status" msgstr "MWAN 介面實時狀態" -msgid "MWAN Interface Systemlog" -msgstr "MWAN 介面系統日誌" - -msgid "MWAN Member Configuration" -msgstr "MWAN 成員配置" - msgid "MWAN Member Configuration - %s" msgstr "MWAN 成員配置 - %s" -msgid "MWAN Notification" -msgstr "" - -msgid "MWAN Policy Configuration" -msgstr "MWAN 策略配置" - msgid "MWAN Policy Configuration - %s" msgstr "MWAN 策略配置 - %s" -msgid "MWAN Rule Configuration" -msgstr "MWAN 規則配置" - msgid "MWAN Rule Configuration - %s" msgstr "MWAN 規則配置 - %s" -msgid "MWAN Service Control" -msgstr "MWAN 服務控制" +msgid "MWAN Status - Detail" +msgstr "" + +msgid "MWAN Status - Diagnostics" +msgstr "" + +msgid "MWAN Status - Troubleshooting" +msgstr "" + +msgid "MWAN status - Interface Live Status" +msgstr "" msgid "" "MWAN supports up to 250 physical and/or logical interfaces<br />MWAN " @@ -271,18 +250,6 @@ msgstr "否" msgid "No MWAN interfaces found" msgstr "沒有找到 MWAN 介面" -msgid "No MWAN systemlog history found" -msgstr "沒有在系統日誌中找到 MWAN 歷史資訊" - -msgid "No detailed status information available" -msgstr "沒有狀態詳細資訊可用" - -msgid "No diagnostic results returned" -msgstr "沒有返回診斷結果" - -msgid "No protocol specified" -msgstr "未指定協議" - msgid "Notification" msgstr "" @@ -352,9 +319,6 @@ msgstr "通訊協議" msgid "Recovery interval" msgstr "故障恢復間隔" -msgid "Restart MWAN" -msgstr "重啟 MWAN" - msgid "Rule" msgstr "規則" @@ -362,22 +326,16 @@ msgid "Rules" msgstr "規則" msgid "" -"Rules specify which traffic will use a particular MWAN policy based on IP " -"address, port or protocol<br />Rules are matched from top to bottom. Rules " -"below a matching rule are ignored. Traffic not matching any rule is routed " -"using the main routing table<br />Traffic destined for known (other than " -"default) networks is handled by the main routing table. Traffic matching a " -"rule, but all WAN interfaces for that policy are down will be blackholed<br /" -">Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br />Rules may " -"not share the same name as configured interfaces, members or policies" -msgstr "" -"“規則”基於 IP 位址、協議、埠把流量劃分到指定的“策略”中。<br />規則按照從上到" -"下的順序進行匹配。除了第一條能夠匹配一次通訊的規則以外，其它規則將被忽略。不" -"匹配任何規則的通訊將會由系統預設路由表進行。<br />來自已知的網路的轉發流量由" -"系統預設路由表接手，然後 MWAN 從中匹配出相應的流量並轉移到 MWAN 自己的路由" -"表。但是所有被劃分到一個無法使用的策略的流量將會無法正常進行路由。<br />名稱" -"允許包括A-Z、a-z、0-9、_ 但是不能有空格。<br />規則不應該與介面、成員、策略中" -"的任意一個設定項使用相同的名稱" +"Rules specify which traffic will use a particular MWAN policy<br />Rules are " +"based on IP address, port or protocol<br />Rules are matched from top to " +"bottom<br />Rules below a matching rule are ignored<br />Traffic not " +"matching any rule is routed using the main routing table<br />Traffic " +"destined for known (other than default) networks is handled by the main " +"routing table<br />Traffic matching a rule, but all WAN interfaces for that " +"policy are down will be blackholed<br />Names may contain characters A-Z, a-" +"z, 0-9, _ and no spaces<br />Rules may not share the same name as configured " +"interfaces, members or policies" +msgstr "" msgid "Seconds. Acceptable values: 1-1000000. Defaults to 600 if not set" msgstr "單位為秒。接受的值：1-1000000。留空則使用預設值 600 秒" @@ -388,21 +346,18 @@ msgstr "源位址" msgid "Source port" msgstr "源埠" -msgid "Start MWAN" -msgstr "啟動 MWAN" - msgid "Sticky" msgstr "粘滯模式" msgid "Sticky timeout" msgstr "粘滯超時" -msgid "Stop MWAN" -msgstr "停止 MWAN" - msgid "Supports CIDR notation (eg \"192.168.100.0/24\") without quotes" msgstr "支援 CIDR 記法（例如：\"192.168.100.0/24\"）不含引號" +msgid "Task" +msgstr "" + msgid "There are currently %d of 250 supported interfaces configured" msgstr "當前已配置 %d 個介面，最大支援 250 個" @@ -437,9 +392,6 @@ msgstr "" "（例如“wan”或“wwan”）<br />$DEVICE 啟動或停止介面的物理裝置名（例" "如“eth0”或“wwan0”）<br /><br />" -msgid "Tracking IP" -msgstr "跟蹤的 IP" - msgid "Tracking hostname or IP address" msgstr "跟蹤的主機或 IP 位址" @@ -449,9 +401,6 @@ msgstr "跟蹤方式" msgid "Tracking reliability" msgstr "跟蹤可靠性" -msgid "Traffic Rules" -msgstr "流量規則" - msgid "" "Traffic from the same source IP address that previously matched this rule " "within the sticky timeout period will use the same WAN interface" @@ -462,88 +411,41 @@ msgstr "" msgid "Troubleshooting" msgstr "故障排除" -msgid "Troubleshooting Data" -msgstr "故障排除資料" - msgid "" "Use the IP address of this interface as source IP address for traffic " "initiated by the router itself" msgstr "使用該介面的 IP 位址作為路由器本身發起的流量的源 IP 位址" -msgid "View the contents of /etc/protocols for protocol descriptions" -msgstr "請檢視 /etc/protocols 獲取可選協議詳情" +msgid "View the content of /etc/protocols for protocol description" +msgstr "" msgid "WARNING: %d interfaces are configured exceeding the maximum of 250!" msgstr "警告：已配置 %d 個介面，超過最大值 250！" -msgid "" -"WARNING: Some interfaces are configured incorrectly or not at all in /etc/" -"config/network!" -msgstr "警告：某些介面配置不正確或未配置到 /etc/config/network！" - -msgid "" -"WARNING: Some interfaces have a higher reliability requirement than there " -"are tracking IP addresses!" -msgstr "警告：某些介面的跟蹤可靠性要求大於了跟蹤 IP 位址總數！" - -msgid "" -"WARNING: Some interfaces have duplicate metrics configured in /etc/config/" -"network!" -msgstr "警告：某些介面在 /etc/config/network 中配置了相同的躍點數！" - -msgid "" -"WARNING: Some interfaces have no default route in the main routing table!" -msgstr "警告：某些介面在主路由表中沒有預設路由！" - -msgid "" -"WARNING: Some interfaces have no metric configured in /etc/config/network!" -msgstr "警告：某些介面沒有在 /etc/config/network 中配置躍點數！" - -msgid "" -"WARNING: Some policies have names exceeding the maximum of 15 characters!" -msgstr "警告：某些策略的名稱超過了 15 個字元！" - -msgid "" -"WARNING: Some rules have a port configured with no or improper protocol " -"specified! Please configure a specific protocol!" -msgstr "警告：某些規則指定了埠卻沒有配置或配置了不正確的協議，請重新指定協議！" - -msgid "" -"WARNING: This and other interfaces have duplicate metrics configured in /etc/" -"config/network!" -msgstr "警告：此介面和其他介面在 /etc/config/network 中配置了相同的躍點數！" - -msgid "" -"WARNING: This interface has a higher reliability requirement than there are " -"tracking IP addresses!" -msgstr "警告：此介面的跟蹤可靠性要求大於了跟蹤 IP 位址總數！" +msgid "WARNING: Interface %s are not found in /etc/config/network" +msgstr "" -msgid "WARNING: This interface has no default route in the main routing table!" -msgstr "警告：此介面在主路由表中沒有預設路由！" +msgid "WARNING: Interface %s has a duplicate metric %s configured" +msgstr "" msgid "" -"WARNING: This interface has no metric configured in /etc/config/network!" -msgstr "警告：此介面沒有在 /etc/config/network 中配置躍點數！" +"WARNING: Interface %s has a higher reliability requirement than tracking " +"hosts (%d)" +msgstr "" -msgid "" -"WARNING: This interface is configured incorrectly or not at all in /etc/" -"config/network!" -msgstr "警告：此介面配置不正確或未配置到 /etc/config/network！" +msgid "WARNING: Interface %s has no default route in the main routing table" +msgstr "" -msgid "" -"WARNING: This policy's name is %d characters exceeding the maximum of 15!" -msgstr "警告：此策略的名稱具有 %d 個字元，超過了 15 個字元！" +msgid "WARNING: Policie %s has exceeding the maximum name of 15 characters" +msgstr "" msgid "" -"WARNING: This rule is incorrectly configured with no or improper protocol " -"specified! Please configure a specific protocol!" -msgstr "警告：此規則沒有配置或配置了不正確的協議，請重新指定協議！" - -msgid "Waiting for MWAN to %s..." -msgstr "等待 MWAN %s..." +"WARNING: Rule %s have a port configured with no or improper protocol " +"specified!" +msgstr "" -msgid "Waiting for diagnostic results..." -msgstr "等待診斷結果..." +msgid "Waiting for command to complete..." +msgstr "" msgid "Weight" msgstr "比重" @@ -573,17 +475,194 @@ msgstr "ifup" msgid "never" msgstr "從不" -msgid "restart" -msgstr "重啟" +msgid "unreachable (reject)" +msgstr "不可達（拒絕）" -msgid "start" -msgstr "啟動" +#~ msgid "Currently Configured Interfaces" +#~ msgstr "當前配置的介面" -msgid "stop" -msgstr "停止" +#~ msgid "Currently Configured Members" +#~ msgstr "當前配置的成員" -msgid "unreachable (reject)" -msgstr "不可達（拒絕）" +#~ msgid "Currently Configured Policies" +#~ msgstr "當前配置的策略" + +#~ msgid "Detailed Status" +#~ msgstr "詳細狀態" + +#~ msgid "Diagnostic Results" +#~ msgstr "診斷結果" + +#~ msgid "Error collecting troubleshooting information" +#~ msgstr "收集故障排除資訊時出錯" + +#~ msgid "Errors" +#~ msgstr "錯誤" + +#~ msgid "Globals mwan3 options" +#~ msgstr "全域性 mwan3 選項" + +#~ msgid "Interface Status" +#~ msgstr "介面狀態" + +#~ msgid "Last 50 MWAN systemlog entries. Newest entries sorted at the top :" +#~ msgstr "最近 50 條 MWAN 系統日誌，最新條目排在頂部：" + +#~ msgid "MWAN Detailed Status" +#~ msgstr "MWAN 詳細狀態" + +#~ msgid "MWAN Interface Configuration" +#~ msgstr "MWAN 介面配置" + +#~ msgid "MWAN Interface Diagnostics" +#~ msgstr "MWAN 介面診斷" + +#~ msgid "MWAN Interface Systemlog" +#~ msgstr "MWAN 介面系統日誌" + +#~ msgid "MWAN Member Configuration" +#~ msgstr "MWAN 成員配置" + +#~ msgid "MWAN Policy Configuration" +#~ msgstr "MWAN 策略配置" + +#~ msgid "MWAN Rule Configuration" +#~ msgstr "MWAN 規則配置" + +#~ msgid "MWAN Service Control" +#~ msgstr "MWAN 服務控制" + +#~ msgid "No MWAN systemlog history found" +#~ msgstr "沒有在系統日誌中找到 MWAN 歷史資訊" + +#~ msgid "No detailed status information available" +#~ msgstr "沒有狀態詳細資訊可用" + +#~ msgid "No diagnostic results returned" +#~ msgstr "沒有返回診斷結果" + +#~ msgid "No protocol specified" +#~ msgstr "未指定協議" + +#~ msgid "Restart MWAN" +#~ msgstr "重啟 MWAN" + +#~ msgid "" +#~ "Rules specify which traffic will use a particular MWAN policy based on IP " +#~ "address, port or protocol<br />Rules are matched from top to bottom. " +#~ "Rules below a matching rule are ignored. Traffic not matching any rule is " +#~ "routed using the main routing table<br />Traffic destined for known " +#~ "(other than default) networks is handled by the main routing table. " +#~ "Traffic matching a rule, but all WAN interfaces for that policy are down " +#~ "will be blackholed<br />Names may contain characters A-Z, a-z, 0-9, _ and " +#~ "no spaces<br />Rules may not share the same name as configured " +#~ "interfaces, members or policies" +#~ msgstr "" +#~ "“規則”基於 IP 位址、協議、埠把流量劃分到指定的“策略”中。<br />規則按照從上" +#~ "到下的順序進行匹配。除了第一條能夠匹配一次通訊的規則以外，其它規則將被忽" +#~ "略。不匹配任何規則的通訊將會由系統預設路由表進行。<br />來自已知的網路的轉" +#~ "發流量由系統預設路由表接手，然後 MWAN 從中匹配出相應的流量並轉移到 MWAN 自" +#~ "己的路由表。但是所有被劃分到一個無法使用的策略的流量將會無法正常進行路由。" +#~ "<br />名稱允許包括A-Z、a-z、0-9、_ 但是不能有空格。<br />規則不應該與介" +#~ "面、成員、策略中的任意一個設定項使用相同的名稱" + +#~ msgid "Start MWAN" +#~ msgstr "啟動 MWAN" + +#~ msgid "Stop MWAN" +#~ msgstr "停止 MWAN" + +#~ msgid "Tracking IP" +#~ msgstr "跟蹤的 IP" + +#~ msgid "Traffic Rules" +#~ msgstr "流量規則" + +#~ msgid "Troubleshooting Data" +#~ msgstr "故障排除資料" + +#~ msgid "View the contents of /etc/protocols for protocol descriptions" +#~ msgstr "請檢視 /etc/protocols 獲取可選協議詳情" + +#~ msgid "" +#~ "WARNING: Some interfaces are configured incorrectly or not at all in /etc/" +#~ "config/network!" +#~ msgstr "警告：某些介面配置不正確或未配置到 /etc/config/network！" + +#~ msgid "" +#~ "WARNING: Some interfaces have a higher reliability requirement than there " +#~ "are tracking IP addresses!" +#~ msgstr "警告：某些介面的跟蹤可靠性要求大於了跟蹤 IP 位址總數！" + +#~ msgid "" +#~ "WARNING: Some interfaces have duplicate metrics configured in /etc/config/" +#~ "network!" +#~ msgstr "警告：某些介面在 /etc/config/network 中配置了相同的躍點數！" + +#~ msgid "" +#~ "WARNING: Some interfaces have no default route in the main routing table!" +#~ msgstr "警告：某些介面在主路由表中沒有預設路由！" + +#~ msgid "" +#~ "WARNING: Some interfaces have no metric configured in /etc/config/network!" +#~ msgstr "警告：某些介面沒有在 /etc/config/network 中配置躍點數！" + +#~ msgid "" +#~ "WARNING: Some policies have names exceeding the maximum of 15 characters!" +#~ msgstr "警告：某些策略的名稱超過了 15 個字元！" + +#~ msgid "" +#~ "WARNING: Some rules have a port configured with no or improper protocol " +#~ "specified! Please configure a specific protocol!" +#~ msgstr "" +#~ "警告：某些規則指定了埠卻沒有配置或配置了不正確的協議，請重新指定協議！" + +#~ msgid "" +#~ "WARNING: This and other interfaces have duplicate metrics configured in /" +#~ "etc/config/network!" +#~ msgstr "警告：此介面和其他介面在 /etc/config/network 中配置了相同的躍點數！" + +#~ msgid "" +#~ "WARNING: This interface has a higher reliability requirement than there " +#~ "are tracking IP addresses!" +#~ msgstr "警告：此介面的跟蹤可靠性要求大於了跟蹤 IP 位址總數！" + +#~ msgid "" +#~ "WARNING: This interface has no default route in the main routing table!" +#~ msgstr "警告：此介面在主路由表中沒有預設路由！" + +#~ msgid "" +#~ "WARNING: This interface has no metric configured in /etc/config/network!" +#~ msgstr "警告：此介面沒有在 /etc/config/network 中配置躍點數！" + +#~ msgid "" +#~ "WARNING: This interface is configured incorrectly or not at all in /etc/" +#~ "config/network!" +#~ msgstr "警告：此介面配置不正確或未配置到 /etc/config/network！" + +#~ msgid "" +#~ "WARNING: This policy's name is %d characters exceeding the maximum of 15!" +#~ msgstr "警告：此策略的名稱具有 %d 個字元，超過了 15 個字元！" + +#~ msgid "" +#~ "WARNING: This rule is incorrectly configured with no or improper protocol " +#~ "specified! Please configure a specific protocol!" +#~ msgstr "警告：此規則沒有配置或配置了不正確的協議，請重新指定協議！" + +#~ msgid "Waiting for MWAN to %s..." +#~ msgstr "等待 MWAN %s..." + +#~ msgid "Waiting for diagnostic results..." +#~ msgstr "等待診斷結果..." + +#~ msgid "restart" +#~ msgstr "重啟" + +#~ msgid "start" +#~ msgstr "啟動" + +#~ msgid "stop" +#~ msgstr "停止" #~ msgid "Advanced" #~ msgstr "高階" diff --git a/applications/luci-app-mwan3/root/etc/hotplug.d/iface/16-mwancustombak b/applications/luci-app-mwan3/root/etc/hotplug.d/iface/16-mwancustombak deleted file mode 100755 index 6e2875e3de..0000000000 --- a/applications/luci-app-mwan3/root/etc/hotplug.d/iface/16-mwancustombak +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -# to enable this script uncomment the case loop at the bottom -# to report mwan status on interface hotplug ifup/ifdown events modify the lines in the send_alert function - -send_alert() -{ - # variable "$1" stores the MWAN status information - # insert your code here to send the contents of "$1" - echo "$1" -} - -gather_event_info() -{ - # create event information message - local EVENT_INFO="Interface [ "$INTERFACE" ($DEVICE) ] on router [ "$(uci -p /var/state get system.@system[0].hostname)" ] has triggered a hotplug [ "$ACTION" ] event on "$(date +"%a %b %d %Y %T %Z")"" - - # get current interface, policy and rule status - local CURRENT_STATUS="$(/usr/sbin/mwan3 status)" - - # get last 50 MWAN systemlog messages - local MWAN_LOG="$(echo -e "Last 50 MWAN systemlog entries. Newest entries sorted at the top:\n$(logread | grep mwan3 | tail -n 50 | sed 'x;1!H;$!d;x')")" - - # pass event info to send_alert function - send_alert "$(echo -e "$EVENT_INFO\n\n$CURRENT_STATUS\n\n$MWAN_LOG")" -} - -#case "$ACTION" in -# ifup) -# gather_event_info -# ;; -# -# ifdown) -# gather_event_info -# ;; -#esac - -exit 0 |