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

git-svn-id: file:///svn/unbound/trunk@4306 be551aaa-1e26-0410-a405-d3ace91eadb9

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

diff --git a/util/net_help.c b/util/net_help.c
index 943f9dd7fd1d23ce89de6a320e3621202fa0fbc4..ce136a337cff1a15fd90d8a91c56d6ad985548fe 100644 (file)
--- a/util/net_help.c
+++ b/util/net_help.c
@@ -114,8 +114,9 @@ fd_set_block(int s)
 #elif defined(HAVE_IOCTLSOCKET)
        unsigned long off = 0;
        if(ioctlsocket(s, FIONBIO, &off) != 0) {
-               log_err("can't ioctlsocket FIONBIO off: %s", 
-                       wsa_strerror(WSAGetLastError()));
+               if(WSAGetLastError() != WSAEINVAL || verbosity >= 4)
+                       log_err("can't ioctlsocket FIONBIO off: %s", 
+                               wsa_strerror(WSAGetLastError()));
        }
 #endif 
        return 1;