From: "cron2 (Code Review)"
Date: Mon, 26 Jan 2026 15:32:22 +0000
In-Reply-To:
References:
Reply-To: gert@...1296..., arne-openvpn@...1227...,
openvpn-devel@lists.sourceforge.net, frank@...2641...
Message-ID: <34425817bad5dd2ee7d1cf8378b02c56b8cb251f-EmailReplacePatchSet-HTML@...2715...>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="6jb96y2ZuIU="; 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 , plaisthos
Cc: openvpn-devel
--6jb96y2ZuIU=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
cron2 has uploaded a new patch set (#3) to the change originally created by=
flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1486?usp=3Demail )
The following approvals got outdated and were removed:
Code-Review+2 by cron2
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(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/86/1486/3
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: 3
Gerrit-Owner: flichtenheld
Gerrit-Reviewer: cron2
Gerrit-Reviewer: plaisthos
Gerrit-CC: openvpn-devel
--6jb96y2ZuIU=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
cron2 upl=
oaded patch set #3 to the change originally created by flichtenhel=
d.
View Change
The following approvals got outdated and were remove=
d:
Code-Review+2 by cron2
socket: Remove ifdef for SO_{RCV, S=
ND}BUF
Seems all our platforms define it.
Reported-by: Marc H=
euse <marc@...2953...>
Github: Fixes OpenVPN/openvpn#965
Change=
-Id: I87679949bdef6319d7490d561f0136633244c2b9
Signed-off-by: Frank Lich=
tenheld <frank@...2641...>
Acked-by: Gert Doering <gert@...1726...=
...>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1486
Messa=
ge-Id: <20260126145432.31249-1-gert@...1296...>
URL: https://www.m=
ail-archive.com/openvpn-devel@lists.sourceforge.net/msg35435.html
Signed=
-off-by: Gert Doering <gert@...1296...>
---
M src/openvpn/socke=
t.c
1 file changed, 3 insertions(+), 15 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/86/148=
6/3
diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c=
index 331249d..58ccda9 100644
--- a/src/openvpn/s=
ocket.c
+++ b/src/openvpn/socket.c
@@ -419,=
57 +419,45 @@
static int
socket_get_sndbu=
f(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;=
span>
}
static void
=
socket_set_sndbuf(socket_descriptor_t sd, int size)
=
{
-#if defined(SOL_SOC=
KET) && defined(SO_SNDBUF)
if (setsockopt(sd, =
SOL_SOCKET, SO_SNDBUF, (void *)&size, sizeof(size)) !=3D 0)
<=
span> {
msg(M_WARN, "NOTE: setsockopt SO_=
SNDBUF=3D%d failed", size);
}
-#endif
}
static int
socket_get_rcvbuf(socket_de=
scriptor_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))
{
<=
span> return val;
}
-#endif
return 0;
=
}
-static bool
+sta=
tic void
socket_set_rcvbuf(socket_descriptor_t sd, int siz=
e)
{
-=
#if defined(SOL_SOCKET) && defined(SO_RCVBUF)
=
if (setsockopt(sd, SOL_SOCKET, SO_RCVBUF, (void *)&size, sizeof(size)) =
!=3D 0)
{
msg(M_WARN, "N=
OTE: setsockopt SO_RCVBUF=3D%d failed", size);
- return false;
=
}
- return true;
-#endif
}=
void
<=
p>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: 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>
=
--6jb96y2ZuIU=--