From patchwork Wed May 12 03:15:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1801 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id AImuNh/Vm2CldQAAIUCqbw (envelope-from ) for ; Wed, 12 May 2021 09:16:15 -0400 Received: from proxy5.mail.iad3b.rsapps.net ([172.31.255.6]) by director9.mail.ord1d.rsapps.net with LMTP id sKpzNh/Vm2BDZQAAalYnBA (envelope-from ) for ; Wed, 12 May 2021 09:16:15 -0400 Received: from smtp6.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy5.mail.iad3b.rsapps.net with LMTPS id EDaZLx/Vm2D9FwAA13hMnw (envelope-from ) for ; Wed, 12 May 2021 09:16:15 -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: smtp6.gate.iad3b.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: 3a3b19d4-b324-11eb-b180-5254000d607e-1-1 Received: from [216.105.38.7] ([216.105.38.7:56670] helo=lists.sourceforge.net) by smtp6.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id AE/53-32220-E15DB906; Wed, 12 May 2021 09:16:15 -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 1lgoi5-0006Xy-Ou; Wed, 12 May 2021 13:15:33 +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 1lgoi2-0006Wb-UZ for openvpn-devel@lists.sourceforge.net; Wed, 12 May 2021 13:15:30 +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=pDoQO0gEc8So5tGxE5Mo3BzidSmYx0SDqJCJrcBa2qY=; b=Z3BQkMq7JcmFUCLfVA53+wZOcu +UfzKESLljTPc18Cf1GHLD1Xw3QOcBLJ5YGETabrroaayVspj352NqOh2vkUZZMW4HNb/gIXBLPKU 6djBKyF9c1lnqSfmow8wWtz1c0rhFUj0uJfBbfIJZwsVjyaAbBVM7AO60JDqwE7m8Hcg=; 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=pDoQO0gEc8So5tGxE5Mo3BzidSmYx0SDqJCJrcBa2qY=; b=HZLdUbQrzRSVlsHotoBRp3Ln0g HGZ1WE0tS739dCb7nMzXOh2au64jHMByGGdqzZJJSA30cKHPtwy6oiy4XtbJT21NkGhd4hlLH18zZ CQHapnSOgLYbOVeIP69Hj9X/ZT3iFBOOapIvx3O+vYAbRzVSvOLIraFsWRWdNYEwx7rE=; 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 1lgoht-0008VC-Uk for openvpn-devel@lists.sourceforge.net; Wed, 12 May 2021 13:15:30 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.94.2 (FreeBSD)) (envelope-from ) id 1lgohj-000Bz3-5h for openvpn-devel@lists.sourceforge.net; Wed, 12 May 2021 15:15:11 +0200 Received: (nullmailer pid 1309968 invoked by uid 10006); Wed, 12 May 2021 13:15:11 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Wed, 12 May 2021 15:15:04 +0200 Message-Id: <20210512131511.1309914-3-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210512131511.1309914-1-arne@rfc2549.org> References: <20210512131511.1309914-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: 1lgoht-0008VC-Uk Subject: [Openvpn-devel] [PATCH 2/9] Remove getpeername, getpid check 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 getpeername is part of SUSv3 and Windows also provides the function as part of winsocks. getpid is also provided by both Posix and windows and we do not even use getpid on Windows since we rather call GetCurrentProcessId. Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- configure.ac | 4 ++-- src/openvpn/platform.c | 4 ---- src/openvpn/socket.c | 7 ------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index dce7982cc..cc1dedbb9 100644 --- a/configure.ac +++ b/configure.ac @@ -619,10 +619,10 @@ AC_CHECK_DECLS( AC_FUNC_FORK AC_CHECK_FUNCS([ \ - daemon chroot getpwnam setuid nice system getpid dup dup2 \ + daemon chroot getpwnam setuid nice system dup dup2 \ syslog openlog mlockall getrlimit getgrnam setgid \ setgroups flock readv writev time gettimeofday \ - setsid chdir getpeername \ + setsid chdir \ chsize ftruncate execve getpeereid basename dirname access \ epoll_create strsep \ ]) diff --git a/src/openvpn/platform.c b/src/openvpn/platform.c index bf7b1aa0a..831cc46b1 100644 --- a/src/openvpn/platform.c +++ b/src/openvpn/platform.c @@ -184,11 +184,7 @@ platform_getpid(void) #ifdef _WIN32 return (unsigned int) GetCurrentProcessId(); #else -#ifdef HAVE_GETPID return (unsigned int) getpid(); -#else - return 0; -#endif #endif } diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index 407e411c0..02a6a7db4 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -1227,7 +1227,6 @@ socket_do_accept(socket_descriptor_t sd, CLEAR(*act); -#ifdef HAVE_GETPEERNAME if (nowait) { new_sd = getpeername(sd, &act->dest.addr.sa, &remote_len); @@ -1241,12 +1240,6 @@ socket_do_accept(socket_descriptor_t sd, new_sd = sd; } } -#else /* ifdef HAVE_GETPEERNAME */ - if (nowait) - { - msg(M_WARN, "TCP: this OS does not provide the getpeername() function"); - } -#endif else { new_sd = accept(sd, &act->dest.addr.sa, &remote_len);