cron2 has submitted this change. (
http://gerrit.openvpn.net/c/openvpn/+/1486?usp=email )
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 <[email protected]>
Github: Fixes OpenVPN/openvpn#965
Change-Id: I87679949bdef6319d7490d561f0136633244c2b9
Signed-off-by: Frank Lichtenheld <[email protected]>
Acked-by: Gert Doering <[email protected]>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1486
Message-Id: <[email protected]>
URL:
https://www.mail-archive.com/[email protected]/msg35435.html
Signed-off-by: Gert Doering <[email protected]>
---
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 = sizeof(val);
- len = sizeof(val);
if (getsockopt(sd, SOL_SOCKET, SO_SNDBUF, (void *)&val, &len) == 0 && len
== 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)) !=
0)
{
msg(M_WARN, "NOTE: setsockopt SO_SNDBUF=%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 = sizeof(val);
- len = sizeof(val);
if (getsockopt(sd, SOL_SOCKET, SO_RCVBUF, (void *)&val, &len) == 0 && len
== 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)) !=
0)
{
msg(M_WARN, "NOTE: setsockopt SO_RCVBUF=%d failed", size);
- return false;
}
- return true;
-#endif
}
void
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1486?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I87679949bdef6319d7490d561f0136633244c2b9
Gerrit-Change-Number: 1486
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <[email protected]>
Gerrit-Reviewer: cron2 <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
