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 /src/evaluate.c | |
| 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 'src/evaluate.c')
| -rw-r--r-- | src/evaluate.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index 5ea3bff0..7f748c49 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -1478,10 +1478,12 @@ static int interval_set_eval(struct eval_ctx *ctx, struct set *set, switch (ctx->cmd->op) { case CMD_CREATE: case CMD_ADD: - if (set->automerge) - ret = set_automerge(ctx->msgs, set, init); - else + if (set->automerge) { + ret = set_automerge(ctx->msgs, ctx->cmd, set, init, + ctx->nft->debug_mask); + } else { ret = set_overlap(ctx->msgs, set, init); + } break; case CMD_DELETE: set_to_range(init); |