diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-02-01 19:33:52 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-02-14 19:51:01 +0100 |
commit | efdcd31610fe3dd94b93e8204639b00ca67fe992 (patch) | |
tree | 068dbdcfe6243c282affcb3738d8c9ac5480b55e /examples/nft-ruleset-parse-file.c | |
parent | 179a43db739b8151d608452d01b66f65ac8aa5e5 (diff) |
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 <pablo@netfilter.org>
Diffstat (limited to 'examples/nft-ruleset-parse-file.c')
-rw-r--r-- | examples/nft-ruleset-parse-file.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/examples/nft-ruleset-parse-file.c b/examples/nft-ruleset-parse-file.c index 505c43c..be0994f 100644 --- a/examples/nft-ruleset-parse-file.c +++ b/examples/nft-ruleset-parse-file.c @@ -379,7 +379,7 @@ int main(int argc, char *argv[]) struct nftnl_parse_err *err; const char *filename; FILE *fp; - int ret = -1, len, batching, portid; + int ret = -1, len, portid; uint32_t ruleset_seq; char buf[MNL_SOCKET_BUFFER_SIZE]; struct mnl_socket *nl; @@ -402,19 +402,11 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } - batching = nftnl_batch_is_supported(); - if (batching < 0) { - perror("Cannot talk to nfnetlink"); - exit(EXIT_FAILURE); - } - seq = time(NULL); 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); ruleset_seq = seq; filename = argv[1]; @@ -435,10 +427,8 @@ int main(int argc, char *argv[]) fclose(fp); - 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) { |