From: "flichtenheld (Code Review)" Date: Mon, 26 Jan 2026 13:56:31 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <0f33c096a81866a3a2a0b1a10519ab93d5e1a900-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="fK3aeysjojA="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: socket: Remove ifdef for SO_{RCV, SND}BUF List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos Cc: openvpn-devel --fK3aeysjojA= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/1486?usp=3Demail to review the following change. Change subject: socket: Remove ifdef for SO_{RCV,SND}BUF ...................................................................... socket: Remove ifdef for SO_{RCV,SND}BUF Seems all our platforms define it. Github: Fixes #965 Change-Id: I87679949bdef6319d7490d561f0136633244c2b9 Signed-off-by: Frank Lichtenheld --- M src/openvpn/socket.c 1 file changed, 3 insertions(+), 15 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/86/1486/1 diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index 331249d..58ccda9 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -419,57 +419,45 @@ static int socket_get_sndbuf(socket_descriptor_t sd) { -#if defined(SOL_SOCKET) && defined(SO_SNDBUF) int val; - socklen_t len; + socklen_t len =3D sizeof(val); - len =3D sizeof(val); if (getsockopt(sd, SOL_SOCKET, SO_SNDBUF, (void *)&val, &len) =3D=3D 0= && len =3D=3D sizeof(val)) { return val; } -#endif return 0; } static void socket_set_sndbuf(socket_descriptor_t sd, int size) { -#if defined(SOL_SOCKET) && defined(SO_SNDBUF) if (setsockopt(sd, SOL_SOCKET, SO_SNDBUF, (void *)&size, sizeof(size))= !=3D 0) { msg(M_WARN, "NOTE: setsockopt SO_SNDBUF=3D%d failed", size); } -#endif } static int socket_get_rcvbuf(socket_descriptor_t sd) { -#if defined(SOL_SOCKET) && defined(SO_RCVBUF) int val; - socklen_t len; + socklen_t len =3D sizeof(val); - len =3D sizeof(val); if (getsockopt(sd, SOL_SOCKET, SO_RCVBUF, (void *)&val, &len) =3D=3D 0= && len =3D=3D sizeof(val)) { return val; } -#endif return 0; } -static bool +static void socket_set_rcvbuf(socket_descriptor_t sd, int size) { -#if defined(SOL_SOCKET) && defined(SO_RCVBUF) if (setsockopt(sd, SOL_SOCKET, SO_RCVBUF, (void *)&size, sizeof(size))= !=3D 0) { msg(M_WARN, "NOTE: setsockopt SO_RCVBUF=3D%d failed", size); - return false; } - return true; -#endif } void -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1486?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings?usp=3Demail Gerrit-MessageType: newchange Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I87679949bdef6319d7490d561f0136633244c2b9 Gerrit-Change-Number: 1486 Gerrit-PatchSet: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos --fK3aeysjojA= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is cur= rently required from: plaisthos.

flichtenheld would like plaisthos to review this change.

V= iew Change

socket: Remove ifdef for SO_{RCV,SND}BUF
Seems all our platforms define it.

Github: Fixes #965
Change= -Id: I87679949bdef6319d7490d561f0136633244c2b9
Signed-off-by: Frank Lich= tenheld <frank@...2641...>
---
M src/openvpn/socket.c
1 file= changed, 3 insertions(+), 15 deletions(-)

git p=
ull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/86/1486/1
d= iff --git a/src/openvpn/socket.c b/src/openvpn/socket.c
ind= ex 331249d..58ccda9 100644
--- a/src/openvpn/socket.c
+++ b/src/openvpn/socket.c
@@ -419,57 +419,45 @@=
static int
socket_get_sndbuf(socket_desc= riptor_t sd)
{
-#if defined(SOL_SOCKET) && defined(SO_SNDBUF)
<= span> int val;

- = socklen_t len;
+ = socklen_t len =3D sizeof(val);

- len =3D sizeof(val);
if= (getsockopt(sd, SOL_SOCKET, SO_SNDBUF, (void *)&val, &len) =3D=3D = 0 && len =3D=3D sizeof(val))
{
return val;
}
-#endif
return 0;
}

static void
socket= _set_sndbuf(socket_descriptor_t sd, int size)
{
= -#if defined(SOL_SOCKET) &&am= p; defined(SO_SNDBUF)
if (setsockopt(sd, SOL_SOCKET, S= O_SNDBUF, (void *)&size, sizeof(size)) !=3D 0)
{
msg(M_WARN, "NOTE: setsockopt SO_SNDBUF=3D%d f= ailed", size);
}
-#endif
}

= static int
socket_get_rcvbuf(socket_descriptor_t sd= )
{
-#= if defined(SOL_SOCKET) && defined(SO_RCVBUF)
i= nt val;
- socklen_t = len;
+ socklen_t l= en =3D sizeof(val);

- len =3D sizeof(val);
if (getsockop= t(sd, SOL_SOCKET, SO_RCVBUF, (void *)&val, &len) =3D=3D 0 &&= ; len =3D=3D sizeof(val))
{
r= eturn val;
}
-#endif
return 0;
}=

-static boo= l
+static void=
socket_set_rcvbuf(socket_descriptor_t sd, int size)
{

-#if defined(SOL= _SOCKET) && defined(SO_RCVBUF)
if (setsockopt(= sd, SOL_SOCKET, SO_RCVBUF, (void *)&size, sizeof(size)) !=3D 0)<= br> {
msg(M_WARN, "NOTE: setsockopt= SO_RCVBUF=3D%d failed", size);
- return false;
}
- return true;
-#endif
}
=
void

To view, visit = change 1= 486. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I87679949bdef6319d7490d561f0= 136633244c2b9
Gerrit-Change-Number: 1486
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
= --fK3aeysjojA=--