projects
/
project
/
firewall4.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9bce873
)
ruleset: set auto-merge directive for interval sets
author
Jo-Philipp Wich
<jo@mein.io>
Thu, 21 Apr 2022 19:21:02 +0000
(21:21 +0200)
committer
Jo-Philipp Wich
<jo@mein.io>
Thu, 21 Apr 2022 19:21:02 +0000
(21:21 +0200)
Set the auto-merge directive for interval sets to automatically merge
overlapping CIDRs such as 192.168.1.0/24, 192.168.1.1. Without that
directive, nft will fail to apply the rendered ruleset with an error.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
root/usr/share/firewall4/templates/ruleset.uc
patch
|
blob
|
history
diff --git
a/root/usr/share/firewall4/templates/ruleset.uc
b/root/usr/share/firewall4/templates/ruleset.uc
index b4023157bf2dc8578d3edfcc46dcc4fe19343795..9cf7ef6d406c9b3f77049a9a594952da4ca49daa 100644
(file)
--- a/
root/usr/share/firewall4/templates/ruleset.uc
+++ b/
root/usr/share/firewall4/templates/ruleset.uc
@@
-36,6
+36,7
@@
table inet fw4 {
{% endif %}
{% if (set.interval): %}
flags interval
+ auto-merge
{% endif %}
{% fw4.print_setentries(set) %}
}