Check once that WSA_FLAG_NO_HANDLE_INHERIT is supported

src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc

@@ -442,9 +442,7 @@ class SockToPolledFdMap {
    */
   static ares_socket_t Socket(int af, int type, int protocol, void* user_data) {
     SockToPolledFdMap* map = static_cast<SockToPolledFdMap*>(user_data);
-    SOCKET s = grpc_create_wsa_socket(
-        af, type, protocol, nullptr, 0,
-        WSA_FLAG_OVERLAPPED | WSA_FLAG_NO_HANDLE_INHERIT);
+    SOCKET s = WSASocket(af, type, protocol, nullptr, 0, grpc_wsa_socket_flags);
     if (s == INVALID_SOCKET) {
       return s;
     }

src/core/lib/iomgr/endpoint_pair_windows.cc

@@ -40,9 +40,8 @@ static void create_sockets(SOCKET sv[2]) {
   SOCKADDR_IN addr;
   int addr_len = sizeof(addr);
 
-  lst_sock =
-      grpc_create_wsa_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0,
-                             WSA_FLAG_OVERLAPPED | WSA_FLAG_NO_HANDLE_INHERIT);
+  lst_sock = WSASocket(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0,
+                       grpc_wsa_socket_flags);
   GPR_ASSERT(lst_sock != INVALID_SOCKET);
 
   memset(&addr, 0, sizeof(addr));
@@ -54,9 +53,8 @@ static void create_sockets(SOCKET sv[2]) {
   GPR_ASSERT(getsockname(lst_sock, (grpc_sockaddr*)&addr, &addr_len) !=
              SOCKET_ERROR);
 
-  cli_sock =
-      grpc_create_wsa_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0,
-                             WSA_FLAG_OVERLAPPED | WSA_FLAG_NO_HANDLE_INHERIT);
+  cli_sock = WSASocket(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0,
+                       grpc_wsa_socket_flags);
   GPR_ASSERT(cli_sock != INVALID_SOCKET);
 
   GPR_ASSERT(WSAConnect(cli_sock, (grpc_sockaddr*)&addr, addr_len, NULL, NULL,

src/core/lib/iomgr/iomgr_windows.cc

@@ -61,6 +61,7 @@ static void iomgr_platform_init(void) {
   winsock_init();
   grpc_iocp_init();
   grpc_pollset_global_init();
+  grpc_wsa_socket_flags_init();
 }
 
 static void iomgr_platform_flush(void) { grpc_iocp_flush(); }

src/core/lib/iomgr/socket_windows.cc

@@ -181,24 +181,19 @@ int grpc_ipv6_loopback_available(void) {
   return g_ipv6_loopback_available;
 }
 
-SOCKET grpc_create_wsa_socket(int family, int type, int protocol,
-                              LPWSAPROTOCOL_INFO protocol_info, GROUP group,
-                              DWORD flags) {
-  bool is_wsa_no_handle_inherit_set = flags & WSA_FLAG_NO_HANDLE_INHERIT;
-  if (!g_is_wsa_no_handle_inherit_supported && is_wsa_no_handle_inherit_set) {
-    flags ^= WSA_FLAG_NO_HANDLE_INHERIT;
-  }
-  SOCKET sock = WSASocket(family, type, protocol, protocol_info, group, flags);
+void grpc_wsa_socket_flags_init() {
+  grpc_wsa_socket_flags = WSA_FLAG_OVERLAPPED;
   /* WSA_FLAG_NO_HANDLE_INHERIT may be not supported on the older Windows
      versions, see
      https://msdn.microsoft.com/en-us/library/windows/desktop/ms742212(v=vs.85).aspx
      for details. */
-  if (sock == INVALID_SOCKET && is_wsa_no_handle_inherit_set) {
-    g_is_wsa_no_handle_inherit_supported = false;
-    sock = WSASocket(family, type, protocol, protocol_info, group,
-                     flags ^ WSA_FLAG_NO_HANDLE_INHERIT);
+  SOCKET sock = WSASocket(AF_INET6, SOCK_STREAM, IPPROTO_TCP, 0, NULL,
+                          grpc_wsa_socket_flags & WSA_FLAG_NO_HANDLE_INHERIT);
+  if (sock != INVALID_SOCKET) {
+    /* Windows 7, Windows 2008 R2 with SP1 or later */
+    grpc_wsa_socket_flags &= WSA_FLAG_NO_HANDLE_INHERIT;
+    closesocket(sock);
   }
-  return sock;
 }
 
 #endif /* GRPC_WINSOCK_SOCKET */

src/core/lib/iomgr/socket_windows.h

@@ -118,11 +118,9 @@ void grpc_socket_become_ready(grpc_winsocket* winsocket,
    The value is probed once, and cached for the life of the process. */
 int grpc_ipv6_loopback_available(void);
 
-static bool g_is_wsa_no_handle_inherit_supported = true;
+static DWORD grpc_wsa_socket_flags = 0;
 
-SOCKET grpc_create_wsa_socket(int family, int type, int protocol,
-                              LPWSAPROTOCOL_INFO protocol_info, GROUP group,
-                              DWORD flags);
+void grpc_wsa_socket_flags_init();
 
 #endif
 

src/core/lib/iomgr/tcp_client_windows.cc

@@ -147,9 +147,8 @@ static void tcp_connect(grpc_closure* on_done, grpc_endpoint** endpoint,
     addr = &addr6_v4mapped;
   }
 
-  sock =
-      grpc_create_wsa_socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP, NULL, 0,
-                             WSA_FLAG_OVERLAPPED | WSA_FLAG_NO_HANDLE_INHERIT);
+  sock = WSASocket(AF_INET6, SOCK_STREAM, IPPROTO_TCP, NULL, 0,
+                   grpc_wsa_socket_flags);
   if (sock == INVALID_SOCKET) {
     error = GRPC_WSA_ERROR(WSAGetLastError(), "WSASocket");
     goto failure;

src/core/lib/iomgr/tcp_server_windows.cc

@@ -254,9 +254,8 @@ static grpc_error* start_accept_locked(grpc_tcp_listener* port) {
     return GRPC_ERROR_NONE;
   }
 
-  sock =
-      grpc_create_wsa_socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP, NULL, 0,
-                             WSA_FLAG_OVERLAPPED | WSA_FLAG_NO_HANDLE_INHERIT);
+  sock = WSASocket(AF_INET6, SOCK_STREAM, IPPROTO_TCP, NULL, 0,
+                   grpc_wsa_socket_flags);
   if (sock == INVALID_SOCKET) {
     error = GRPC_WSA_ERROR(WSAGetLastError(), "WSASocket");
     goto failure;
@@ -493,9 +492,8 @@ static grpc_error* tcp_server_add_port(grpc_tcp_server* s,
     addr = &wildcard;
   }
 
-  sock =
-      grpc_create_wsa_socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP, NULL, 0,
-                             WSA_FLAG_OVERLAPPED | WSA_FLAG_NO_HANDLE_INHERIT);
+  sock = WSASocket(AF_INET6, SOCK_STREAM, IPPROTO_TCP, NULL, 0,
+                   grpc_wsa_socket_flags);
   if (sock == INVALID_SOCKET) {
     error = GRPC_WSA_ERROR(WSAGetLastError(), "WSASocket");
     goto done;