From 69867dbb3269be605975f9343a0e8ed3baebdd95 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 21 Feb 2024 14:45:34 +0100 Subject: [PATCH] luci-app-firewall: add address range inputs for traffic rules Ref: https://forum.openwrt.org/t/question-about-firewall-rules/188656 Signed-off-by: Jo-Philipp Wich (cherry picked from commit 42bd2af3fe2b3902cf0b48469e155c324ef5322d) --- .../htdocs/luci-static/resources/tools/firewall.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js b/applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js index ec0ee369ea..f9d7dc611c 100644 --- a/applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js +++ b/applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js @@ -6,6 +6,7 @@ 'require form'; 'require network'; 'require firewall'; +'require validation'; 'require tools.prng as random'; var protocols = [ @@ -455,9 +456,10 @@ return baseclass.extend({ addIPOption: function(s, tab, name, label, description, family, hosts, multiple) { var o = s.taboption(tab, multiple ? this.CBIDynamicMultiValueList : form.Value, name, label, description); + var fw4 = L.hasSystemFeature('firewall4'); o.modalonly = true; - o.datatype = 'list(neg(ipmask("true")))'; + o.datatype = (fw4 && validation.types.iprange) ? 'list(neg(or(ipmask("true"),iprange)))' : 'list(neg(ipmask("true")))'; o.placeholder = multiple ? _('-- add IP --') : _('any'); if (family != null) { -- 2.30.2