* [PATCH nft] cache: do not populate the cache in case of flush ruleset command
@ 2019-06-14 12:16 Pablo Neira Ayuso
0 siblings, 0 replies; only message in thread
From: Pablo Neira Ayuso @ 2019-06-14 12:16 UTC (permalink / raw)
To: netfilter-devel; +Cc: phil, fw
__CMD_FLUSH_RULESET is a dummy definition that used to skip the netlink
dump to populate the cache. This patch is a workaround until we have a
better infrastructure to track the state of the cache objects.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
include/rule.h | 1 +
src/cache.c | 3 +++
src/rule.c | 3 +++
3 files changed, 7 insertions(+)
diff --git a/include/rule.h b/include/rule.h
index dd9df9ec6dd8..b41825d000d6 100644
--- a/include/rule.h
+++ b/include/rule.h
@@ -462,6 +462,7 @@ enum cmd_ops {
CMD_EXPORT,
CMD_MONITOR,
CMD_DESCRIBE,
+ __CMD_FLUSH_RULESET,
};
/**
diff --git a/src/cache.c b/src/cache.c
index 532ef425906a..d7153f6f6b8f 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -54,6 +54,9 @@ static unsigned int evaluate_cache_flush(struct cmd *cmd)
unsigned int completeness = CMD_INVALID;
switch (cmd->obj) {
+ case CMD_OBJ_RULESET:
+ completeness = __CMD_FLUSH_RULESET;
+ break;
case CMD_OBJ_SET:
case CMD_OBJ_MAP:
case CMD_OBJ_METER:
diff --git a/src/rule.c b/src/rule.c
index 8de5aa62b94f..3dba8b991e12 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -155,6 +155,9 @@ static int cache_init_objects(struct netlink_ctx *ctx, enum cmd_ops cmd)
struct set *set;
int ret;
+ if (cmd == __CMD_FLUSH_RULESET)
+ return 0;
+
list_for_each_entry(table, &ctx->nft->cache.list, list) {
ret = netlink_list_sets(ctx, &table->handle);
list_splice_tail_init(&ctx->list, &table->sets);
--
2.11.0
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-06-14 12:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-14 12:16 [PATCH nft] cache: do not populate the cache in case of flush ruleset command Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).