diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libnftables.c | 5 | ||||
| -rw-r--r-- | src/mnl.c | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/libnftables.c b/src/libnftables.c index 199dbc97..a58b8ca9 100644 --- a/src/libnftables.c +++ b/src/libnftables.c @@ -21,7 +21,7 @@ static int nft_netlink(struct nft_ctx *nft, struct list_head *cmds, struct list_head *msgs, struct mnl_socket *nf_sock) { - uint32_t batch_seqnum, seqnum = 0; + uint32_t batch_seqnum, seqnum = 0, num_cmds = 0; struct nftnl_batch *batch; struct netlink_ctx ctx; struct cmd *cmd; @@ -49,6 +49,7 @@ static int nft_netlink(struct nft_ctx *nft, strerror(errno)); goto out; } + num_cmds++; } if (!nft->check) mnl_batch_end(batch, mnl_seqnum_alloc(&seqnum)); @@ -56,7 +57,7 @@ static int nft_netlink(struct nft_ctx *nft, if (!mnl_batch_ready(batch)) goto out; - ret = mnl_batch_talk(&ctx, &err_list); + ret = mnl_batch_talk(&ctx, &err_list, num_cmds); list_for_each_entry_safe(err, tmp, &err_list, head) { list_for_each_entry(cmd, cmds, list) { @@ -299,12 +299,14 @@ static ssize_t mnl_nft_socket_sendmsg(struct netlink_ctx *ctx, return sendmsg(mnl_socket_get_fd(ctx->nft->nf_sock), msg, 0); } -int mnl_batch_talk(struct netlink_ctx *ctx, struct list_head *err_list) +int mnl_batch_talk(struct netlink_ctx *ctx, struct list_head *err_list, + uint32_t num_cmds) { struct mnl_socket *nl = ctx->nft->nf_sock; int ret, fd = mnl_socket_get_fd(nl), portid = mnl_socket_get_portid(nl); uint32_t iov_len = nftnl_batch_iovec_len(ctx->batch); char rcv_buf[MNL_SOCKET_BUFFER_SIZE]; + size_t avg_msg_size, batch_size; const struct sockaddr_nl snl = { .nl_family = AF_NETLINK }; @@ -319,7 +321,10 @@ int mnl_batch_talk(struct netlink_ctx *ctx, struct list_head *err_list) mnl_set_sndbuffer(ctx->nft->nf_sock, ctx->batch); - mnl_nft_batch_to_msg(ctx, &msg, &snl, iov, iov_len); + batch_size = mnl_nft_batch_to_msg(ctx, &msg, &snl, iov, iov_len); + avg_msg_size = div_round_up(batch_size, num_cmds); + + mnl_set_rcvbuffer(ctx->nft->nf_sock, num_cmds * avg_msg_size * 4); ret = mnl_nft_socket_sendmsg(ctx, &msg); if (ret == -1) |