From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 21 Feb 2024 13:45:34 +0000 (+0100)
Subject: luci-app-firewall: add address range inputs for traffic rules
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=69867dbb3269be605975f9343a0e8ed3baebdd95;p=project%2Fluci.git

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 <jo@mein.io>
(cherry picked from commit 42bd2af3fe2b3902cf0b48469e155c324ef5322d)
---

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) {