From: "cron2 (Code Review)" Date: Mon, 26 Jan 2026 15:32:25 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <34425817bad5dd2ee7d1cf8378b02c56b8cb251f-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="xQO7RhWhhJI="; 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: flichtenheld Cc: plaisthos , openvpn-devel --xQO7RhWhhJI= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/14= 86?usp=3Demail ) Change subject: socket: Remove ifdef for SO_{RCV, SND}BUF ...................................................................... socket: Remove ifdef for SO_{RCV, SND}BUF Seems all our platforms define it. Reported-by: Marc Heuse Github: Fixes OpenVPN/openvpn#965 Change-Id: I87679949bdef6319d7490d561f0136633244c2b9 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1486 Message-Id: <20260126145432.31249-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg35= 435.html Signed-off-by: Gert Doering --- M src/openvpn/socket.c 1 file changed, 3 insertions(+), 15 deletions(-) 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: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I87679949bdef6319d7490d561f0136633244c2b9 Gerrit-Change-Number: 1486 Gerrit-PatchSet: 3 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel --xQO7RhWhhJI= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 sub= mitted this change.

View Change

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

Reported-by: Marc Heuse <marc= @...2953...>
Github: Fixes OpenVPN/openvpn#965
Change-Id: I8767994= 9bdef6319d7490d561f0136633244c2b9
Signed-off-by: Frank Lichtenheld <f= rank@...2641...>
Acked-by: Gert Doering <gert@...1296...>
Ge= rrit URL: https://gerrit.openvpn.net/c/openvpn/+/1486
Message-Id: <20= 260126145432.31249-1-gert@...1296...>
URL: https://www.mail-archive.c= om/openvpn-devel@lists.sourceforge.net/msg35435.html
Signed-off-by: Gert= Doering <gert@...1296...>
---
M src/openvpn/socket.c
1 file= changed, 3 insertions(+), 15 deletions(-)

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,4= 5 @@
static int
socket_get_sndbuf(socket_= descriptor_t sd)
{
-#if defined(SOL_SOCKET) && defined(SO_SNDBUF)<= br> 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_SNDB= UF=3D%d failed", size);
}
-#endif
}
=
static int
socket_get_rcvbuf(socket_desc= riptor_t sd)
{
-#if defined(SOL_SOCKET) && defined(SO_RCVBUF)
<= span> 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 v= iew, visit change 1486. To unsubscribe, or for help writing mail filters, visit= settings.

Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I87679949bdef6319d7490d561f0= 136633244c2b9
Gerrit-Change-Number: 1486
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
= --xQO7RhWhhJI=--