path: root/src/scanner.l
diff options
authorPablo Neira Ayuso <>2018-01-22 11:17:10 +0100
committerPablo Neira Ayuso <>2018-01-22 11:47:58 +0100
commit30f667920601d01107398cbb85da45fdb1237212 (patch)
tree007eb0687d716a6cb2a33be255e283fdd483d4af /src/scanner.l
parentb4c7117ef552d0d71bde1db4a047b4c005699951 (diff)
src: add 'auto-merge' option to sets
After discussions with Karel here: And later on with Phil Sutter, we decided to disable the automatic merge feature in sets with intervals. This feature is problematic because it introduces an inconsistency between what we add and what we later on get. This is going to get worse with the upcoming timeout support for intervals. Therefore, we turned off this by default. However, Jeff Kletsky and folks like this feature, so let's restore this behaviour on demand with this new 'auto-merge' statement, that you can place on the set definition, eg. # nft list ruleset table ip x { ... set y { type ipv4_addr flags interval auto-merge } } # nft add element x z {, } Regarding implementation details: Given this feature only makes sense from userspace, let's store this in the set user data area, so nft knows it has to do automatic merge of adjacent/overlapping elements as per user request. # nft add set x z { type ipv4_addr\; auto-merge\; } Error: auto-merge only works with interval sets add set x z { type ipv4_addr; auto-merge; } ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Fixes: Signed-off-by: Pablo Neira Ayuso <>
Diffstat (limited to 'src/scanner.l')
1 files changed, 1 insertions, 0 deletions
diff --git a/src/scanner.l b/src/scanner.l
index 5402be1c..c3992a78 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -283,6 +283,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr})
"constant" { return CONSTANT; }
"interval" { return INTERVAL; }
+"auto-merge" { return AUTOMERGE; }
"timeout" { return TIMEOUT; }
"gc-interval" { return GC_INTERVAL; }
"elements" { return ELEMENTS; }