From 7e549c5e7874016aad52681001d455666d24266d Mon Sep 17 00:00:00 2001 From: Elise Lennion Date: Thu, 12 Jan 2017 17:22:55 -0200 Subject: examples: Remove the use of nftnl_mnl_batch_put() use nftnl_batch_begin() and nftnl_batch_end() instead, to keep examples consistent and avoid code duplication. Signed-off-by: Elise Lennion Signed-off-by: Pablo Neira Ayuso --- examples/nft-rule-del.c | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) (limited to 'examples/nft-rule-del.c') diff --git a/examples/nft-rule-del.c b/examples/nft-rule-del.c index 4bc9727..5c68363 100644 --- a/examples/nft-rule-del.c +++ b/examples/nft-rule-del.c @@ -22,22 +22,6 @@ #include #include -static void nftnl_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; @@ -46,7 +30,7 @@ int main(int argc, char *argv[]) struct mnl_nlmsg_batch *batch; uint32_t portid, seq; struct nftnl_rule *r = NULL; - int ret, family; + int ret, batching, family; if (argc < 4 || argc > 5) { fprintf(stderr, "Usage: %s []\n", @@ -81,11 +65,18 @@ int main(int argc, char *argv[]) if (argc == 5) nftnl_rule_set_u64(r, NFTNL_RULE_HANDLE, atoi(argv[4])); + batching = nftnl_batch_is_supported(); + if (batching < 0) { + perror("cannot talk to nfnetlink"); + exit(EXIT_FAILURE); + } + batch = mnl_nlmsg_batch_start(buf, sizeof(buf)); - nftnl_mnl_batch_put(mnl_nlmsg_batch_current(batch), - NFNL_MSG_BATCH_BEGIN, seq++); - mnl_nlmsg_batch_next(batch); + if (batching) { + nftnl_batch_begin(mnl_nlmsg_batch_current(batch), seq++); + mnl_nlmsg_batch_next(batch); + } nlh = nftnl_rule_nlmsg_build_hdr(mnl_nlmsg_batch_current(batch), NFT_MSG_DELRULE, @@ -96,9 +87,10 @@ int main(int argc, char *argv[]) nftnl_rule_free(r); mnl_nlmsg_batch_next(batch); - nftnl_mnl_batch_put(mnl_nlmsg_batch_current(batch), NFNL_MSG_BATCH_END, - seq++); - mnl_nlmsg_batch_next(batch); + if (batching) { + nftnl_batch_end(mnl_nlmsg_batch_current(batch), seq++); + mnl_nlmsg_batch_next(batch); + } nl = mnl_socket_open(NETLINK_NETFILTER); if (nl == NULL) { -- cgit v1.2.3