From: "flichtenheld (Code Review)" Date: Mon, 26 Jan 2026 14:05:44 +0000 In-Reply-To: References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="zBbs1EoKsqk="; 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 --zBbs1EoKsqk= 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 reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1486?usp=3Demail to look at the new patch set (#2). 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 #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/2 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: newpatchset Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I87679949bdef6319d7490d561f0136633244c2b9 Gerrit-Change-Number: 1486 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos --zBbs1EoKsqk= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is cur= rently required from: plaisthos.

flichtenheld uploaded patch set #2 to this change.

<= p>View C= hange

socket: Remove ifdef for SO_{RCV,SND}BUF

= Seems all our platforms define it.

Reported-by: Marc Heuse <marc@= ...2953...>
Github: Fixes #965
Change-Id: I87679949bdef6319d7490d5= 61f0136633244c2b9
Signed-off-by: Frank Lichtenheld <frank@...2641...&= gt;
---
M src/openvpn/socket.c
1 file changed, 3 insertions(+), 15= deletions(-)

git pull ssh://gerrit.openvpn.net:=
29418/openvpn refs/changes/86/1486/2
diff --git a/src/openvpn/socke=
t.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<= /span>
socket_get_sndbuf(socket_descriptor_t sd)
= {
-#if defined(SOL_SOC= KET) && 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 sizeo= f(val))
{
return val;<= br> }
-#endif=
return 0;
}
=
static void
socket_set_sndbuf(socket_descriptor= _t sd, int size)
{
-#if defined(SOL_SOCKET) && defined(SO_SNDBUF)<= br> 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
<= span> socket_get_rcvbuf(socket_descriptor_t sd)

{-#if defined(SOL_SOCKET) &&= amp; defined(SO_RCVBUF)
int val;
- socklen_t len;
+ socklen_t len =3D sizeof(val);
- len =3D s= izeof(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);

- retur= n false;
}
- return true;
-#endif
}

void

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

Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I87679949bdef6319d7490d561f0= 136633244c2b9
Gerrit-Change-Number: 1486
Gerrit-PatchSet: 2
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...>
= --zBbs1EoKsqk=--