status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

rewrite send_batch() for clarity

This commit is contained in:
Thomas Bernard 2020-06-07 21:43:03 +02:00
parent f23c3e68aa
commit 5f66d1852d
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
miniupnpd/netfilter_nft/nftnlrdr_misc.c
View File

@ -703,8 +703,8 @@ refresh_nft_cache(struct rule_list *head, const char *table, const char *chain,
} }
ret = mnl_cb_run(buf, n, mnl_seq, mnl_portid, table_cb, &type); ret = mnl_cb_run(buf, n, mnl_seq, mnl_portid, table_cb, &type);
if (ret <= -1 /*== MNL_CB_ERROR*/) { if (ret <= -1 /*== MNL_CB_ERROR*/) {
syslog(LOG_ERR, "%s: mnl_cb_run: %m", syslog(LOG_ERR, "%s: mnl_cb_run returned %d",
"refresh_nft_cache"); "refresh_nft_cache", ret);
return -1; return -1;
} }
} while(ret >= 1 /*== MNL_CB_OK*/); } while(ret >= 1 /*== MNL_CB_OK*/);
@ -1334,6 +1334,7 @@ int
send_batch(struct mnl_nlmsg_batch *batch) send_batch(struct mnl_nlmsg_batch *batch)
{ {
int ret; int ret;
ssize_t n;
char buf[MNL_SOCKET_BUFFER_SIZE]; char buf[MNL_SOCKET_BUFFER_SIZE];
mnl_nlmsg_batch_next(batch); mnl_nlmsg_batch_next(batch);
@ -1344,29 +1345,31 @@ send_batch(struct mnl_nlmsg_batch *batch)
if (mnl_sock == NULL) { if (mnl_sock == NULL) {
log_error("netlink not connected"); log_error("netlink not connected");
return -1; return -1;
} else {
ret = mnl_socket_sendto(mnl_sock, mnl_nlmsg_batch_head(batch),
mnl_nlmsg_batch_size(batch));
if (ret == -1) {
log_error("mnl_socket_sendto() FAILED: %m");
return -2;
} else {
mnl_nlmsg_batch_stop(batch);
do {
ret = mnl_socket_recvfrom(mnl_sock, buf, sizeof(buf));
if (ret == -1) {
log_error("mnl_socket_recvfrom() FAILED: %m");
return -3;
} else if (ret > 0) {
ret = mnl_cb_run(buf, ret, 0, mnl_portid, NULL, NULL);
if (ret <= -1 /*== MNL_CB_ERROR*/) {
log_error("mnl_cb_run() FAILED: %m");
return -4;
}
}
} while (ret > 0);
}
} }
n = mnl_socket_sendto(mnl_sock, mnl_nlmsg_batch_head(batch),
mnl_nlmsg_batch_size(batch));
if (n == -1) {
log_error("mnl_socket_sendto() FAILED: %m");
return -2;
}
mnl_nlmsg_batch_stop(batch);
do {
n = mnl_socket_recvfrom(mnl_sock, buf, sizeof(buf));
if (n == -1) {
log_error("mnl_socket_recvfrom() FAILED: %m");
return -3;
} else if (n == 0) {
break;
}
ret = mnl_cb_run(buf, n, 0, mnl_portid, NULL, NULL);
if (ret <= -1 /*== MNL_CB_ERROR*/) {
syslog(LOG_ERR, "%s: mnl_cb_run returned %d",
"send_batch", ret);
return -4;
}
} while (ret >= 1 /*== MNL_CB_OK*/);
/* ret == MNL_CB_STOP */
return 0; return 0;
} }