mnl: add mnl_set_rcvbuffer() and use it
Pablo Neira Ayuso
maintainerPATCH 1/3 mnl: add mnl_set_rcvbuffer() and use it
This new function allows us to set the netlink receiver buffer.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/mnl.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-)
src/mnl.c +23 -14
@@ -233,6 +233,23 @@ static void mnl_set_sndbuffer(const struct mnl_socket *nl, nlbuffsiz = newbuffsiz; } +static int mnl_set_rcvbuffer (const struct mnl_socket *nl,size_t bufsiz) +{ +int ret; + + ret =setsockopt (mnl_socket_get_fd (nl),SOL_SOCKET ,SO_RCVBUFFORCE , + &bufsiz,sizeof (socklen_t)); +if (ret <0 ) { +/* If this doesn't work, try to reach the system wide maximum +* (or whatever the user requested). +*/ + ret =setsockopt (mnl_socket_get_fd (nl),SOL_SOCKET ,SO_RCVBUF , + &bufsiz,sizeof (socklen_t)); + } + +return ret; +} +static ssize_t mnl_nft_socket_sendmsg (const struct netlink_ctx *ctx) {static const struct sockaddr_nl snl = {
@@ -1391,20 +1408,12 @@ int mnl_nft_event_listener(struct mnl_socket *nf_sock, unsigned int debug_mask,fd_set readfds;int ret; - ret =setsockopt (fd,SOL_SOCKET ,SO_RCVBUFFORCE , &bufsiz, -sizeof (socklen_t)); -if (ret <0 ) { -/* If this doesn't work, try to reach the system wide maximum -* (or whatever the user requested). -*/ - ret =setsockopt (fd,SOL_SOCKET ,SO_RCVBUF , &bufsiz, -sizeof (socklen_t)); -if (ret <0 ) -nft_print (octx,"# Cannot increase netlink socket buffer size, expect message loss\n" ); -else -nft_print (octx,"# Cannot set up netlink socket buffer size to %u bytes, falling back to %u bytes\n" , -NFTABLES_NLEVENT_BUFSIZ , bufsiz); - } + ret =mnl_set_rcvbuffer (nf_sock, bufsiz); +if (ret <0 ) +nft_print (octx,"# Cannot increase netlink socket buffer size, expect message loss\n" ); +else +nft_print (octx,"# Cannot set up netlink socket buffer size to %u bytes, falling back to %u bytes\n" , +NFTABLES_NLEVENT_BUFSIZ , bufsiz);while (1 ) {FD_ZERO (&readfds);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/3 mnl: call mnl_set_sndbuffer() from mnl_batch_talk()
Instead of mnl_nft_socket_sendmsg(), just a cleanup.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/mnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
src/mnl.c +2 -1
@@ -265,7 +265,6 @@ static ssize_t mnl_nft_socket_sendmsg(const struct netlink_ctx *ctx) };uint32_t i; -mnl_set_sndbuffer (ctx->nft->nf_sock, ctx->batch);nftnl_batch_iovec (ctx->batch, iov, iov_len);for (i =0 ; i < iov_len; i++) {
@@ -291,6 +290,8 @@ int mnl_batch_talk(struct netlink_ctx *ctx, struct list_head *err_list) };int err =0 ; +mnl_set_sndbuffer (ctx->nft->nf_sock, ctx->batch); + ret =mnl_nft_socket_sendmsg (ctx);if (ret ==-1 )return -1 ;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 3/3 mnl: estimate receiver buffer size based on the number of commands
In reply to Pablo Neira AyusoSet a receiver buffer size based on the number of commands, this is useful for the --echo option in order to avoid ENOBUFS errors, assume MNL_SOCKET_BUFFER_SIZE per echo message worst case.
Reported-by Phil Sutter <[email protected]>
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/mnl.h | 3 ++- src/libnftables.c | 5 +++-- src/mnl.c | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-)
include/mnl.h +2 -1
@@ -25,7 +25,8 @@ bool mnl_batch_ready(struct nftnl_batch *batch);void mnl_batch_reset (struct nftnl_batch *batch);uint32_t mnl_batch_begin (struct nftnl_batch *batch,uint32_t seqnum);void mnl_batch_end (struct nftnl_batch *batch,uint32_t seqnum); -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);int mnl_nft_rule_add (struct netlink_ctx *ctx,const struct cmd *cmd,unsigned int flags);
src/libnftables.c +3 -2
@@ -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) {
src/mnl.c +4 -2
@@ -278,19 +278,21 @@ static ssize_t mnl_nft_socket_sendmsg(const 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);char rcv_buf[MNL_SOCKET_BUFFER_SIZE ]; -fd_set readfds;struct timeval tv = { .tv_sec =0 , .tv_usec =0 }; +fd_set readfds;int err =0 ;mnl_set_sndbuffer (ctx->nft->nf_sock, ctx->batch); +mnl_set_rcvbuffer (ctx->nft->nf_sock, num_cmds *MNL_SOCKET_BUFFER_SIZE ); ret =mnl_nft_socket_sendmsg (ctx);if (ret ==-1 )
Signature · 1 line
2.11.0