@@ -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)
@@ -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
*/
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> --- src/openvpn/socket.c | 13 ------------- src/openvpn/syshead.h | 7 ------- 2 files changed, 20 deletions(-)