From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arturo Borrero Gonzalez Subject: [libnftnl PATCH 2/3] examples: fix nft-chain-del by adding batching support Date: Mon, 11 Aug 2014 12:19:44 +0200 Message-ID: <20140811101944.10640.99556.stgit@nfdev.cica.es> References: <20140811101938.10640.47989.stgit@nfdev.cica.es> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: pablo@netfilter.org To: netfilter-devel@vger.kernel.org Return-path: Received: from smtp4.cica.es ([150.214.5.182]:60789 "EHLO smtp.cica.es" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752710AbaHKKTz (ORCPT ); Mon, 11 Aug 2014 06:19:55 -0400 In-Reply-To: <20140811101938.10640.47989.stgit@nfdev.cica.es> Sender: netfilter-devel-owner@vger.kernel.org List-ID: This code example doesn't work, as the kernel API is only listening to messages in batches. This patch updates the example to add the needed batching support. Signed-off-by: Arturo Borrero Gonzalez --- examples/nft-chain-del.c | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/examples/nft-chain-del.c b/examples/nft-chain-del.c index c87ab92..f72a916 100644 --- a/examples/nft-chain-del.c +++ b/examples/nft-chain-del.c @@ -15,14 +15,32 @@ #include #include +#include #include #include #include +static void nft_mnl_batch_put(char *buf, uint16_t type, uint32_t seq) +{ + struct nlmsghdr *nlh; + struct nfgenmsg *nfg; + + nlh = mnl_nlmsg_put_header(buf); + nlh->nlmsg_type = type; + nlh->nlmsg_flags = NLM_F_REQUEST; + nlh->nlmsg_seq = seq; + + nfg = mnl_nlmsg_put_extra_header(nlh, sizeof(*nfg)); + nfg->nfgen_family = AF_INET; + nfg->version = NFNETLINK_V0; + nfg->res_id = NFNL_SUBSYS_NFTABLES; +} + int main(int argc, char *argv[]) { struct mnl_socket *nl; + struct mnl_nlmsg_batch *batch; char buf[MNL_SOCKET_BUFFER_SIZE]; struct nlmsghdr *nlh; uint32_t portid, seq; @@ -53,13 +71,26 @@ int main(int argc, char *argv[]) perror("OOM"); exit(EXIT_FAILURE); } + batch = mnl_nlmsg_batch_start(buf, sizeof(buf)); + seq = time(NULL); - nlh = nft_chain_nlmsg_build_hdr(buf, NFT_MSG_DELCHAIN, family, - NLM_F_ACK, seq); + nft_mnl_batch_put(mnl_nlmsg_batch_current(batch), + NFNL_MSG_BATCH_BEGIN, seq++); + mnl_nlmsg_batch_next(batch); + + + nlh = nft_chain_nlmsg_build_hdr(mnl_nlmsg_batch_current(batch), + NFT_MSG_DELCHAIN, family, + NLM_F_ACK, seq++); nft_chain_attr_set(t, NFT_CHAIN_ATTR_TABLE, argv[2]); nft_chain_attr_set(t, NFT_CHAIN_ATTR_NAME, argv[3]); nft_chain_nlmsg_build_payload(nlh, t); nft_chain_free(t); + mnl_nlmsg_batch_next(batch); + + nft_mnl_batch_put(mnl_nlmsg_batch_current(batch), NFNL_MSG_BATCH_END, + seq++); + mnl_nlmsg_batch_next(batch); nl = mnl_socket_open(NETLINK_NETFILTER); if (nl == NULL) { @@ -73,14 +104,17 @@ int main(int argc, char *argv[]) } portid = mnl_socket_get_portid(nl); - if (mnl_socket_sendto(nl, nlh, nlh->nlmsg_len) < 0) { + if (mnl_socket_sendto(nl, mnl_nlmsg_batch_head(batch), + mnl_nlmsg_batch_size(batch)) < 0) { perror("mnl_socket_send"); exit(EXIT_FAILURE); } + mnl_nlmsg_batch_stop(batch); + ret = mnl_socket_recvfrom(nl, buf, sizeof(buf)); while (ret > 0) { - ret = mnl_cb_run(buf, ret, seq, portid, NULL, NULL); + ret = mnl_cb_run(buf, ret, 0, portid, NULL, NULL); if (ret <= 0) break; ret = mnl_socket_recvfrom(nl, buf, sizeof(buf));