From patchwork Mon May 3 00:58:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1790 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 +Hm4L6TXj2DhcQAAIUCqbw (envelope-from ) for ; Mon, 03 May 2021 06:59:48 -0400 Received: from proxy12.mail.ord1d.rsapps.net ([172.30.191.6]) by director13.mail.ord1d.rsapps.net with LMTP id GDqmL6TXj2BsWAAA91zNiA (envelope-from ) for ; Mon, 03 May 2021 06:59:48 -0400 Received: from smtp16.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy12.mail.ord1d.rsapps.net with LMTPS id 2JEqL6TXj2BmNQAA7PHxkg (envelope-from ) for ; Mon, 03 May 2021 06:59:48 -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: smtp16.gate.ord1d.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: ad0645d8-abfe-11eb-a0aa-525400ca3ad5-1-1 Received: from [216.105.38.7] ([216.105.38.7:52246] helo=lists.sourceforge.net) by smtp16.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id CD/74-15867-4A7DF806; Mon, 03 May 2021 06:59:48 -0400 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.92.3) (envelope-from ) id 1ldWI2-0005Qn-4q; Mon, 03 May 2021 10:59:02 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) (envelope-from ) id 1ldWI1-0005QS-9n for openvpn-devel@lists.sourceforge.net; Mon, 03 May 2021 10:59:01 +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=ukU3zIhhuHLOQRb8N2QYm81Fb1FhpN8txVeBolv5WSY=; b=OvszNP+z4grlWeh5p8RmTPFjck bldNYj72moKsl9/XZ/ZmlKHAWxYBBieRWmXmeYdcTPUgTz+h5sLzrT+1TmkKXopkXJV1Tecu0XaL8 /Y4BEQeI8XCaiPkKmhiOtanYDlMrixclMZBPsmakpHpT8wlHKncegQMLU9OFBr7YRdhs=; 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=ukU3zIhhuHLOQRb8N2QYm81Fb1FhpN8txVeBolv5WSY=; b=O3Kq2Ho3CISixwGwzeeq9MIRK6 Cp4QmJvNWQN+zr0M90E4Y7KmQSKigdkFUEePB3pt8OMUcnSDBNoGAGmQ5NFrHtsMsGsZ9IHq2g6cp HssCnEsWHXs2kySDt14PbjeK9PwKIJctNgn9SayEeXvIVFKUBjXIHmVgc5X0nJo3gJZ8=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1ldWHx-0005JH-1V for openvpn-devel@lists.sourceforge.net; Mon, 03 May 2021 10:59:01 +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 1ldWHp-00026h-Q4 for openvpn-devel@lists.sourceforge.net; Mon, 03 May 2021 12:58:49 +0200 Received: (nullmailer pid 3903780 invoked by uid 10006); Mon, 03 May 2021 10:58:50 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Mon, 3 May 2021 12:58:50 +0200 Message-Id: <20210503105850.3903732-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210503061454.GT976@greenie.muc.de> References: <20210503061454.GT976@greenie.muc.de> MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 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: 1ldWHx-0005JH-1V Subject: [Openvpn-devel] [PATCH v3] 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. Patch V3: remove another instance in socket.c that I misseds in v1 Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- src/openvpn/socket.c | 13 ------------- src/openvpn/syshead.h | 7 ------- 2 files changed, 20 deletions(-) diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index 23b12560b..407e411c0 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -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) diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h index 321e20f5b..a9680f72f 100644 --- a/src/openvpn/syshead.h +++ b/src/openvpn/syshead.h @@ -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 */