From efdcd31610fe3dd94b93e8204639b00ca67fe992 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Thu, 1 Feb 2018 19:33:52 +0100 Subject: examples: do not call nftnl_batch_is_supported() This is only required by Linux kernel <= 3.16.x, that's too old and at that time nft was very limited in term of features, so let's remove this check from example files. Signed-off-by: Pablo Neira Ayuso --- examples/nft-chain-parse-add.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'examples/nft-chain-parse-add.c') diff --git a/examples/nft-chain-parse-add.c b/examples/nft-chain-parse-add.c index a9ee8e9..9198615 100644 --- a/examples/nft-chain-parse-add.c +++ b/examples/nft-chain-parse-add.c @@ -77,8 +77,8 @@ int main(int argc, char *argv[]) uint32_t portid, seq, chain_seq; struct nftnl_chain *c; uint16_t family, format, outformat; - int ret, batching; struct mnl_nlmsg_batch *batch; + int ret; if (argc < 3) { printf("Usage: %s {json} \n", argv[0]); @@ -104,18 +104,11 @@ int main(int argc, char *argv[]) family = nftnl_chain_get_u32(c, NFTNL_CHAIN_FAMILY); seq = time(NULL); - batching = nftnl_batch_is_supported(); - if (batching < 0) { - perror("cannot talk to nfnetlink"); - exit(EXIT_FAILURE); - } batch = mnl_nlmsg_batch_start(buf, sizeof(buf)); - if (batching) { - nftnl_batch_begin(mnl_nlmsg_batch_current(batch), seq++); - mnl_nlmsg_batch_next(batch); - } + nftnl_batch_begin(mnl_nlmsg_batch_current(batch), seq++); + mnl_nlmsg_batch_next(batch); chain_seq = seq; nlh = nftnl_chain_nlmsg_build_hdr(mnl_nlmsg_batch_current(batch), @@ -125,10 +118,8 @@ int main(int argc, char *argv[]) nftnl_chain_free(c); mnl_nlmsg_batch_next(batch); - if (batching) { - nftnl_batch_end(mnl_nlmsg_batch_current(batch), seq++); - mnl_nlmsg_batch_next(batch); - } + 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