From dea8e678023b40517ce9eae0f368d3270aaef871 Mon Sep 17 00:00:00 2001 From: Paul Dee Date: Fri, 17 Feb 2023 14:07:44 +0100 Subject: [PATCH] luci-app-firewall: Add ipset field to rules Signed-off-by: Paul Dee (cherry picked from commit f407a013ba1e889ba4cd09eaf456724cb41e1537) --- .../htdocs/luci-static/resources/view/firewall/rules.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js index 6aa0173ce5..5dda8075a2 100644 --- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js +++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js @@ -371,6 +371,14 @@ return view.extend({ o.allowany = true; o.allowlocal = 'src'; + o = s.taboption('advanced', form.Value, 'ipset', _('Use ipset')); + uci.sections('firewall', 'ipset', function(s) { + if (typeof(s.name) == 'string') + this.value(s.name, s.comment ? '%s (%s)'.format(s.name, s.comment) : s.name); + }); + o.modalonly = true; + o.rmempty = true; + fwtool.addMACOption(s, 'advanced', 'src_mac', _('Source MAC address'), null, hosts); fwtool.addIPOption(s, 'general', 'src_ip', _('Source address'), null, '', hosts, true); -- 2.30.2