X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-app-mwan3%2Fluasrc%2Fmodel%2Fcbi%2Fmwan%2Frule.lua;h=f0b94bd0bbbc53c38d8ffcf0aeb7077b4edf3366;hp=97f28bd325eaf9ceb87c0230490479d312f7ad3a;hb=08a2b27df5e282a6b5221fbe72f700523c7b0913;hpb=de1afe2a90450d68e2e2c368fd888520e4ac3f7d 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 97f28bd32..f0b94bd0b 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua @@ -1,40 +1,46 @@ --- ------ extra functions ------ -- +-- Copyright 2014 Aedan Renner +-- Copyright 2018 Florian Eckert +-- Licensed to the public under the GNU General Public License v2. -function ruleCheck() -- determine if rules needs a proper protocol configured +dsp = require "luci.dispatcher" +uci = require "uci" + + +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 "" .. translate("WARNING: Some rules have a port configured with no or improper protocol specified! Please configure a specific protocol!") .. "" - 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("%s
", + 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() + return warnings +end m5 = Map("mwan3", translate("MWAN - Rules"), - ruleWarn()) + ruleWarn(ruleCheck()) + ) mwan_rule = m5:section(TypedSection, "rule", nil, translate("Rules specify which traffic will use a particular MWAN policy
" .. @@ -46,54 +52,53 @@ mwan_rule = m5:section(TypedSection, "rule", nil, "Traffic matching a rule, but all WAN interfaces for that policy are down will be blackholed
" .. "Names may contain characters A-Z, a-z, 0-9, _ and no spaces
" .. "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 +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 +use_policy.rawhtml = true +function use_policy.cfgvalue(self, s) + return self.map:get(s, "use_policy") or "—" +end return m5