diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-05-29 20:40:39 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-05-31 17:57:36 +0200 |
commit | dbd6621f3fa25dfa8c7c77c52a19cb0c1bd81642 (patch) | |
tree | 7c731b6b90245b9cd0548d8fcafeeb282353d36b /src/mnl.c | |
parent | 89c82c261bb53bfb0b671437a1323830dd7e4019 (diff) |
mnl: mnl_batch_talk() returns -1 on internal netlink errors
Display an error in case internal netlink plumbing hits problems.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/mnl.c')
-rw-r--r-- | src/mnl.c | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -317,7 +317,6 @@ int mnl_batch_talk(struct netlink_ctx *ctx, struct list_head *err_list, struct iovec iov[iov_len]; struct msghdr msg = {}; fd_set readfds; - int err = 0; mnl_set_sndbuffer(ctx->nft->nf_sock, ctx->batch); @@ -347,10 +346,8 @@ int mnl_batch_talk(struct netlink_ctx *ctx, struct list_head *err_list, ret = mnl_cb_run(rcv_buf, ret, 0, portid, &netlink_echo_callback, ctx); /* Continue on error, make sure we get all acknowledgments */ - if (ret == -1) { + if (ret == -1) mnl_err_list_node_add(err_list, errno, nlh->nlmsg_seq); - err = -1; - } ret = select(fd+1, &readfds, NULL, NULL, &tv); if (ret == -1) @@ -359,7 +356,7 @@ int mnl_batch_talk(struct netlink_ctx *ctx, struct list_head *err_list, FD_ZERO(&readfds); FD_SET(fd, &readfds); } - return err; + return 0; } int mnl_nft_rule_add(struct netlink_ctx *ctx, const struct cmd *cmd, |