From patchwork Wed Mar 24 11:23:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1657 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.27.255.53]) by backend30.mail.ord1d.rsapps.net with LMTP id QNxTISi8W2CYXQAAIUCqbw (envelope-from ) for ; Wed, 24 Mar 2021 18:24:40 -0400 Received: from proxy17.mail.iad3a.rsapps.net ([172.27.255.53]) by director8.mail.ord1d.rsapps.net with LMTP id gHUWISi8W2CqcAAAfY0hYg (envelope-from ) for ; Wed, 24 Mar 2021 18:24:40 -0400 Received: from smtp53.gate.iad3a ([172.27.255.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy17.mail.iad3a.rsapps.net with LMTPS id 2DbSGSi8W2CQPQAAR4KW9A (envelope-from ) for ; Wed, 24 Mar 2021 18:24:40 -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: smtp53.gate.iad3a.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: b8ffd4fe-8cef-11eb-9d19-5254009c3572-1-1 Received: from [216.105.38.7] ([216.105.38.7:55100] helo=lists.sourceforge.net) by smtp53.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id F2/FE-10486-72CBB506; Wed, 24 Mar 2021 18:24:40 -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 1lPBus-00008j-QP; Wed, 24 Mar 2021 22:23:54 +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 1lPBur-000086-66 for openvpn-devel@lists.sourceforge.net; Wed, 24 Mar 2021 22:23:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:To: From:Sender:Reply-To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: 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=26q0E6Pmya7WqrSAxk38kALYosTbfEu8B3c0bGxri/k=; b=eqQhh9HqqJdK0kZeYgndjRzxBI HUsuOPFZTnM9RA6loL8LfUlzgO6wYhrlAFDPd1BnhFL2woyhRHFzK1pMOg4fTEVbv7s20OyGKNg3S mcJoL8PCbbm8C3jshvvPaN4l/QthW9Y0xIWif+r/sCkTyOhGDGWKuErzo5R2xtmeVZcs=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc :MIME-Version:Content-Type:Content-Transfer-Encoding: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=26q0E6Pmya7WqrSAxk38kALYosTbfEu8B3c0bGxri/k=; b=CaaDnTmMZvj9xHhjYYPYUS26Zu +dFjnna376f8Xwjlw/j5JkbD6f9qOWj83O0B2vmopt4AvWYJcVsmfGQvwPXLPvBYqdmVykRSyc/ZO fKrPYGTHMWxZHo10i30zAAlR1koYTFlxJrF+BcMGjptRT6L+q8F7l7Mg8DDlAp4Tu65c=; 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 1lPBuc-007Cbb-8A for openvpn-devel@lists.sourceforge.net; Wed, 24 Mar 2021 22:23:52 +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 1lPBuV-000ExL-6j for openvpn-devel@lists.sourceforge.net; Wed, 24 Mar 2021 23:23:31 +0100 Received: (nullmailer pid 517 invoked by uid 10006); Wed, 24 Mar 2021 22:23:31 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Wed, 24 Mar 2021 23:23:29 +0100 Message-Id: <20210324222330.455-3-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210324222330.455-1-arne@rfc2549.org> References: <20210324222330.455-1-arne@rfc2549.org> 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: 1lPBuc-007Cbb-8A Subject: [Openvpn-devel] [PATCH 3/4] Fix socket related functions using int instead of socket_descriptor_t 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox On windows the SOCKET type is a UINT_PTR, which is a 64 bit pointer, so using an int worked so far but is actually quite wrong. Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- src/openvpn/fdmisc.c | 8 ++++---- src/openvpn/fdmisc.h | 10 +++++----- src/openvpn/mtu.c | 2 +- src/openvpn/mtu.h | 2 +- src/openvpn/socket.c | 16 ++++++++-------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/openvpn/fdmisc.c b/src/openvpn/fdmisc.c index 1cea505c..e0d198e5 100644 --- a/src/openvpn/fdmisc.c +++ b/src/openvpn/fdmisc.c @@ -36,7 +36,7 @@ /* Set a file descriptor to non-blocking */ bool -set_nonblock_action(int fd) +set_nonblock_action(socket_descriptor_t fd) { #ifdef _WIN32 u_long arg = 1; @@ -55,7 +55,7 @@ set_nonblock_action(int fd) /* Set a file descriptor to not be passed across execs */ bool -set_cloexec_action(int fd) +set_cloexec_action(socket_descriptor_t fd) { #ifndef _WIN32 if (fcntl(fd, F_SETFD, FD_CLOEXEC) < 0) @@ -68,7 +68,7 @@ set_cloexec_action(int fd) /* Set a file descriptor to non-blocking */ void -set_nonblock(int fd) +set_nonblock(socket_descriptor_t fd) { if (!set_nonblock_action(fd)) { @@ -78,7 +78,7 @@ set_nonblock(int fd) /* Set a file descriptor to not be passed across execs */ void -set_cloexec(int fd) +set_cloexec(socket_descriptor_t fd) { if (!set_cloexec_action(fd)) { diff --git a/src/openvpn/fdmisc.h b/src/openvpn/fdmisc.h index 0fb8b934..f4b67482 100644 --- a/src/openvpn/fdmisc.h +++ b/src/openvpn/fdmisc.h @@ -28,16 +28,16 @@ #include "error.h" #include "syshead.h" -bool set_nonblock_action(int fd); +bool set_nonblock_action(socket_descriptor_t fd); -bool set_cloexec_action(int fd); +bool set_cloexec_action(socket_descriptor_t fd); -void set_nonblock(int fd); +void set_nonblock(socket_descriptor_t fd); -void set_cloexec(int fd); +void set_cloexec(socket_descriptor_t fd); static inline void -openvpn_fd_set(int fd, fd_set *setp) +openvpn_fd_set(socket_descriptor_t fd, fd_set *setp) { #ifndef _WIN32 /* The Windows FD_SET() implementation does not overflow */ ASSERT(fd >= 0 && fd < FD_SETSIZE); diff --git a/src/openvpn/mtu.c b/src/openvpn/mtu.c index 3ddeac76..3317c884 100644 --- a/src/openvpn/mtu.c +++ b/src/openvpn/mtu.c @@ -166,7 +166,7 @@ frame_print(const struct frame *frame, #define MTUDISC_NOT_SUPPORTED_MSG "--mtu-disc is not supported on this OS" void -set_mtu_discover_type(int sd, int mtu_type, sa_family_t proto_af) +set_mtu_discover_type(socket_descriptor_t sd, int mtu_type, sa_family_t proto_af) { if (mtu_type >= 0) { diff --git a/src/openvpn/mtu.h b/src/openvpn/mtu.h index 549c319b..0c8bdf8b 100644 --- a/src/openvpn/mtu.h +++ b/src/openvpn/mtu.h @@ -209,7 +209,7 @@ void frame_print(const struct frame *frame, int level, const char *prefix); -void set_mtu_discover_type(int sd, int mtu_type, sa_family_t proto_af); +void set_mtu_discover_type(socket_descriptor_t sd, int mtu_type, sa_family_t proto_af); int translate_mtu_discover_type_name(const char *name); diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index ebe8c85c..0d9b793c 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -846,7 +846,7 @@ mac_addr_safe(const char *mac_addr) } static int -socket_get_sndbuf(int sd) +socket_get_sndbuf(socket_descriptor_t sd) { #if defined(HAVE_GETSOCKOPT) && defined(SOL_SOCKET) && defined(SO_SNDBUF) int val; @@ -863,7 +863,7 @@ socket_get_sndbuf(int sd) } static void -socket_set_sndbuf(int sd, int size) +socket_set_sndbuf(socket_descriptor_t sd, int size) { #if defined(HAVE_SETSOCKOPT) && defined(SOL_SOCKET) && defined(SO_SNDBUF) if (setsockopt(sd, SOL_SOCKET, SO_SNDBUF, (void *) &size, sizeof(size)) != 0) @@ -874,7 +874,7 @@ socket_set_sndbuf(int sd, int size) } static int -socket_get_rcvbuf(int sd) +socket_get_rcvbuf(socket_descriptor_t sd) { #if defined(HAVE_GETSOCKOPT) && defined(SOL_SOCKET) && defined(SO_RCVBUF) int val; @@ -891,7 +891,7 @@ socket_get_rcvbuf(int sd) } static bool -socket_set_rcvbuf(int sd, int size) +socket_set_rcvbuf(socket_descriptor_t sd, int size) { #if defined(HAVE_SETSOCKOPT) && defined(SOL_SOCKET) && defined(SO_RCVBUF) if (setsockopt(sd, SOL_SOCKET, SO_RCVBUF, (void *) &size, sizeof(size)) != 0) @@ -904,7 +904,7 @@ socket_set_rcvbuf(int sd, int size) } static void -socket_set_buffers(int fd, const struct socket_buffer_size *sbs) +socket_set_buffers(socket_descriptor_t fd, const struct socket_buffer_size *sbs) { if (sbs) { @@ -934,7 +934,7 @@ socket_set_buffers(int fd, const struct socket_buffer_size *sbs) */ static bool -socket_set_tcp_nodelay(int sd, int state) +socket_set_tcp_nodelay(socket_descriptor_t sd, int state) { #if defined(_WIN32) || (defined(HAVE_SETSOCKOPT) && defined(IPPROTO_TCP) && defined(TCP_NODELAY)) if (setsockopt(sd, IPPROTO_TCP, TCP_NODELAY, (void *) &state, sizeof(state)) != 0) @@ -954,7 +954,7 @@ socket_set_tcp_nodelay(int sd, int state) } static inline void -socket_set_mark(int sd, int mark) +socket_set_mark(socket_descriptor_t sd, int mark) { #if defined(TARGET_LINUX) && HAVE_DECL_SO_MARK if (mark && setsockopt(sd, SOL_SOCKET, SO_MARK, (void *) &mark, sizeof(mark)) != 0) @@ -965,7 +965,7 @@ socket_set_mark(int sd, int mark) } static bool -socket_set_flags(int sd, unsigned int sockflags) +socket_set_flags(socket_descriptor_t sd, unsigned int sockflags) { if (sockflags & SF_TCP_NODELAY) {