From patchwork Thu Apr 22 05:29:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1771 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director13.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id gIbaLaSWgWCZHQAAIUCqbw (envelope-from ) for ; Thu, 22 Apr 2021 11:30:44 -0400 Received: from proxy16.mail.ord1d.rsapps.net ([172.30.191.6]) by director13.mail.ord1d.rsapps.net with LMTP id SFeXLaSWgWCMBgAA91zNiA (envelope-from ) for ; Thu, 22 Apr 2021 11:30:44 -0400 Received: from smtp35.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy16.mail.ord1d.rsapps.net with LMTPS id 4B8tLaSWgWDXFwAAetu3IA (envelope-from ) for ; Thu, 22 Apr 2021 11:30:44 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp35.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: b33b66ea-a37f-11eb-b434-5452002f485d-1-1 Received: from [216.105.38.7] ([216.105.38.7:58832] helo=lists.sourceforge.net) by smtp35.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id AF/7C-02203-3A691806; Thu, 22 Apr 2021 11:30:43 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1lZbH8-00086r-A7; Thu, 22 Apr 2021 15:29:54 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZbH5-00085z-KT for openvpn-devel@lists.sourceforge.net; Thu, 22 Apr 2021 15:29:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=xHpvpyN2cyIq0X8e3Ani6IVnhc/uDR/UBl9AGZwwzHI=; b=FVodsMaofQeOwkONqU4I0a2/Y6 cDRpDtIDr1X3s+eKEgmDmF59j2AmJUmET8AJt4aQDSHW3xjccOE4gErxBci1UG1KQ8HAj1Wb6c+Gy fC4UO/DmFho2WrTlAXfS9LNdJs+2M4SdMeUUYNDKr7+BBiLAZA0uSNQHB4/wr2MXw8M0=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=xHpvpyN2cyIq0X8e3Ani6IVnhc/uDR/UBl9AGZwwzHI=; b=OMVp0oJv8JCdoo4J7fZmm5AqJo R3DtQFhslBcDO8ZHrfMr69MNAxFqjHjVfgUFqymT2ezqP02yIgRveDDnLaonIvSCdmUpy7HvF+Q5Y 4moVgGaoFtNhWFgzNKpwJq47jsWYe5zWijKAplqkVZpeYwwrUUysVMdojmtIQy2580U4=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1lZbH1-00DH7D-6a for openvpn-devel@lists.sourceforge.net; Thu, 22 Apr 2021 15:29:51 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.94 (FreeBSD)) (envelope-from ) id 1lZbGt-000B9M-Ja for openvpn-devel@lists.sourceforge.net; Thu, 22 Apr 2021 17:29:39 +0200 Received: (nullmailer pid 2134102 invoked by uid 10006); Thu, 22 Apr 2021 15:29:40 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Thu, 22 Apr 2021 17:29:37 +0200 Message-Id: <20210422152939.2134046-4-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210422152939.2134046-1-arne@rfc2549.org> References: <20210422152939.2134046-1-arne@rfc2549.org> MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: rfc2549.org] 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Headers-End: 1lZbH1-00DH7D-6a Subject: [Openvpn-devel] [PATCH v2 4/6] Remove support for blocking connect() X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox 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. Signed-off-by: Arne Schwabe --- src/openvpn/socket.c | 8 -------- src/openvpn/syshead.h | 7 ------- 2 files changed, 15 deletions(-) diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index 8a6e42cc6..4e13c65e8 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -1459,7 +1459,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) @@ -1540,13 +1539,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; } diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h index f29c63c73..3f2e563b7 100644 --- a/src/openvpn/syshead.h +++ b/src/openvpn/syshead.h @@ -545,13 +545,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 */