upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-25 00:59:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- For PR #93: windows compile warnings removal

Browse source 
- windows compile warnings removal for ip dscp option code.
This commit is contained in:
W.C.A. Wijngaards 2020-05-19 14:36:57 +02:00
parent a1d4e151ee
commit 711c0548f0
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/Changelog
View file

@ -6,6 +6,8 @@
- Release 1.10.1 is 1.10.0 with fixes, code repository continues, - Release 1.10.1 is 1.10.0 with fixes, code repository continues,
including those fixes, towards the next release. Configure has including those fixes, towards the next release. Configure has
version 1.10.2 version number in it. version 1.10.2 version number in it.
- For PR #93: windows compile warnings removal
- windows compile warnings removal for ip dscp option code.
18 May 2020: Wouter 18 May 2020: Wouter
- For PR #93: dynlibmod can handle reloads and deinit and inits again, - For PR #93: dynlibmod can handle reloads and deinit and inits again,

16
dynlibmod/dynlibmod.c
View file

@ -15,7 +15,7 @@ void log_dlerror() {
DWORD dwFormatFlags = FORMAT_MESSAGE_ALLOCATE_BUFFER | DWORD dwFormatFlags = FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_IGNORE_INSERTS |
FORMAT_MESSAGE_FROM_SYSTEM ; FORMAT_MESSAGE_FROM_SYSTEM ;
if(dwBufferLength = FormatMessageA( if((dwBufferLength = FormatMessageA(
dwFormatFlags, dwFormatFlags,
NULL, // module to get message from (NULL == system) NULL, // module to get message from (NULL == system)
dwLastError, dwLastError,
@ -23,7 +23,7 @@ void log_dlerror() {
(LPSTR) &MessageBuffer, (LPSTR) &MessageBuffer,
0, 0,
NULL NULL
)) )))
{ {
log_err("dynlibmod: %s (%ld)", MessageBuffer, dwLastError); log_err("dynlibmod: %s (%ld)", MessageBuffer, dwLastError);
LocalFree(MessageBuffer); LocalFree(MessageBuffer);
@ -108,7 +108,7 @@ int dynlibmod_init(struct module_env* env, int id) {
log_err("dynlibmod[%d]: unable to load init procedure from dynamic library \"%s\".", dynlib_mod_idx, de->fname); log_err("dynlibmod[%d]: unable to load init procedure from dynamic library \"%s\".", dynlib_mod_idx, de->fname);
return 0; return 0;
} else { } else {
de->func_init = (func_init_t) initializer; de->func_init = (func_init_t)(void*)initializer;
} }
deinitializer = __LOADSYM(dynamic_library,"deinit"); deinitializer = __LOADSYM(dynamic_library,"deinit");
if (deinitializer == NULL) { if (deinitializer == NULL) {
@ -116,7 +116,7 @@ int dynlibmod_init(struct module_env* env, int id) {
log_err("dynlibmod[%d]: unable to load deinit procedure from dynamic library \"%s\".", dynlib_mod_idx, de->fname); log_err("dynlibmod[%d]: unable to load deinit procedure from dynamic library \"%s\".", dynlib_mod_idx, de->fname);
return 0; return 0;
} else { } else {
de->func_deinit = (func_deinit_t) deinitializer; de->func_deinit = (func_deinit_t)(void*)deinitializer;
} }
operate = __LOADSYM(dynamic_library,"operate"); operate = __LOADSYM(dynamic_library,"operate");
if (operate == NULL) { if (operate == NULL) {
@ -124,7 +124,7 @@ int dynlibmod_init(struct module_env* env, int id) {
log_err("dynlibmod[%d]: unable to load operate procedure from dynamic library \"%s\".", dynlib_mod_idx, de->fname); log_err("dynlibmod[%d]: unable to load operate procedure from dynamic library \"%s\".", dynlib_mod_idx, de->fname);
return 0; return 0;
} else { } else {
de->func_operate = (func_operate_t) operate; de->func_operate = (func_operate_t)(void*)operate;
} }
inform = __LOADSYM(dynamic_library,"inform_super"); inform = __LOADSYM(dynamic_library,"inform_super");
if (inform == NULL) { if (inform == NULL) {
@ -132,7 +132,7 @@ int dynlibmod_init(struct module_env* env, int id) {
log_err("dynlibmod[%d]: unable to load inform_super procedure from dynamic library \"%s\".", dynlib_mod_idx, de->fname); log_err("dynlibmod[%d]: unable to load inform_super procedure from dynamic library \"%s\".", dynlib_mod_idx, de->fname);
return 0; return 0;
} else { } else {
de->func_inform = (func_inform_t) inform; de->func_inform = (func_inform_t)(void*)inform;
} }
clear = __LOADSYM(dynamic_library,"clear"); clear = __LOADSYM(dynamic_library,"clear");
if (clear == NULL) { if (clear == NULL) {
@ -140,7 +140,7 @@ int dynlibmod_init(struct module_env* env, int id) {
log_err("dynlibmod[%d]: unable to load clear procedure from dynamic library \"%s\".", dynlib_mod_idx, de->fname); log_err("dynlibmod[%d]: unable to load clear procedure from dynamic library \"%s\".", dynlib_mod_idx, de->fname);
return 0; return 0;
} else { } else {
de->func_clear = (func_clear_t) clear; de->func_clear = (func_clear_t)(void*)clear;
} }
get_mem = __LOADSYM(dynamic_library,"get_mem"); get_mem = __LOADSYM(dynamic_library,"get_mem");
if (get_mem == NULL) { if (get_mem == NULL) {
@ -148,7 +148,7 @@ int dynlibmod_init(struct module_env* env, int id) {
log_err("dynlibmod[%d]: unable to load get_mem procedure from dynamic library \"%s\".", dynlib_mod_idx, de->fname); log_err("dynlibmod[%d]: unable to load get_mem procedure from dynamic library \"%s\".", dynlib_mod_idx, de->fname);
return 0; return 0;
} else { } else {
de->func_get_mem = (func_get_mem_t) get_mem; de->func_get_mem = (func_get_mem_t)(void*)get_mem;
} }
} }
de->inplace_cb_delete_wrapped = &inplace_cb_delete_wrapped; de->inplace_cb_delete_wrapped = &inplace_cb_delete_wrapped;

4
services/listen_dnsport.c
View file

@ -884,11 +884,11 @@ set_ip_dscp(int socket, int addrfamily, int dscp)
ds = dscp << 2; ds = dscp << 2;
switch(addrfamily) { switch(addrfamily) {
case AF_INET6: case AF_INET6:
if(setsockopt(socket, IPPROTO_IPV6, IPV6_TCLASS, &ds, sizeof(ds)) < 0) if(setsockopt(socket, IPPROTO_IPV6, IPV6_TCLASS, (void*)&ds, sizeof(ds)) < 0)
return sock_strerror(errno); return sock_strerror(errno);
break; break;
default: default:
if(setsockopt(socket, IPPROTO_IP, IP_TOS, &ds, sizeof(ds)) < 0) if(setsockopt(socket, IPPROTO_IP, IP_TOS, (void*)&ds, sizeof(ds)) < 0)
return sock_strerror(errno); return sock_strerror(errno);
break; break;
} }