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

- Fix #1402: squelch invalid argument error for fd_set_block on windows.

Browse source 
git-svn-id: file:///svn/unbound/trunk@4306 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2017-08-21 14:15:32 +00:00
parent 64a5e6af4a
commit d8960d2c55
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -9,6 +9,7 @@
implemented causing TCP to fail. The fix allows fallback to regular implemented causing TCP to fail. The fix allows fallback to regular
TCP in this case and is also more robust for cases where connectx() TCP in this case and is also more robust for cases where connectx()
fails for some reason. fails for some reason.
- Fix #1402: squelch invalid argument error for fd_set_block on windows.
10 August 2017: Wouter 10 August 2017: Wouter
- Patch to show DNSCrypt status in help output, from Carsten - Patch to show DNSCrypt status in help output, from Carsten

5
util/net_help.c
View file

@ -114,8 +114,9 @@ fd_set_block(int s)
#elif defined(HAVE_IOCTLSOCKET) #elif defined(HAVE_IOCTLSOCKET)
unsigned long off = 0; unsigned long off = 0;
if(ioctlsocket(s, FIONBIO, &off) != 0) { if(ioctlsocket(s, FIONBIO, &off) != 0) {
log_err("can't ioctlsocket FIONBIO off: %s", if(WSAGetLastError() != WSAEINVAL || verbosity >= 4)
wsa_strerror(WSAGetLastError())); log_err("can't ioctlsocket FIONBIO off: %s",
wsa_strerror(WSAGetLastError()));
} }
#endif #endif
return 1; return 1;