From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: phil@nwl.cc
Subject: [PATCH nft,v2 2/7] mnl: mnl_set_rcvbuffer() skips buffer size update if it is too small
Date: Thu, 30 May 2019 12:55:24 +0200 [thread overview]
Message-ID: <20190530105529.12657-2-pablo@netfilter.org> (raw)
In-Reply-To: <20190530105529.12657-1-pablo@netfilter.org>
Check for existing buffer size, if this is larger than the requested new
buffer size, skip the buffer size update.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
src/mnl.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/mnl.c b/src/mnl.c
index 288a887df097..a84a6a609333 100644
--- a/src/mnl.c
+++ b/src/mnl.c
@@ -235,8 +235,15 @@ static void mnl_set_sndbuffer(const struct mnl_socket *nl,
static int mnl_set_rcvbuffer(const struct mnl_socket *nl, size_t bufsiz)
{
+ size_t cur_bufsiz;
+ socklen_t len;
int ret;
+ ret = getsockopt(mnl_socket_get_fd(nl), SOL_SOCKET, SO_RCVBUF,
+ &cur_bufsiz, &len);
+ if (cur_bufsiz > bufsiz)
+ return 0;
+
ret = setsockopt(mnl_socket_get_fd(nl), SOL_SOCKET, SO_RCVBUFFORCE,
&bufsiz, sizeof(socklen_t));
if (ret < 0) {
--
2.11.0
next prev parent reply other threads:[~2019-05-30 10:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-30 10:55 [PATCH nft,v2 1/7] mnl: add mnl_set_rcvbuffer() and use it Pablo Neira Ayuso
2019-05-30 10:55 ` Pablo Neira Ayuso [this message]
2019-05-30 10:55 ` [PATCH nft,v2 3/7] mnl: call mnl_set_sndbuffer() from mnl_batch_talk() Pablo Neira Ayuso
2019-05-30 10:55 ` [PATCH nft,v2 4/7] mnl: add mnl_nft_batch_to_msg() Pablo Neira Ayuso
2019-05-30 10:55 ` [PATCH nft,v2 5/7] mnl: estimate receiver buffer size Pablo Neira Ayuso
2019-05-31 18:11 ` Eric Garver
2019-05-31 18:40 ` Pablo Neira Ayuso
2019-05-30 10:55 ` [PATCH nft,v2 6/7] mnl: mnl_batch_talk() returns -1 on internal netlink errors Pablo Neira Ayuso
2019-05-30 10:55 ` [PATCH nft,v2 7/7] erec: remove double \n on error when internal_netlink is used Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190530105529.12657-2-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=phil@nwl.cc \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).