Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2476 from TDT-AG/pr/20190122-luci-app-mwan3

Browse source 
luci-app-mwan3: add syslog option and prefiil ipset rule dropdown
This commit is contained in:
Hannu Nyman 2019-01-22 17:51:28 +02:00 committed by GitHub
commit 61b9f7af8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua
View file

@ -3,7 +3,7 @@
local net = require "luci.model.network".init()
local s, m, mask, rtmon, rtlookup
local s, m, mask, rtmon, rtlookup, logging, loglevel
m = Map("mwan3", translate("MWAN - Globals"))
@ -17,6 +17,27 @@ mask = s:option(
mask.datatype = "hex(4)"
mask.default = "0xff00"
logging = s:option(Flag,
"logging",
translate("Logging"),
translate("Enables global firewall logging"))
loglevel = s:option(
ListValue,
"loglevel",
translate("Loglevel"),
translate("Firewall loglevel"))
loglevel.default = "notice"
loglevel:value("emerg", translate("Emergency"))
loglevel:value("alert", translate("Alert"))
loglevel:value("crit", translate("Critical"))
loglevel:value("error", translate("Error"))
loglevel:value("warning", translate("Warning"))
loglevel:value("notice", translate("Notice"))
loglevel:value("info", translate("Info"))
loglevel:value("debug", translate("Debug"))
loglevel:depends("logging", "1")
rtmon = s:option(
Value,
"rtmon_interval",

11
applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua
View file

@ -3,12 +3,15 @@
-- Licensed to the public under the GNU General Public License v2.
local dsp = require "luci.dispatcher"
local util = require("luci.util")
local m, mwan_rule, src_ip, src_port, dest_ip, dest_port, proto, sticky
local timeout, ipset, policy
local timeout, ipset, logging, policy
arg[1] = arg[1] or ""
local ipsets = util.split(util.trim(util.exec("ipset -n -L 2>/dev/null | grep -v mwan3_ | sort")), "\n", nil, true) or {}
m = Map("mwan3", translatef("MWAN Rule Configuration - %s", arg[1]))
m.redirect = dsp.build_url("admin", "network", "mwan", "rule")
@ -52,6 +55,12 @@ 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\")"))
for _, z in ipairs(ipsets) do
ipset:value(z)
end
logging = mwan_rule:option(Flag, "logging", translate("Logging"),
translate("Enables firewall rule logging (global mwan3 logging must also be enabled)"))
policy = mwan_rule:option(Value, "use_policy", translate("Policy assigned"))
m.uci:foreach("mwan3", "policy",