From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8609CA9EC5 for ; Wed, 30 Oct 2019 17:27:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C342E2087E for ; Wed, 30 Oct 2019 17:27:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727232AbfJ3R16 (ORCPT ); Wed, 30 Oct 2019 13:27:58 -0400 Received: from orbyte.nwl.cc ([151.80.46.58]:45162 "EHLO orbyte.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726488AbfJ3R16 (ORCPT ); Wed, 30 Oct 2019 13:27:58 -0400 Received: from localhost ([::1]:58252 helo=tatos) by orbyte.nwl.cc with esmtp (Exim 4.91) (envelope-from ) id 1iPrlF-0007p2-Dj; Wed, 30 Oct 2019 18:27:57 +0100 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org Subject: [iptables PATCH v3 08/12] nft: Support NFT_COMPAT_SET_ADD Date: Wed, 30 Oct 2019 18:26:57 +0100 Message-Id: <20191030172701.5892-9-phil@nwl.cc> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191030172701.5892-1-phil@nwl.cc> References: <20191030172701.5892-1-phil@nwl.cc> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Implement the required infrastructure to create sets as part of a batch job commit. Signed-off-by: Phil Sutter --- iptables/nft.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/iptables/nft.c b/iptables/nft.c index 547bc5f0aaad0..fbb3e2f2a0f4a 100644 --- a/iptables/nft.c +++ b/iptables/nft.c @@ -271,6 +271,7 @@ enum obj_update_type { NFT_COMPAT_RULE_REPLACE, NFT_COMPAT_RULE_DELETE, NFT_COMPAT_RULE_FLUSH, + NFT_COMPAT_SET_ADD, }; enum obj_action { @@ -288,6 +289,7 @@ struct obj_update { struct nftnl_table *table; struct nftnl_chain *chain; struct nftnl_rule *rule; + struct nftnl_set *set; void *ptr; }; struct { @@ -315,6 +317,7 @@ static int mnl_append_error(const struct nft_handle *h, [NFT_COMPAT_RULE_REPLACE] = "RULE_REPLACE", [NFT_COMPAT_RULE_DELETE] = "RULE_DELETE", [NFT_COMPAT_RULE_FLUSH] = "RULE_FLUSH", + [NFT_COMPAT_SET_ADD] = "SET_ADD", }; char errmsg[256]; char tcr[128]; @@ -355,6 +358,10 @@ static int mnl_append_error(const struct nft_handle *h, } #endif break; + case NFT_COMPAT_SET_ADD: + snprintf(tcr, sizeof(tcr), "set %s", + nftnl_set_get_str(o->set, NFTNL_SET_NAME)); + break; } return snprintf(buf, len, "%s: %s", errmsg, tcr); @@ -384,6 +391,13 @@ batch_table_add(struct nft_handle *h, enum obj_update_type type, return batch_add(h, type, t); } +static struct obj_update * +batch_set_add(struct nft_handle *h, enum obj_update_type type, + struct nftnl_set *s) +{ + return batch_add(h, type, s); +} + static int batch_chain_add(struct nft_handle *h, enum obj_update_type type, struct nftnl_chain *c) { @@ -2371,6 +2385,39 @@ static void nft_compat_table_batch_add(struct nft_handle *h, uint16_t type, nftnl_table_nlmsg_build_payload(nlh, table); } +static void nft_compat_set_batch_add(struct nft_handle *h, uint16_t type, + uint16_t flags, uint32_t seq, + struct nftnl_set *set) +{ + struct nlmsghdr *nlh; + + nlh = nftnl_nlmsg_build_hdr(nftnl_batch_buffer(h->batch), + type, h->family, flags, seq); + nftnl_set_nlmsg_build_payload(nlh, set); +} + +static void nft_compat_setelem_batch_add(struct nft_handle *h, uint16_t type, + uint16_t flags, uint32_t *seq, + struct nftnl_set *set) +{ + struct nftnl_set_elems_iter *iter; + struct nlmsghdr *nlh; + + iter = nftnl_set_elems_iter_create(set); + if (!iter) + return; + + while (nftnl_set_elems_iter_cur(iter)) { + (*seq)++; + mnl_nft_batch_continue(h->batch); + nlh = nftnl_nlmsg_build_hdr(nftnl_batch_buffer(h->batch), + type, h->family, flags, *seq); + if (nftnl_set_elems_nlmsg_build_payload_iter(nlh, iter) <= 0) + break; + } + nftnl_set_elems_iter_destroy(iter); +} + static void nft_compat_chain_batch_add(struct nft_handle *h, uint16_t type, uint16_t flags, uint32_t seq, struct nftnl_chain *chain) @@ -2420,6 +2467,9 @@ static void batch_obj_del(struct nft_handle *h, struct obj_update *o) case NFT_COMPAT_RULE_FLUSH: nftnl_rule_free(o->rule); break; + case NFT_COMPAT_SET_ADD: + nftnl_set_free(o->set); + break; } h->obj_list_num--; list_del(&o->head); @@ -2486,6 +2536,7 @@ static void nft_refresh_transaction(struct nft_handle *h) case NFT_COMPAT_RULE_REPLACE: case NFT_COMPAT_RULE_DELETE: case NFT_COMPAT_RULE_FLUSH: + case NFT_COMPAT_SET_ADD: break; } } @@ -2576,6 +2627,13 @@ retry: nft_compat_rule_batch_add(h, NFT_MSG_DELRULE, 0, n->seq, n->rule); break; + case NFT_COMPAT_SET_ADD: + nft_compat_set_batch_add(h, NFT_MSG_NEWSET, + NLM_F_CREATE, n->seq, n->set); + nft_compat_setelem_batch_add(h, NFT_MSG_NEWSETELEM, + NLM_F_CREATE, &n->seq, n->set); + seq = n->seq; + break; } mnl_nft_batch_continue(h->batch); -- 2.23.0