diff options
author | Phil Sutter <phil@nwl.cc> | 2019-05-31 16:17:43 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-05-31 18:09:39 +0200 |
commit | 6d0c815e281c4edc539c535491d6425cf0f8edeb (patch) | |
tree | c641cd3ad080e3f5e423df4bb6ecb47b3099fe09 /src/mnl.c | |
parent | 59d301ec80264a907918028c590f7f172003a995 (diff) |
mnl: Simplify mnl_batch_talk()
By mimicking mnl_nft_event_listener() code, mnl_batch_talk() may be
simplified quite a bit:
* Turn the conditional loop into an unconditional one.
* Call select() at loop start, which merges the two call sites.
* Check readfds content after select() returned instead of in loop
condition - if fd is not set, break to return error state stored in
'err' variable.
* Old code checked that select() return code is > 0, but that was
redundant: if FD_ISSET() returns true, select return code was 1.
* Move 'nlh' helper variable definition into error handling block, it is
not used outside of it.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/mnl.c')
-rw-r--r-- | src/mnl.c | 29 |
1 files changed, 13 insertions, 16 deletions
@@ -329,16 +329,17 @@ int mnl_batch_talk(struct netlink_ctx *ctx, struct list_head *err_list, if (ret == -1) return -1; - FD_ZERO(&readfds); - FD_SET(fd, &readfds); - /* receive and digest all the acknowledgments from the kernel. */ - ret = select(fd+1, &readfds, NULL, NULL, &tv); - if (ret == -1) - return -1; + while (true) { + FD_ZERO(&readfds); + FD_SET(fd, &readfds); - while (ret > 0 && FD_ISSET(fd, &readfds)) { - struct nlmsghdr *nlh = (struct nlmsghdr *)rcv_buf; + ret = select(fd + 1, &readfds, NULL, NULL, &tv); + if (ret == -1) + return -1; + + if (!FD_ISSET(fd, &readfds)) + break; ret = mnl_socket_recvfrom(nl, rcv_buf, sizeof(rcv_buf)); if (ret == -1) @@ -346,15 +347,11 @@ 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) - mnl_err_list_node_add(err_list, errno, nlh->nlmsg_seq); - - FD_ZERO(&readfds); - FD_SET(fd, &readfds); + if (ret == -1) { + struct nlmsghdr *nlh = (struct nlmsghdr *)rcv_buf; - ret = select(fd+1, &readfds, NULL, NULL, &tv); - if (ret == -1) - return -1; + mnl_err_list_node_add(err_list, errno, nlh->nlmsg_seq); + } } return 0; } |