diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2022-04-13 04:01:17 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2022-04-13 13:43:55 +0200 |
| commit | 3da9643fb9ff9a2e8386abe142138256d1e2c4d2 (patch) | |
| tree | 4b728a30170e39fc74bbdd15b12456f10a208c76 /include | |
| parent | 7b061e6376f52999a631f4c5784588c976f47b9c (diff) | |
intervals: add support to automerge with kernel elements
Extend the interval codebase to support for merging elements in the
kernel with userspace element updates.
Add a list of elements to be purged to cmd and set objects. These
elements representing outdated intervals are deleted before adding the
updated ranges.
This routine splices the list of userspace and kernel elements, then it
mergesorts to identify overlapping and contiguous ranges. This splice
operation is undone so the set userspace cache remains consistent.
Incrementally update the elements in the cache, this allows to remove
dd44081d91ce ("segtree: Fix add and delete of element in same batch").
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/intervals.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/intervals.h b/include/intervals.h index f6980063..797129fc 100644 --- a/include/intervals.h +++ b/include/intervals.h @@ -2,7 +2,8 @@ #define NFTABLES_INTERVALS_H void set_to_range(struct expr *init); -int set_automerge(struct list_head *msgs, struct set *set, struct expr *init); +int set_automerge(struct list_head *msgs, struct cmd *cmd, struct set *set, + struct expr *init, unsigned int debug_mask); int set_overlap(struct list_head *msgs, struct set *set, struct expr *init); int set_to_intervals(const struct set *set, struct expr *init, bool add); |