From 7c568680e2d904b5332e398a2a329ecdb94f897e Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 20 Dec 2016 01:14:10 +0100 Subject: mnl: add mnl_nft_setelem_batch_flush() and use it from netlink_flush_setelems() Commit 8bd99f2fca7e ("mnl: don't send empty set elements netlink message to kernel") broke set flush because we still need to send the netlink message with no elements to flush sets. To avoid more whack-a-mole games, add a new explicit function mnl_nft_setelem_batch_flush() that is used to request a set flush, instead of reusing the one that allows us to explicitly delete given set elements. Signed-off-by: Pablo Neira Ayuso --- include/mnl.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/mnl.h') diff --git a/include/mnl.h b/include/mnl.h index f74dfee5..87db96af 100644 --- a/include/mnl.h +++ b/include/mnl.h @@ -82,6 +82,8 @@ int mnl_nft_setelem_delete(struct mnl_socket *nf_sock, struct nftnl_set *nls, unsigned int flags); int mnl_nft_setelem_batch_del(struct nftnl_set *nls, unsigned int flags, uint32_t seq); +int mnl_nft_setelem_batch_flush(struct nftnl_set *nls, unsigned int flags, + uint32_t seqnum); int mnl_nft_setelem_get(struct mnl_socket *nf_sock, struct nftnl_set *nls); struct nftnl_ruleset *mnl_nft_ruleset_dump(struct mnl_socket *nf_sock, -- cgit v1.2.3