luci-app-firewall: Add ipset field to snats

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit 48086e1c7b3e7094b6fbe61335209189b1006bfb)

diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js
index a36dfee6bbbbe22bbaaf6050dfbc9386518f7099..6ccb07556904fd98a630c3065a1184b25e1296ba 100644 (file)
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js
@@ -313,6 +313,17 @@ return view.extend({
                o.depends({ proto: 'tcp', '!contains': true });
                o.depends({ proto: 'udp', '!contains': true });
 
+               var have_fw4 = L.hasSystemFeature('firewall4')
+               if (!have_fw4) {
+                       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;
+               }
+
                o = s.taboption('advanced', widgets.DeviceSelect, 'device', _('Outbound device'),
                        _('Matches forwarded traffic using the specified outbound network device.'));
                o.noaliases = true;
@@ -323,7 +334,7 @@ return view.extend({
                fwtool.addLimitOption(s);
                fwtool.addLimitBurstOption(s);
 
-               if (!L.hasSystemFeature('firewall4')) {
+               if (!have_fw4) {
                        o = s.taboption('advanced', form.Value, 'extra', _('Extra arguments'),
                                _('Passes additional arguments to iptables. Use with care!'));
                        o.modalonly = true;