diff options
Diffstat (limited to 'examples/nft-rule-add.c')
-rw-r--r-- | examples/nft-rule-add.c | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/examples/nft-rule-add.c b/examples/nft-rule-add.c index d27c6d7..3aeb2e0 100644 --- a/examples/nft-rule-add.c +++ b/examples/nft-rule-add.c @@ -117,22 +117,6 @@ static struct nftnl_rule *setup_rule(uint8_t family, const char *table, return r; } -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; @@ -142,7 +126,7 @@ int main(int argc, char *argv[]) uint8_t family; char buf[MNL_SOCKET_BUFFER_SIZE]; uint32_t seq = time(NULL); - int ret; + int ret, batching; if (argc < 4 || argc > 5) { fprintf(stderr, "Usage: %s <family> <table> <chain>\n", argv[0]); @@ -174,11 +158,18 @@ 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); + } + 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_NEWRULE, @@ -189,9 +180,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); + } ret = mnl_socket_sendto(nl, mnl_nlmsg_batch_head(batch), mnl_nlmsg_batch_size(batch)); |