msvc: fix various level2 warnings
PATCH 1/1 msvc: fix various level2 warnings
From: Lev Stipakov <[email protected]...>
This also sets warnings level to level2, which
makes them manageable.
--- src/compat/Debug.props | 1 - src/openvpn/block_dns.c | 3 --- src/openvpn/buffer.c | 2 +- src/openvpn/crypto_openssl.c | 2 +- src/openvpn/init.c | 2 +- src/openvpn/mtu.c | 4 ++-- src/openvpn/openvpn.vcxproj | 20 ++++++++++---------- src/openvpn/options.c | 2 +- src/openvpn/route.c | 2 +- src/openvpn/ssl_backend.h | 2 +- src/openvpn/tun.c | 4 ++-- 11 files changed, 20 insertions(+), 24 deletions(-)
src/compat/Debug.props +0 -1
@@ -15,7 +15,6 @@ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MinimalRebuild>true</MinimalRebuild> </ClCompile> </ItemDefinitionGroup> <ItemGroup />
src/openvpn/block_dns.c +0 -3
@@ -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 */
src/openvpn/buffer.c +1 -1
@@ -474,7 +474,7 @@ x_gc_freespecial(struct gc_arena *a) }void -gc_addspecial (void *addr,void (free_function )(void *),struct gc_arena *a) +gc_addspecial (void *addr,void (*free_function)(void *),struct gc_arena *a) {ASSERT (a);struct gc_entry_special *e;
src/openvpn/crypto_openssl.c +1 -1
@@ -313,7 +313,7 @@ show_available_ciphers(void) } } -qsort (cipher_list, num_ciphers,sizeof (*cipher_list), cipher_name_cmp); +qsort ((void *)cipher_list, num_ciphers,sizeof (*cipher_list), cipher_name_cmp);for (i =0 ; i < num_ciphers; i++) {
src/openvpn/init.c +1 -1
@@ -1778,7 +1778,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=%llu" , (unsigned long long ) c->options.msg_channel);#endif /* allocate route list structure */
src/openvpn/mtu.c +2 -2
@@ -175,7 +175,7 @@ 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))) + (sd,IPPROTO_IP ,IP_MTU_DISCOVER , (const char *)&mtu_type,sizeof (mtu_type))) {msg (M_ERR ,"Error setting IP_MTU_DISCOVER type=%d on TCP/UDP socket" , mtu_type);
@@ -186,7 +186,7 @@ set_mtu_discover_type(int sd, int mtu_type, sa_family_t proto_af)#if defined(HAVE_SETSOCKOPT ) && defined(IPV6_MTU_DISCOVER )case AF_INET6 :if (setsockopt - (sd,IPPROTO_IPV6 ,IPV6_MTU_DISCOVER , &mtu_type,sizeof (mtu_type))) + (sd,IPPROTO_IPV6 ,IPV6_MTU_DISCOVER , (const char *)&mtu_type,sizeof (mtu_type))) {msg (M_ERR ,"Error setting IPV6_MTU_DISCOVER type=%d on TCP6/UDP6 socket" , mtu_type);
src/openvpn/openvpn.vcxproj +10 -10
@@ -28,23 +28,19 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v142</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -74,7 +70,8 @@ <ClCompile> <AdditionalIncludeDirectories>..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <UndefinePreprocessorDefinitions>UNICODE;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <WarningLevel>Level2</WarningLevel> </ClCompile> <ResourceCompile /> <Link>
@@ -87,7 +84,8 @@ <ClCompile> <AdditionalIncludeDirectories>..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <UndefinePreprocessorDefinitions>UNICODE;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <WarningLevel>Level2</WarningLevel> </ClCompile> <ResourceCompile /> <Link>
@@ -100,7 +98,8 @@ <ClCompile> <AdditionalIncludeDirectories>..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <UndefinePreprocessorDefinitions>UNICODE;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <WarningLevel>Level2</WarningLevel> </ClCompile> <ResourceCompile /> <Link>
@@ -113,7 +112,8 @@ <ClCompile> <AdditionalIncludeDirectories>..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <UndefinePreprocessorDefinitions>UNICODE;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <WarningLevel>Level2</WarningLevel> </ClCompile> <ResourceCompile /> <Link>
@@ -303,4 +303,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
src/openvpn/options.c +1 -1
@@ -7172,7 +7172,7 @@ add_option(struct options *options,#ifdef _WIN32VERIFY_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 )) {
src/openvpn/route.c +1 -1
@@ -2825,7 +2825,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 ) {
src/openvpn/ssl_backend.h +1 -1
@@ -529,7 +529,7 @@ void 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, -bool tls13); +const bool tls13);/* * Show the available elliptic curves in the crypto library
src/openvpn/tun.c +2 -2
@@ -4613,7 +4613,7 @@ static DWORD get_adapter_index_method_1(const char *guid) {DWORD index; -ULONG aindex; +ULONG aindex =0 ;wchar_t wbuf[256 ];openvpn_swprintf (wbuf,SIZE (wbuf),L"\\DEVICE\\TCPIP_%S" , guid);if (GetAdapterIndex (wbuf, &aindex) !=NO_ERROR )
@@ -5868,7 +5868,7 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun/* get driver MTU */ if (!tt->wintun) { -ULONG mtu; +ULONG mtu =0 ;if (DeviceIoControl (tt->hand,TAP_WIN_IOCTL_GET_MTU , &mtu,sizeof (mtu), &mtu,sizeof (mtu), &len,NULL ))
Signature · 1 line
2.17.1
Hi,
Quoted 4 lines · Lev Stipakov
From: Lev Stipakov <[email protected]...>
This also sets warnings level to level2, which
makes them manageable.
Speaking about lingering patches... much has changed in the windows drivering and bulding world, and I'm not sure the patch is applicable to the "windows build" files. It also does not apply to tun.c anymore.
Can you rebase and resend (... or just resend those parts that are still needed...)?
Will do more timely review next round.
thanks,
gert
Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany [email protected]...PATCH v2 1/1 msvc: fix various level2 warnings
From: Lev Stipakov <[email protected]...>
Also set warnings level to level2 and
enable "treat warnings as errors" flag.
--- src/compat/Debug.props | 1 - src/openvpn/block_dns.c | 3 --- src/openvpn/crypto_openssl.c | 2 +- src/openvpn/init.c | 2 +- src/openvpn/mtu.c | 4 ++-- src/openvpn/openvpn.vcxproj | 26 +++++++++++++++++--------- src/openvpn/options.c | 2 +- src/openvpn/route.c | 2 +- src/openvpn/ssl_backend.h | 2 +- src/openvpn/tun.c | 5 +++-- 10 files changed, 27 insertions(+), 22 deletions(-)
src/compat/Debug.props +0 -1
@@ -15,7 +15,6 @@ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MinimalRebuild>true</MinimalRebuild> </ClCompile> </ItemDefinitionGroup> <ItemGroup />
src/openvpn/block_dns.c +0 -3
@@ -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 */
src/openvpn/crypto_openssl.c +1 -1
@@ -315,7 +315,7 @@ show_available_ciphers(void) } } -qsort (cipher_list, num_ciphers,sizeof (*cipher_list), cipher_name_cmp); +qsort ((void *)cipher_list, num_ciphers,sizeof (*cipher_list), cipher_name_cmp);for (i =0 ; i < num_ciphers; i++) {
src/openvpn/init.c +1 -1
@@ -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=%u" , (unsigned long long ) c->options.msg_channel);#endif /* allocate route list structure */
src/openvpn/mtu.c +2 -2
@@ -175,7 +175,7 @@ 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))) + (sd,IPPROTO_IP ,IP_MTU_DISCOVER , (const char *)&mtu_type,sizeof (mtu_type))) {msg (M_ERR ,"Error setting IP_MTU_DISCOVER type=%d on TCP/UDP socket" , mtu_type);
@@ -186,7 +186,7 @@ set_mtu_discover_type(int sd, int mtu_type, sa_family_t proto_af)#if defined(HAVE_SETSOCKOPT ) && defined(IPV6_MTU_DISCOVER )case AF_INET6 :if (setsockopt - (sd,IPPROTO_IPV6 ,IPV6_MTU_DISCOVER , &mtu_type,sizeof (mtu_type))) + (sd,IPPROTO_IPV6 ,IPV6_MTU_DISCOVER , (const char *)&mtu_type,sizeof (mtu_type))) {msg (M_ERR ,"Error setting IPV6_MTU_DISCOVER type=%d on TCP6/UDP6 socket" , mtu_type);
src/openvpn/openvpn.vcxproj +17 -9
@@ -28,23 +28,23 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> + <CharacterSet>NotSet</CharacterSet> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> + <CharacterSet>NotSet</CharacterSet> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> + <CharacterSet>NotSet</CharacterSet> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> + <CharacterSet>NotSet</CharacterSet> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -74,7 +74,9 @@ <ClCompile> <AdditionalIncludeDirectories>..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <UndefinePreprocessorDefinitions>UNICODE;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <WarningLevel>Level2</WarningLevel> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <ResourceCompile /> <Link>
@@ -87,7 +89,9 @@ <ClCompile> <AdditionalIncludeDirectories>..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <UndefinePreprocessorDefinitions>UNICODE;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <WarningLevel>Level2</WarningLevel> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <ResourceCompile /> <Link>
@@ -100,7 +104,9 @@ <ClCompile> <AdditionalIncludeDirectories>..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <UndefinePreprocessorDefinitions>UNICODE;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <WarningLevel>Level2</WarningLevel> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <ResourceCompile /> <Link>
@@ -113,7 +119,9 @@ <ClCompile> <AdditionalIncludeDirectories>..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <UndefinePreprocessorDefinitions>UNICODE;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <WarningLevel>Level2</WarningLevel> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <ResourceCompile /> <Link>
@@ -307,4 +315,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
src/openvpn/options.c +1 -1
@@ -7276,7 +7276,7 @@ add_option(struct options *options,#ifdef _WIN32VERIFY_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 )) {
src/openvpn/route.c +1 -1
@@ -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 ) {
src/openvpn/ssl_backend.h +1 -1
@@ -534,7 +534,7 @@ void 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, -bool tls13); +const bool tls13);/* * Show the available elliptic curves in the crypto library
src/openvpn/tun.c +3 -2
@@ -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,7 +890,7 @@ add_route_connected_v6_net(struct tuntap *tt, }void -delete_route_connected_v6_net (struct tuntap *tt, +delete_route_connected_v6_net (const struct tuntap *tt,const struct env_set *es) {struct route_ipv6 r6;
Signature · 1 line
2.17.1
Hi,
src/openvpn/crypto_openssl.c show_available_ciphers(void) · line 318
Quoted 6 lines · Lev Stipakov
src/openvpn/crypto_openssl.c +1
-1@@ -315,7 +315,7 @@ show_available_ciphers(void) } } -qsort (cipher_list, num_ciphers,sizeof (*cipher_list), cipher_name_cmp); +qsort ((void *)cipher_list, num_ciphers,sizeof (*cipher_list), cipher_name_cmp);
I find this one questionable. Qsort wants a void *, but every pointer type should be convertible to void *, without a warning?
(Adding casts for things that are explicitly always allowed and well-defined is something I do not like very much - it just makes "more code to read")
src/openvpn/init.c do_open_tun(struct context *c) · line 1815
Quoted 10 lines
src/openvpn/init.c +1
-1@@ -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=%u" , (unsigned long long ) c->options.msg_channel);
This gets a NAK. "%u" is "unsigned int", not (never!) (unsigned long long) - if you want that, because the data type is so big, use %llu or %I64u (Windows special, according to common.h).
src/openvpn/mtu.c set_mtu_discover_type(int sd, int mtu_type, sa_family_t proto_af) · line 178
Quoted 9 lines
index
04868cd6..8178ff06100644src/openvpn/mtu.c +1
-1@@ -175,7 +175,7 @@ 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))) + (sd,IPPROTO_IP ,IP_MTU_DISCOVER , (const char *)&mtu_type,sizeof (mtu_type)))
I find this questionable as well. Setsockopt() on Unix wants a "void *", not a "const char *" - and this cast suggest to the reader that we're dealing with "something character based", which it is not.
src/openvpn/mtu.c set_mtu_discover_type(int sd, int mtu_type, sa_family_t proto_af) · line 189
Quoted 5 lines
src/openvpn/mtu.c +1
-1#if defined(HAVE_SETSOCKOPT ) && defined(IPV6_MTU_DISCOVER )case AF_INET6 :if (setsockopt - (sd,IPPROTO_IPV6 ,IPV6_MTU_DISCOVER , &mtu_type,sizeof (mtu_type))) + (sd,IPPROTO_IPV6 ,IPV6_MTU_DISCOVER , (const char *)&mtu_type,sizeof (mtu_type)))
Same here.
src/openvpn/mtu.c
Quoted 4 lines
show_available_tls_ciphers_list(const char
*cipher_list,
const char*tls_cert_profile,src/openvpn/mtu.c +1
-1- bool tls13); + const bool tls13);
I'm not sure why this is needed or beneficial? This const stuff is good for pointers ("do not modify the pointed-to area") but for call-by-value arguments, the compiler can figure this out itself.
src/openvpn/tun.c do_set_mtu_service(const struct tuntap *tt, const short family, const int mtu) · line 236
Quoted 8 lines
src/openvpn/tun.c +1
-1@@ -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},
Sure of that? As in "are you sure the service does not need the name, never"?
src/openvpn/tun.c do_set_mtu_service(const struct tuntap *tt, const short family, const int mtu) · line 240
Quoted 4 lines
src/openvpn/tun.c +1
-0.mtu = mtu, .family = family }; +strncpynt (mtu_msg.iface.name, tt->actual_name,sizeof (mtu_msg.iface.name));
Well spotted. This is interesting, the assignment ".name = tt->actual_name" shouldn't be legal (as it's basically a hidden strcpy(), not a integral type or structure assignment), but mingw is not complaining and the resulting binary works. But this definitely is a necessary bugfix.
src/openvpn/tun.c add_route_connected_v6_net(struct tuntap *tt, · line 894
Quoted 9 lines
src/openvpn/tun.c +1
-1if (!send_msg_iservice (pipe, &mtu_msg,sizeof (mtu_msg), &ack,"Set_mtu" )) {@@ -889,7 +890,7 @@ add_route_connected_v6_net(struct tuntap *tt, }void -delete_route_connected_v6_net (struct tuntap *tt, +delete_route_connected_v6_net (const struct tuntap *tt,const struct env_set *es)
I might be convinced that this is a useful change, but if it's needed(!) for delete_route_connected_v6_net(), the "cost" should be added to add_route_connected_v6_net() as well.
gert
Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany [email protected]...Quoted 11 lines
src/openvpn/init.c do_open_tun(struct context *c) · line 1815
Quoted 7 lines
src/openvpn/init.c +1
-1@@ -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=%u" , (unsigned long long ) c->options.msg_channel);This gets a NAK. "%u" is "unsigned int", not (never!) (unsigned long long) - if you want that, because the data type is so big, use %llu or %I64u (Windows special, according to
common.h).
Or use the standardised ones. E.g. PRIu64 for uint64_t. We already use that auth-token.c.
See also https://en.cppreference.com/w/cpp/header/cinttypes (or another reference).
Quoted 23 lines
src/openvpn/mtu.c set_mtu_discover_type(int sd, int mtu_type, sa_family_t proto_af) · line 178
Quoted 10 lines
index
04868cd6..8178ff06100644src/openvpn/mtu.c +1
-1@@ -175,7 +175,7 @@ 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))) + (sd,IPPROTO_IP ,IP_MTU_DISCOVER , (const char *)&mtu_type,sizeof (mtu_type)))I find this questionable as well.
Setsockopt()on Unix wants a "void *", not a "const char *" - and this cast suggest to the reader that we're dealing with "something character based", which it is not.src/openvpn/mtu.c set_mtu_discover_type(int sd, int mtu_type, sa_family_t proto_af) · line 189
Quoted 5 lines
src/openvpn/mtu.c +1
-1#if defined(HAVE_SETSOCKOPT ) && defined(IPV6_MTU_DISCOVER )case AF_INET6 :if (setsockopt - (sd,IPPROTO_IPV6 ,IPV6_MTU_DISCOVER , &mtu_type,sizeof (mtu_type))) + (sd,IPPROTO_IPV6 ,IPV6_MTU_DISCOVER , (const char *)&mtu_type,sizeof (mtu_type)))Same here.
Quoted 8 lines
src/openvpn/mtu.c
Quoted 4 lines
show_available_tls_ciphers_list(const char
*cipher_list,
const char*tls_cert_profile,src/openvpn/mtu.c +1
-1- bool tls13); + const bool tls13);I'm not sure why this is needed or beneficial? This const stuff is good for pointers ("do not modify the pointed-to area") but for call-by-value arguments, the compiler can figure this out itself.
Clang tidy actually warns against this for integral types saying that they are passed by value always in C++. Not sure if this also applies to C.
Arne
Hi,
Quoted 5 lines
src/openvpn/crypto_openssl.c show_available_ciphers(void) · line 318
Quoted 2 lines
src/openvpn/crypto_openssl.c +1
-1-qsort (cipher_list, num_ciphers,sizeof (*cipher_list), cipher_name_cmp); +qsort ((void *)cipher_list, num_ciphers,sizeof (*cipher_list), cipher_name_cmp);I find this one questionable. Qsort wants a void *, but every pointer type should be convertible to void *, without a warning?
Yes, but this is about "const". VS shows "'function': different 'const' qualifiers".
I'll go with this one:
/* cast to non-const to prevent warning */
qsort((EVP_CIPHER *)cipher_list, num_ciphers,sizeof(*cipher_list), cipher_name_cmp);
Quoted 4 lines
src/openvpn/init.c do_open_tun(struct context *c) · line 1815
Quoted 2 lines
src/openvpn/init.c +1
-1-msg (D_ROUTE ,"interactive service msg_channel=%u" , (unsigned int ) c->options.msg_channel); +msg (D_ROUTE ,"interactive service msg_channel=%u" , (unsigned long long ) c->options.msg_channel);This gets a NAK. "%u" is "unsigned int", not (never!) (unsigned long long) -
Good point, thanks. The warning was about casting from HANDLE to unsigned int. I'll change
format specifier to "%llu".
Quoted 6 lines
src/openvpn/mtu.c set_mtu_discover_type(int sd, int mtu_type, sa_family_t proto_af) · line 178
Quoted 2 lines
src/openvpn/mtu.c +1
-1- (sd, IPPROTO_IP, IP_MTU_DISCOVER, &mtu_type, sizeof(mtu_type))) + (sd, IPPROTO_IP, IP_MTU_DISCOVER, (const char *)&mtu_type, sizeof(mtu_type)))I find this questionable as well.
Setsockopt()on Unix wants a "void *", not a "const char *" - and this cast suggest to the reader that we're dealing with "something character based", which it is not.
That's the case in Windows:
https://docs.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-setsockopt
Quoted 8 lines
int
setsockopt( SOCKET s, int level, int optname, const char *optval, int optlen );src/openvpn/ssl_backend.h void print_details(struct key_state_ssl *ks_ssl, const char *prefix); · line 537
Quoted 4 lines
show_available_tls_ciphers_list(const char
*cipher_list,
const char*tls_cert_profile,src/openvpn/ssl_backend.h +1
-1- bool tls13); + const bool tls13);I'm not sure why this is needed or beneficial?
Otherwise there is warning "formal parameter 3 different from declaration".
I noticed that mbedtls implementation doesn't have "const", so I'll just remove it from openssl implementation and won't change header.
Quoted 8 lines
src/openvpn/tun.c add_route_connected_v6_net(struct tuntap *tt, · line 894
Quoted 4 lines
void
src/openvpn/tun.c +1
-1-delete_route_connected_v6_net(struct tuntap *tt, +delete_route_connected_v6_net(const struct tuntap *tt, const struct env_set *es)I might be convinced that this is a useful change, but if it's needed(!) for
delete_route_connected_v6_net(), the "cost" should be added toadd_route_connected_v6_net()as well.
I looked closer and in fact second argument of delete_route_connected_v6_net() is always NULL, so I'll remove that parameter.
Signature · 1 line
-Lev
PATCH v3 1/1 msvc: fix various level2 warnings
From: Lev Stipakov <[email protected]...>
Also set warnings level to level2 and
enable "treat warnings as errors" flag.
---
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 | 4 ++-- 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, 31 insertions(+), 26 deletions(-)
src/compat/Debug.props +0 -1
@@ -15,7 +15,6 @@ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MinimalRebuild>true</MinimalRebuild> </ClCompile> </ItemDefinitionGroup> <ItemGroup />
src/openvpn/block_dns.c +0 -3
@@ -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 */
src/openvpn/crypto_openssl.c +2 -1
@@ -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++) {
src/openvpn/init.c +1 -1
@@ -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 */
src/openvpn/mtu.c +2 -2
@@ -175,7 +175,7 @@ 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))) + (sd,IPPROTO_IP ,IP_MTU_DISCOVER , (const char *)&mtu_type,sizeof (mtu_type))) {msg (M_ERR ,"Error setting IP_MTU_DISCOVER type=%d on TCP/UDP socket" , mtu_type);
@@ -186,7 +186,7 @@ set_mtu_discover_type(int sd, int mtu_type, sa_family_t proto_af)#if defined(HAVE_SETSOCKOPT ) && defined(IPV6_MTU_DISCOVER )case AF_INET6 :if (setsockopt - (sd,IPPROTO_IPV6 ,IPV6_MTU_DISCOVER , &mtu_type,sizeof (mtu_type))) + (sd,IPPROTO_IPV6 ,IPV6_MTU_DISCOVER , (const char *)&mtu_type,sizeof (mtu_type))) {msg (M_ERR ,"Error setting IPV6_MTU_DISCOVER type=%d on TCP6/UDP6 socket" , mtu_type);
src/openvpn/openvpn.vcxproj +17 -9
@@ -28,23 +28,23 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> + <CharacterSet>NotSet</CharacterSet> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> + <CharacterSet>NotSet</CharacterSet> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> + <CharacterSet>NotSet</CharacterSet> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> + <CharacterSet>NotSet</CharacterSet> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -74,7 +74,9 @@ <ClCompile> <AdditionalIncludeDirectories>..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <UndefinePreprocessorDefinitions>UNICODE;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <WarningLevel>Level2</WarningLevel> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <ResourceCompile /> <Link>
@@ -87,7 +89,9 @@ <ClCompile> <AdditionalIncludeDirectories>..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <UndefinePreprocessorDefinitions>UNICODE;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <WarningLevel>Level2</WarningLevel> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <ResourceCompile /> <Link>
@@ -100,7 +104,9 @@ <ClCompile> <AdditionalIncludeDirectories>..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <UndefinePreprocessorDefinitions>UNICODE;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <WarningLevel>Level2</WarningLevel> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <ResourceCompile /> <Link>
@@ -113,7 +119,9 @@ <ClCompile> <AdditionalIncludeDirectories>..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <UndefinePreprocessorDefinitions>UNICODE;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <WarningLevel>Level2</WarningLevel> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <ResourceCompile /> <Link>
@@ -307,4 +315,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
src/openvpn/options.c +1 -1
@@ -7276,7 +7276,7 @@ add_option(struct options *options,#ifdef _WIN32VERIFY_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 )) {
src/openvpn/route.c +1 -1
@@ -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 ) {
src/openvpn/ssl_openssl.c +1 -1
@@ -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;
src/openvpn/tun.c +6 -6
@@ -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 *gcif (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
Signature · 1 line
2.17.1
Hi,
src/openvpn/mtu.c set_mtu_discover_type(int sd, int mtu_type, sa_family_t proto_af) · line 178
Quoted 4 lines · Lev Stipakov
case
AF_INET:
if (setsockoptsrc/openvpn/mtu.c +1
-1- (sd, IPPROTO_IP, IP_MTU_DISCOVER, &mtu_type, sizeof(mtu_type))) + (sd, IPPROTO_IP, IP_MTU_DISCOVER, (const char *)&mtu_type, sizeof(mtu_type)))
If windows really needs a cast here, please cast to (void *).
Windows can then cast to "const char *" under the hood - which should be warning free. But for all other platforms, casting to "const char *" is not a good change (other parts of socket.c use "void *" already today).
If you are touching the lines anway, please add sensible line wrapping, like:
case AF_INET:
if (setsockopt(sd, IPPROTO_IP, IP_MTU_DISCOVER,
(void *) &mtu_type, sizeof(mtu_ type)))
and not this very weird style with wrapping after the function name.
(Whatever uncrustify might have been thinking, it's ugly)
gert
Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany [email protected]...PATCH v4 1/1 msvc: fix various level2 warnings
From: Lev Stipakov <[email protected]...>
Also set warnings level to level2 and
enable "treat warnings as errors" flag.
---
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(-)
src/compat/Debug.props +0 -1
@@ -15,7 +15,6 @@ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MinimalRebuild>true</MinimalRebuild> </ClCompile> </ItemDefinitionGroup> <ItemGroup />
src/openvpn/block_dns.c +0 -3
@@ -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 */
src/openvpn/crypto_openssl.c +2 -1
@@ -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++) {
src/openvpn/init.c +1 -1
@@ -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 */
src/openvpn/mtu.c +4 -4
@@ -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);
src/openvpn/openvpn.vcxproj +17 -9
@@ -28,23 +28,23 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> + <CharacterSet>NotSet</CharacterSet> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> + <CharacterSet>NotSet</CharacterSet> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> + <CharacterSet>NotSet</CharacterSet> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> + <CharacterSet>NotSet</CharacterSet> <PlatformToolset>v142</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -74,7 +74,9 @@ <ClCompile> <AdditionalIncludeDirectories>..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <UndefinePreprocessorDefinitions>UNICODE;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <WarningLevel>Level2</WarningLevel> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <ResourceCompile /> <Link>
@@ -87,7 +89,9 @@ <ClCompile> <AdditionalIncludeDirectories>..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <UndefinePreprocessorDefinitions>UNICODE;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <WarningLevel>Level2</WarningLevel> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <ResourceCompile /> <Link>
@@ -100,7 +104,9 @@ <ClCompile> <AdditionalIncludeDirectories>..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <UndefinePreprocessorDefinitions>UNICODE;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <WarningLevel>Level2</WarningLevel> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <ResourceCompile /> <Link>
@@ -113,7 +119,9 @@ <ClCompile> <AdditionalIncludeDirectories>..\compat;$(TAP_WINDOWS_HOME)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <UndefinePreprocessorDefinitions>UNICODE;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions> + <WarningLevel>Level2</WarningLevel> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <ResourceCompile /> <Link>
@@ -307,4 +315,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
src/openvpn/options.c +1 -1
@@ -7276,7 +7276,7 @@ add_option(struct options *options,#ifdef _WIN32VERIFY_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 )) {
src/openvpn/route.c +1 -1
@@ -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 ) {
src/openvpn/ssl_openssl.c +1 -1
@@ -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;
src/openvpn/tun.c +6 -6
@@ -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 *gcif (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
Signature · 1 line
2.17.1
I have test compiled this on MacOS, FreeBSD, Linux to see if it brought in "new warnings" - nada. And the changes are good :-) - thanks.
Your patch has been applied to the master branch.
commit 2569902c4455554657464077950fca52516ca81e
Author: Lev Stipakov Date: Fri Jun 26 13:10:50 2020 +0300
msvc: fix various level2 warnings
Signed-off-by: Lev Stipakov <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/search?l=mid&[email protected]...
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering