mnl: mnl_set_rcvbuffer() skips buffer size update if it is too small
Pablo Neira Ayuso
maintainerPATCH v3 2/7 mnl: mnl_set_rcvbuffer() skips buffer size update if it is too small
Check for existing buffer size, if this is larger than the newer buffer size, skip this size update.
---
v3: 'len' variable was not properly set.
src/mnl.c | 7 +++++++ 1 file changed, 7 insertions(+)
src/mnl.c +7 -0
@@ -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) { +unsigned int cur_bufsiz; +socklen_t len =sizeof (cur_bufsiz);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 ) {
Signature · 1 line
2.11.0
Phil Sutter
reviewerHi Pablo,
Quoted 17 lines · Pablo Neira Ayuso
Check for existing buffer size, if this is larger than the newer buffer size, skip this size update.
Signed-off-by Pablo Neira Ayuso <[email protected]>---
v3: 'len' variable was not properly set.src/mnl.c | 7 +++++++ 1 file changed, 7 insertions(+)src/mnl.c +0
-0@@ -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)
src/mnl.c static void mnl_set_sndbuffer(const struct mnl_socket *nl, · line 246
Quoted 10 lines
src/mnl.c +7
-0{ +unsigned int cur_bufsiz; +socklen_t len =sizeof (cur_bufsiz);int ret; + ret =getsockopt (mnl_socket_get_fd (nl),SOL_SOCKET ,SO_RCVBUF , + &cur_bufsiz, &len); +if (cur_bufsiz > bufsiz) +return 0 ; +
For mnl_set_sndbuffer(), there is simply a global static variable holding the last set value. Can't we use that here as well? I think of something like:
+ static unsigned int nlsndbufsiz;
static int mnl_set_rcvbuffer(const struct mnl_socket *nl, size_t bufsiz) {
+ socklen_t len = sizeof(nlsndbufsiz);
int ret;
+ if (!nlsndbufsiz)
+ ret = getsockopt(mnl_socket_get_fd(nl), SOL_SOCKET, SO_RCVBUF,
+ &nlsndbufsiz, &len);
+ if (nlsndbufsiz >= bufsiz)
+ return 0;
Cheers, Phil
Pablo Neira Ayuso
maintainerQuoted 39 lines · Phil Sutter
Hi Pablo,
Quoted 17 lines · Pablo Neira Ayuso
Check for existing buffer size, if this is larger than the newer buffer size, skip this size update.
Signed-off-by Pablo Neira Ayuso <[email protected]>---
v3: 'len' variable was not properly set.src/mnl.c | 7 +++++++ 1 file changed, 7 insertions(+)src/mnl.c +0
-0@@ -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)src/mnl.c static void mnl_set_sndbuffer(const struct mnl_socket *nl, · line 246
Quoted 10 lines
src/mnl.c +7
-0{ +unsigned int cur_bufsiz; +socklen_t len =sizeof (cur_bufsiz);int ret; + ret =getsockopt (mnl_socket_get_fd (nl),SOL_SOCKET ,SO_RCVBUF , + &cur_bufsiz, &len); +if (cur_bufsiz > bufsiz) +return 0 ; +For
mnl_set_sndbuffer(), there is simply a global static variable holding the last set value. Can't we use that here as well? I think of something like:+ static unsigned int nlsndbufsiz;
static int
mnl_set_rcvbuffer(const struct mnl_socket *nl, size_t bufsiz){
src/mnl.c static void mnl_set_sndbuffer(const struct mnl_socket *nl, · line 245
Quoted 8 lines
src/mnl.c +6
-0+socklen_t len =sizeof (nlsndbufsiz);int ret; +if (!nlsndbufsiz) + ret =getsockopt (mnl_socket_get_fd (nl),SOL_SOCKET ,SO_RCVBUF , + &nlsndbufsiz, &len); +if (nlsndbufsiz >= bufsiz) +return 0 ;
Yes, I'm going to send a v4 including this change you propose.
Thanks!