From patchwork Fri Jun 26 00:10:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 1178 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 eDPLM/LJ9V6GcAAAIUCqbw for ; Fri, 26 Jun 2020 06:12:02 -0400 Received: from proxy8.mail.iad3b.rsapps.net ([172.31.255.6]) by director9.mail.ord1d.rsapps.net with LMTP id gMi9MPLJ9V6xOwAAalYnBA ; Fri, 26 Jun 2020 06:12:02 -0400 Received: from smtp12.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy8.mail.iad3b.rsapps.net with LMTP id mAIxKvLJ9V7HdQAAoCsc3g ; Fri, 26 Jun 2020 06:12:02 -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: smtp12.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; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 7a2b52b0-b795-11ea-871c-525400ae1f9d-1-1 Received: from [216.105.38.7] ([216.105.38.7:54218] helo=lists.sourceforge.net) by smtp12.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 7E/13-05599-2F9C5FE5; Fri, 26 Jun 2020 06:12:02 -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 1jolKE-0001q3-5o; Fri, 26 Jun 2020 10:11:14 +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 1jolKC-0001pc-1k for openvpn-devel@lists.sourceforge.net; Fri, 26 Jun 2020 10:11:12 +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:Cc: To:From:Sender:Reply-To: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=Ik/YRIbhTc9r0IzX2WwI7MfnvBXS9505IS/WW/Y6w4Y=; b=bZTsqqPOIyhnNY4ep87RfeUU8N onK9XqG82p/fMpR/CX/prx1KwGOH2/dOIh0p4vekXCxVRyexbRCbJfwXniEUbEwvFpmPxME1pUPbE RdtuyJNhwUpGigp8AfN+aZ6D7u40W9NfB2F4wXhxNZOXVAIpXNSVeknbAOiUhWkS6eh8=; 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:Cc:To:From:Sender:Reply-To :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=Ik/YRIbhTc9r0IzX2WwI7MfnvBXS9505IS/WW/Y6w4Y=; b=HhM5Z1a8vt4GWF6mIPT0zn5eua hKH7n4wgIFDfu/exvVJGnAPWGm/IEvIoZeAkr2eTBLJYFV3UZVBOlvjtF+4mmskhFHLS/ycp1+ZGD GDUhsLC2EpHSwx6WZUJQ07+0tQRnZQuKs61a5uaTNpfy/CRTjXzT1qhFDnuQtUSB5vFQ=; Received: from mail-wm1-f68.google.com ([209.85.128.68]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1jolKA-00GIWl-GF for openvpn-devel@lists.sourceforge.net; Fri, 26 Jun 2020 10:11:11 +0000 Received: by mail-wm1-f68.google.com with SMTP id 22so8302084wmg.1 for ; Fri, 26 Jun 2020 03:11:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ik/YRIbhTc9r0IzX2WwI7MfnvBXS9505IS/WW/Y6w4Y=; b=g1QUXIlc7qw4JadlnWQa2uWUePJYoWK0q+KMknpZieE5F22ozCZWOa5rLzFpnE7xP0 zM6Jw6f2CVQ1UzLetnNsXr6fl1c68AuqELxReKyJYbVTF+icAS9e0a9BbYPMb3Gp+9aj +IPAZfMQd4aAp+5hrL2uzaMWzyg/eAsEsJ4SAHoLGgxWoaOx0bUjLe/EFd+v2/7W0wYc 7593MOwYtgPdUhTeH4hUxGkUSw2v6KsF6AiaJgrHAVK6dpUoAFiPKuEFTX2qWIIntajx wK2Ru42CBao2+47jAzMvB6gnHgSURArcA7a3czVfg7iKww4RSzWTLC42xz7EYmBGig+I /qeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ik/YRIbhTc9r0IzX2WwI7MfnvBXS9505IS/WW/Y6w4Y=; b=ED5khX8sYZi9MOdHIA2lLFGiwi2lofE5Ph00Nr5xdB2/p9tOxx8cuYh7tEs4OgDFBF hhYloI3eztHNR6e9c0Tf730EuD9BbsK7D5xqt5/ewrJBSm7YRHPdphuvv2Z1f9at4OiB 623RdeC8eLQEVUJcENMt2w838s3Yz6doJXxEmoK2VFBazotoAdToQnOrOioYDaHFxGXs myV6C4ud9U0tJCVRGtnRa7SRiMXFY6TSOFv0iWKmb2TldLb9Oxbnh3A6vh4NWzsZ7JhE nCacOmyUPNDqBdnGfZmsNyst0GWTil+7EDNSs92HfOmVOK4FlZoXLt7oeY6w9FUyRVo5 xUZw== X-Gm-Message-State: AOAM533EANg94zzQBn/EsJBv93tPQrVuVmkwaJbHh1XD8QoLCjH3ODiG O/tFqORqEGwRssApx1cXjTswHjGk X-Google-Smtp-Source: ABdhPJwPZEvriDTwAoovoHH51PJsoLoAQzV/Y2U4uM6P6dEMPrY5upJhQeVbTJNam2rlzJHRGFXu4A== X-Received: by 2002:a7b:c348:: with SMTP id l8mr2818671wmj.54.1593166263539; Fri, 26 Jun 2020 03:11:03 -0700 (PDT) Received: from LAPTOP-4L3N7KFS.localdomain (nat2.panoulu.net. [185.38.2.2]) by smtp.gmail.com with ESMTPSA id g14sm2931880wrm.93.2020.06.26.03.11.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 03:11:01 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Fri, 26 Jun 2020 13:10:50 +0300 Message-Id: <20200626101050.442-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200626095432.GB1431@greenie.muc.de> References: <20200626095432.GB1431@greenie.muc.de> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lstipakov[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.68 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.68 listed in wl.mailspike.net] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Headers-End: 1jolKA-00GIWl-GF Subject: [Openvpn-devel] [PATCH v4] msvc: fix various level2 warnings 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: , Cc: Lev Stipakov MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov Also set warnings level to level2 and enable "treat warnings as errors" flag. Signed-off-by: Lev Stipakov Acked-by: Gert Doering --- v4: - cast setsockopt() parameter to (void *) to make Windows happy _and_ not to make code look confusing on other platforms v3: - use proper format specifier for unsigned long long - add comment about cast for qsort() - remove unused parameter in delete_route_connected_v6_net() v2: - rebase on top of master src/compat/Debug.props | 1 - src/openvpn/block_dns.c | 3 --- src/openvpn/crypto_openssl.c | 3 ++- src/openvpn/init.c | 2 +- src/openvpn/mtu.c | 8 ++++---- src/openvpn/openvpn.vcxproj | 26 +++++++++++++++++--------- src/openvpn/options.c | 2 +- src/openvpn/route.c | 2 +- src/openvpn/ssl_openssl.c | 2 +- src/openvpn/tun.c | 12 ++++++------ 10 files changed, 33 insertions(+), 28 deletions(-) diff --git a/src/compat/Debug.props b/src/compat/Debug.props index e5e9f681..31bb9d91 100644 --- a/src/compat/Debug.props +++ b/src/compat/Debug.props @@ -15,7 +15,6 @@ _DEBUG;%(PreprocessorDefinitions) MultiThreadedDebugDLL EditAndContinue - true diff --git a/src/openvpn/block_dns.c b/src/openvpn/block_dns.c index 889d6bb9..f4718fc2 100644 --- a/src/openvpn/block_dns.c +++ b/src/openvpn/block_dns.c @@ -109,9 +109,6 @@ DEFINE_GUID( static WCHAR *FIREWALL_NAME = L"OpenVPN"; -VOID NETIOAPI_API_ -InitializeIpInterfaceEntry(PMIB_IPINTERFACE_ROW Row); - /* * Default msg handler does nothing */ diff --git a/src/openvpn/crypto_openssl.c b/src/openvpn/crypto_openssl.c index 2027d8dc..521cfca1 100644 --- a/src/openvpn/crypto_openssl.c +++ b/src/openvpn/crypto_openssl.c @@ -315,7 +315,8 @@ show_available_ciphers(void) } } - qsort(cipher_list, num_ciphers, sizeof(*cipher_list), cipher_name_cmp); + /* cast to non-const to prevent warning */ + qsort((EVP_CIPHER *)cipher_list, num_ciphers, sizeof(*cipher_list), cipher_name_cmp); for (i = 0; i < num_ciphers; i++) { diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 2c8db68d..2af25c1a 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -1812,7 +1812,7 @@ do_open_tun(struct context *c) #ifdef _WIN32 /* store (hide) interactive service handle in tuntap_options */ c->c1.tuntap->options.msg_channel = c->options.msg_channel; - msg(D_ROUTE, "interactive service msg_channel=%u", (unsigned int) c->options.msg_channel); + msg(D_ROUTE, "interactive service msg_channel=%" PRIu64, (unsigned long long) c->options.msg_channel); #endif /* allocate route list structure */ diff --git a/src/openvpn/mtu.c b/src/openvpn/mtu.c index 04868cd6..3ddeac76 100644 --- a/src/openvpn/mtu.c +++ b/src/openvpn/mtu.c @@ -174,8 +174,8 @@ set_mtu_discover_type(int sd, int mtu_type, sa_family_t proto_af) { #if defined(HAVE_SETSOCKOPT) && defined(IP_MTU_DISCOVER) case AF_INET: - if (setsockopt - (sd, IPPROTO_IP, IP_MTU_DISCOVER, &mtu_type, sizeof(mtu_type))) + if (setsockopt(sd, IPPROTO_IP, IP_MTU_DISCOVER, + (void *) &mtu_type, sizeof(mtu_type))) { msg(M_ERR, "Error setting IP_MTU_DISCOVER type=%d on TCP/UDP socket", mtu_type); @@ -185,8 +185,8 @@ set_mtu_discover_type(int sd, int mtu_type, sa_family_t proto_af) #endif #if defined(HAVE_SETSOCKOPT) && defined(IPV6_MTU_DISCOVER) case AF_INET6: - if (setsockopt - (sd, IPPROTO_IPV6, IPV6_MTU_DISCOVER, &mtu_type, sizeof(mtu_type))) + if (setsockopt(sd, IPPROTO_IPV6, IPV6_MTU_DISCOVER, + (void *) &mtu_type, sizeof(mtu_type))) { msg(M_ERR, "Error setting IPV6_MTU_DISCOVER type=%d on TCP6/UDP6 socket", mtu_type); diff --git a/src/openvpn/openvpn.vcxproj b/src/openvpn/openvpn.vcxproj index 53ac5482..c34733ea 100644 --- a/src/openvpn/openvpn.vcxproj +++ b/src/openvpn/openvpn.vcxproj @@ -28,23 +28,23 @@ Application true - Unicode + NotSet v142 Application true - Unicode + NotSet v142 Application - Unicode + NotSet v142 Application - Unicode + NotSet v142 @@ -74,7 +74,9 @@ ..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories) _CONSOLE;%(PreprocessorDefinitions) - UNICODE;%(UndefinePreprocessorDefinitions) + %(UndefinePreprocessorDefinitions) + Level2 + true @@ -87,7 +89,9 @@ ..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories) _CONSOLE;%(PreprocessorDefinitions) - UNICODE;%(UndefinePreprocessorDefinitions) + %(UndefinePreprocessorDefinitions) + Level2 + true @@ -100,7 +104,9 @@ ..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories) _CONSOLE;%(PreprocessorDefinitions) - UNICODE;%(UndefinePreprocessorDefinitions) + %(UndefinePreprocessorDefinitions) + Level2 + true @@ -113,7 +119,9 @@ ..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories) _CONSOLE;%(PreprocessorDefinitions) - UNICODE;%(UndefinePreprocessorDefinitions) + %(UndefinePreprocessorDefinitions) + Level2 + true @@ -307,4 +315,4 @@ - + \ No newline at end of file diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 16f9da6a..3484f7d4 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -7276,7 +7276,7 @@ add_option(struct options *options, #ifdef _WIN32 VERIFY_PERMISSION(OPT_P_GENERAL); HANDLE process = GetCurrentProcess(); - HANDLE handle = (HANDLE) atoi(p[1]); + HANDLE handle = (HANDLE) atoll(p[1]); if (!DuplicateHandle(process, handle, process, &options->msg_channel, 0, FALSE, DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS)) { diff --git a/src/openvpn/route.c b/src/openvpn/route.c index 9ff36359..b57da5dd 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -2833,7 +2833,7 @@ get_default_gateway_ipv6(struct route_ipv6_gateway_info *rgi6, DestinationAddress.Ipv6.sin6_addr = *dest; } - status = GetBestInterfaceEx( &DestinationAddress, &BestIfIndex ); + status = GetBestInterfaceEx( (struct sockaddr *)&DestinationAddress, &BestIfIndex ); if (status != NO_ERROR) { diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index a489053b..07d422c9 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -2115,7 +2115,7 @@ print_details(struct key_state_ssl *ks_ssl, const char *prefix) void show_available_tls_ciphers_list(const char *cipher_list, const char *tls_cert_profile, - const bool tls13) + bool tls13) { struct tls_root_ctx tls_ctx; diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 0e6dfe72..18cdf38d 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -233,10 +233,11 @@ do_set_mtu_service(const struct tuntap *tt, const short family, const int mtu) sizeof(set_mtu_message_t), 0 }, - .iface = {.index = tt->adapter_index,.name = tt->actual_name }, + .iface = {.index = tt->adapter_index}, .mtu = mtu, .family = family }; + strncpynt(mtu_msg.iface.name, tt->actual_name, sizeof(mtu_msg.iface.name)); if (!send_msg_iservice(pipe, &mtu_msg, sizeof(mtu_msg), &ack, "Set_mtu")) { @@ -889,8 +890,7 @@ add_route_connected_v6_net(struct tuntap *tt, } void -delete_route_connected_v6_net(struct tuntap *tt, - const struct env_set *es) +delete_route_connected_v6_net(const struct tuntap *tt) { struct route_ipv6 r6; @@ -901,7 +901,7 @@ delete_route_connected_v6_net(struct tuntap *tt, r6.metric = 0; /* connected route */ r6.flags = RT_DEFINED | RT_ADDED | RT_METRIC_DEFINED; route_ipv6_clear_host_bits(&r6); - delete_route_ipv6(&r6, tt, 0, es, NULL); + delete_route_ipv6(&r6, tt, 0, NULL, NULL); } #endif /* if defined(_WIN32) || defined(TARGET_DARWIN) || defined(TARGET_NETBSD) || defined(TARGET_OPENBSD) */ @@ -6572,7 +6572,7 @@ netsh_delete_address_dns(const struct tuntap *tt, bool ipv6, struct gc_arena *gc if (ipv6) { - delete_route_connected_v6_net(tt, NULL); + delete_route_connected_v6_net(tt); } /* "store=active" is needed in Windows 8(.1) to delete the @@ -6619,7 +6619,7 @@ close_tun(struct tuntap *tt, openvpn_net_ctx_t *ctx) { do_dns_service(false, AF_INET6, tt); } - delete_route_connected_v6_net(tt, NULL); + delete_route_connected_v6_net(tt); do_address_service(false, AF_INET6, tt); } else