mirror/openvpn
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2024-09-20 12:02:28 +02:00
Code

Remove support for blocking connect()

Browse Source 
It is hard to imagine that we still have any supported OS that does
not support non-blocking connect while still supporting non-blocking
sockets in general.

Patch V2: remove epoll.h removal that should have been in other patch.
Patch V3: remove another instance in socket.c that I misseds in v1

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20210503105850.3903732-1-arne@rfc2549.org>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg22291.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Arne Schwabe 2021-05-03 12:58:50 +02:00 committed by Gert Doering
parent f17d529c66
commit 2ec5e1cae6
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/openvpn/socket.c
View File

@ -1451,7 +1451,6 @@ openvpn_connect(socket_descriptor_t sd,
protect_fd_nonlocal(sd, remote);
#endif
#ifdef CONNECT_NONBLOCK
set_nonblock(sd);
status = connect(sd, remote, af_addr_size(remote->sa_family));
if (status)
@ -1532,13 +1531,6 @@ openvpn_connect(socket_descriptor_t sd,
}
}
}
#else /* ifdef CONNECT_NONBLOCK */
status = connect(sd, remote, af_addr_size(remote->sa_family));
if (status)
{
status = openvpn_errno();
}
#endif /* ifdef CONNECT_NONBLOCK */
return status;
}
@ -1575,13 +1567,8 @@ socket_connect(socket_descriptor_t *sd,
struct gc_arena gc = gc_new();
int status;
#ifdef CONNECT_NONBLOCK
msg(M_INFO, "Attempting to establish TCP connection with %s [nonblock]",
print_sockaddr(dest, &gc));
#else
msg(M_INFO, "Attempting to establish TCP connection with %s",
print_sockaddr(dest, &gc));
#endif
#ifdef ENABLE_MANAGEMENT
if (management)

7
src/openvpn/syshead.h
View File

@ -535,13 +535,6 @@ socket_defined(const socket_descriptor_t sd)
#define EPOLL 0
#endif
/*
* Is non-blocking connect() supported?
*/
#if defined(SOL_SOCKET) && defined(SO_ERROR) && defined(EINPROGRESS) && defined(ETIMEDOUT)
#define CONNECT_NONBLOCK
#endif
/*
* Compression support
*/