grpc 1.51.0 → 1.52.0

data/src/core/lib/iomgr/systemd_utils.cc

@@ -0,0 +1,116 @@
+/*
+ *
+ * Copyright 2022 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <grpc/support/port_platform.h>
+
+#include "src/core/lib/iomgr/port.h"
+
+#ifdef GRPC_POSIX_SOCKET_TCP_SERVER_UTILS_COMMON
+
+#ifdef HAVE_LIBSYSTEMD
+#include <systemd/sd-daemon.h>
+#endif
+
+#include "src/core/lib/address_utils/sockaddr_utils.h"
+#include "src/core/lib/iomgr/resolve_address.h"
+#include "src/core/lib/iomgr/sockaddr.h"
+#include "src/core/lib/iomgr/systemd_utils.h"
+
+#ifdef HAVE_LIBSYSTEMD
+bool set_matching_sd_unix_fd(grpc_tcp_server* s,
+                             const grpc_resolved_address* addr,
+                             const int fd_start, const int n) {
+  absl::StatusOr<std::string> addr_name = grpc_sockaddr_to_string(addr, true);
+  for (int i = fd_start; i < fd_start + n; i++) {
+    if (sd_is_socket_unix(i, SOCK_STREAM, 1, addr_name.value().c_str(), 0)) {
+      grpc_tcp_server_set_pre_allocated_fd(s, i);
+      return true;
+    }
+  }
+  return false;
+}
+
+bool set_matching_sd_inet_fd(grpc_tcp_server* s,
+                             const grpc_resolved_address* addr,
+                             const int family, const int port,
+                             const int fd_start, const int n) {
+  for (int i = fd_start; i < fd_start + n; i++) {
+    int r_inet = sd_is_socket_inet(i, family, SOCK_STREAM, 1, (uint16_t)port);
+    int r_addr = sd_is_socket_sockaddr(
+        i, SOCK_STREAM,
+        reinterpret_cast<grpc_sockaddr*>(const_cast<char*>(addr->addr)),
+        addr->len, 1);
+
+    if (r_inet > 0 && r_addr > 0) {
+      grpc_tcp_server_set_pre_allocated_fd(s, i);
+      return true;
+    }
+  }
+  return false;
+}
+
+void set_matching_sd_fds(grpc_tcp_server* s, const grpc_resolved_address* addr,
+                         int requested_port) {
+  int n = sd_listen_fds(0);
+  if (n <= 0) {
+    return;
+  }
+
+  int fd_start = SD_LISTEN_FDS_START;
+  grpc_resolved_address addr6_v4mapped;
+
+  if (grpc_sockaddr_to_v4mapped(addr, &addr6_v4mapped)) {
+    addr = &addr6_v4mapped;
+  }
+
+  int family = grpc_sockaddr_get_family(addr);
+  int port = grpc_sockaddr_get_port(addr);
+
+  if (family == AF_UNIX) {
+    set_matching_sd_unix_fd(s, addr, fd_start, n);
+  } else {
+    if (grpc_sockaddr_is_wildcard(addr, &requested_port)) {
+      grpc_resolved_address wild4;
+      grpc_resolved_address wild6;
+      grpc_resolved_address wildcard_addrs[2];
+
+      grpc_sockaddr_make_wildcards(requested_port, &wild4, &wild6);
+      wildcard_addrs[0] = wild4;
+      wildcard_addrs[1] = wild6;
+
+      for (grpc_resolved_address addr_w : wildcard_addrs) {
+        int family_w = grpc_sockaddr_get_family(&addr_w);
+        int port_w = grpc_sockaddr_get_port(&addr_w);
+        if (set_matching_sd_inet_fd(s, &addr_w, family_w, port_w, fd_start,
+                                    n)) {
+          return;
+        }
+      }
+      return;
+    }
+
+    set_matching_sd_inet_fd(s, addr, family, port, fd_start, n);
+  }
+}
+#else
+void set_matching_sd_fds(GRPC_UNUSED grpc_tcp_server* s,
+                         GRPC_UNUSED const grpc_resolved_address* addr,
+                         GRPC_UNUSED int requested_port) {}
+#endif /* HAVE_LIBSYSTEMD */
+
+#endif /* GRPC_POSIX_SOCKET_TCP_SERVER_UTILS_COMMON */

data/src/core/lib/iomgr/systemd_utils.h

@@ -0,0 +1,33 @@
+/*
+ *
+ * Copyright 2022 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef GRPC_CORE_LIB_IOMGR_SYSTEMD_UTILS_H
+#define GRPC_CORE_LIB_IOMGR_SYSTEMD_UTILS_H
+
+#include <grpc/support/port_platform.h>
+
+#include "src/core/lib/iomgr/tcp_server_utils_posix.h"
+
+/* Check whether systemd has pre-allocated FDs. If so, check whether any
+ * pre-allocated FD is valid, i.e. matches addr and its family. If there is
+ * any valid FD, set its value to s->pre_allocated_fd
+ */
+void set_matching_sd_fds(grpc_tcp_server* s, const grpc_resolved_address* addr,
+                         int requested_port);
+
+#endif /* GRPC_CORE_LIB_IOMGR_SYSTEMD_UTILS_H */

data/src/core/lib/iomgr/tcp_client.cc

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2018 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2018 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #include <grpc/support/port_platform.h>
 

data/src/core/lib/iomgr/tcp_client.h

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #ifndef GRPC_CORE_LIB_IOMGR_TCP_CLIENT_H
 #define GRPC_CORE_LIB_IOMGR_TCP_CLIENT_H
@@ -22,7 +22,7 @@
 #include <grpc/support/port_platform.h>
 
 #include <grpc/event_engine/endpoint_config.h>
-#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/impl/grpc_types.h>
 #include <grpc/support/time.h>
 
 #include "src/core/lib/iomgr/endpoint.h"
@@ -39,13 +39,13 @@ typedef struct grpc_tcp_client_vtable {
   bool (*cancel_connect)(int64_t connection_handle);
 } grpc_tcp_client_vtable;
 
-/* Asynchronously connect to an address (specified as (addr, len)), and call
-   cb with arg and the completed connection when done (or call cb with arg and
-   NULL on failure).
-   interested_parties points to a set of pollsets that would be interested
-   in this connection being established (in order to continue their work). It
-   returns a handle to the connect operation which can be used to cancel the
-   connection attempt. */
+// Asynchronously connect to an address (specified as (addr, len)), and call
+// cb with arg and the completed connection when done (or call cb with arg and
+// NULL on failure).
+// interested_parties points to a set of pollsets that would be interested
+// in this connection being established (in order to continue their work). It
+// returns a handle to the connect operation which can be used to cancel the
+// connection attempt.
 int64_t grpc_tcp_client_connect(
     grpc_closure* on_connect, grpc_endpoint** endpoint,
     grpc_pollset_set* interested_parties,
@@ -63,4 +63,4 @@ extern void grpc_tcp_client_global_init();
 
 void grpc_set_tcp_client_impl(grpc_tcp_client_vtable* impl);
 
-#endif /* GRPC_CORE_LIB_IOMGR_TCP_CLIENT_H */
+#endif  // GRPC_CORE_LIB_IOMGR_TCP_CLIENT_H

data/src/core/lib/iomgr/tcp_client_cfstream.cc

@@ -1,21 +1,21 @@
 
-/*
- *
- * Copyright 2018 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2018 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -33,6 +33,7 @@
 #include <grpc/support/sync.h>
 
 #include "src/core/lib/address_utils/sockaddr_utils.h"
+#include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/host_port.h"
 #include "src/core/lib/iomgr/cfstream_handle.h"
 #include "src/core/lib/iomgr/closure.h"
@@ -204,4 +205,4 @@ static bool CFStreamClientCancelConnect(int64_t /*connection_handle*/) {
 grpc_tcp_client_vtable grpc_cfstream_client_vtable = {
     CFStreamClientConnect, CFStreamClientCancelConnect};
 
-#endif /* GRPC_CFSTREAM_CLIENT */
+#endif  // GRPC_CFSTREAM_CLIENT

data/src/core/lib/iomgr/tcp_client_posix.cc

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -36,6 +36,7 @@
 
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/gpr/string.h"
+#include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/ev_posix.h"
 #include "src/core/lib/iomgr/executor.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
@@ -213,31 +214,31 @@ static void on_writable(void* acp, grpc_error_handle error) {
       fd = nullptr;
       break;
     case ENOBUFS:
-      /* We will get one of these errors if we have run out of
-         memory in the kernel for the data structures allocated
-         when you connect a socket.  If this happens it is very
-         likely that if we wait a little bit then try again the
-         connection will work (since other programs or this
-         program will close their network connections and free up
-         memory).  This does _not_ indicate that there is anything
-         wrong with the server we are connecting to, this is a
-         local problem.
-
-         If you are looking at this code, then chances are that
-         your program or another program on the same computer
-         opened too many network connections.  The "easy" fix:
-         don't do that! */
+      // We will get one of these errors if we have run out of
+      // memory in the kernel for the data structures allocated
+      // when you connect a socket.  If this happens it is very
+      // likely that if we wait a little bit then try again the
+      // connection will work (since other programs or this
+      // program will close their network connections and free up
+      // memory).  This does _not_ indicate that there is anything
+      // wrong with the server we are connecting to, this is a
+      // local problem.
+
+      // If you are looking at this code, then chances are that
+      // your program or another program on the same computer
+      // opened too many network connections.  The "easy" fix:
+      // don't do that!
       gpr_log(GPR_ERROR, "kernel out of buffers");
       gpr_mu_unlock(&ac->mu);
       grpc_fd_notify_on_write(fd, &ac->write_closure);
       return;
     case ECONNREFUSED:
-      /* This error shouldn't happen for anything other than connect(). */
+      // This error shouldn't happen for anything other than connect().
       error = GRPC_OS_ERROR(so_error, "connect");
       break;
     default:
-      /* We don't really know which syscall triggered the problem here,
-         so punt by reporting getsockopt(). */
+      // We don't really know which syscall triggered the problem here,
+      // so punt by reporting getsockopt().
       error = GRPC_OS_ERROR(so_error, "getsockopt(SO_ERROR)");
       break;
   }
@@ -291,10 +292,10 @@ grpc_error_handle grpc_tcp_client_prepare_fd(
   grpc_dualstack_mode dsmode;
   grpc_error_handle error;
   *fd = -1;
-  /* Use dualstack sockets where available. Set mapped to v6 or v4 mapped to
-     v6. */
+  // Use dualstack sockets where available. Set mapped to v6 or v4 mapped to
+  // v6.
   if (!grpc_sockaddr_to_v4mapped(addr, mapped_addr)) {
-    /* addr is v4 mapped to v6 or v6. */
+    // addr is v4 mapped to v6 or v6.
     memcpy(mapped_addr, addr, sizeof(*mapped_addr));
   }
   error =
@@ -303,7 +304,7 @@ grpc_error_handle grpc_tcp_client_prepare_fd(
     return error;
   }
   if (dsmode == GRPC_DSMODE_IPV4) {
-    /* Original addr is either v4 or v4 mapped to v6. Set mapped_addr to v4. */
+    // Original addr is either v4 or v4 mapped to v6. Set mapped_addr to v4.
     if (!grpc_sockaddr_is_v4mapped(addr, mapped_addr)) {
       memcpy(mapped_addr, addr, sizeof(*mapped_addr));
     }

data/src/core/lib/iomgr/tcp_client_posix.h

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #ifndef GRPC_CORE_LIB_IOMGR_TCP_CLIENT_POSIX_H
 #define GRPC_CORE_LIB_IOMGR_TCP_CLIENT_POSIX_H
@@ -26,47 +26,47 @@
 #include "src/core/lib/iomgr/socket_utils_posix.h"
 #include "src/core/lib/iomgr/tcp_client.h"
 
-/* Create an endpoint from a connected grpc_fd.
+// Create an endpoint from a connected grpc_fd.
 
-   fd: a connected FD. Ownership is taken.
-   config: may contain custom settings for the endpoint
-   addr_str: destination address in printable format
-   slice_allocator: ownership is taken by client.
-   Returns: a new endpoint
-*/
+// fd: a connected FD. Ownership is taken.
+// config: may contain custom settings for the endpoint
+// addr_str: destination address in printable format
+// slice_allocator: ownership is taken by client.
+// Returns: a new endpoint
+//
 grpc_endpoint* grpc_tcp_create_from_fd(
     grpc_fd* fd, const grpc_event_engine::experimental::EndpointConfig& config,
     absl::string_view addr_str);
 
-/* Return a configured, unbound, unconnected TCP client fd.
+// Return a configured, unbound, unconnected TCP client fd.
 
-   options: may contain custom settings for the fd
-   addr: the destination address
-   mapped_addr: out parameter. addr mapped to an address appropriate to the
-     type of socket FD created. For example, if addr is IPv4 and dual stack
-     sockets are available, mapped_addr will be an IPv4-mapped IPv6 address
-   fd: out parameter. The new FD
-   Returns: error, if any. Out parameters are not set on error
-*/
+// options: may contain custom settings for the fd
+// addr: the destination address
+// mapped_addr: out parameter. addr mapped to an address appropriate to the
+//   type of socket FD created. For example, if addr is IPv4 and dual stack
+//   sockets are available, mapped_addr will be an IPv4-mapped IPv6 address
+// fd: out parameter. The new FD
+// Returns: error, if any. Out parameters are not set on error
+//
 grpc_error_handle grpc_tcp_client_prepare_fd(
     const grpc_core::PosixTcpOptions& options,
     const grpc_resolved_address* addr, grpc_resolved_address* mapped_addr,
     int* fd);
 
-/* Connect a configured TCP client fd.
+// Connect a configured TCP client fd.
 
-   interested_parties: a set of pollsets that would be interested in this
-     connection being established (in order to continue their work
-   closure: called when complete. On success, *ep will be set.
-   fd: an FD returned from grpc_tcp_client_prepare_fd().
-   options: may contain custom settings for the endpoint
-   deadline: connection deadline
-   ep: out parameter. Set before closure is called if successful
-*/
+// interested_parties: a set of pollsets that would be interested in this
+//   connection being established (in order to continue their work
+// closure: called when complete. On success, *ep will be set.
+// fd: an FD returned from grpc_tcp_client_prepare_fd().
+// options: may contain custom settings for the endpoint
+// deadline: connection deadline
+// ep: out parameter. Set before closure is called if successful
+//
 int64_t grpc_tcp_client_create_from_prepared_fd(
     grpc_pollset_set* interested_parties, grpc_closure* closure, const int fd,
     const grpc_core::PosixTcpOptions& options,
     const grpc_resolved_address* addr, grpc_core::Timestamp deadline,
     grpc_endpoint** ep);
 
-#endif /* GRPC_CORE_LIB_IOMGR_TCP_CLIENT_POSIX_H */
+#endif  // GRPC_CORE_LIB_IOMGR_TCP_CLIENT_POSIX_H

data/src/core/lib/iomgr/tcp_client_windows.cc

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -31,6 +31,7 @@
 #include <grpc/support/log_windows.h>
 
 #include "src/core/lib/address_utils/sockaddr_utils.h"
+#include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/iocp_windows.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/sockaddr_windows.h"
@@ -113,13 +114,13 @@ static void on_connect(void* acp, grpc_error_handle error) {
   }
 
   async_connect_unlock_and_cleanup(ac, socket);
-  /* If the connection was aborted, the callback was already called when
-     the deadline was met. */
+  // If the connection was aborted, the callback was already called when
+  // the deadline was met.
   grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, error);
 }
 
-/* Tries to issue one async connection, then schedules both an IOCP
-   notification request for the connection, and one timeout alert. */
+// Tries to issue one async connection, then schedules both an IOCP
+// notification request for the connection, and one timeout alert.
 static int64_t tcp_connect(grpc_closure* on_done, grpc_endpoint** endpoint,
                            grpc_pollset_set* interested_parties,
                            const EndpointConfig& config,
@@ -147,7 +148,7 @@ static int64_t tcp_connect(grpc_closure* on_done, grpc_endpoint** endpoint,
 
   *endpoint = NULL;
 
-  /* Use dualstack sockets where available. */
+  // Use dualstack sockets where available.
   if (grpc_sockaddr_to_v4mapped(addr, &addr6_v4mapped)) {
     addr = &addr6_v4mapped;
   }
@@ -164,8 +165,8 @@ static int64_t tcp_connect(grpc_closure* on_done, grpc_endpoint** endpoint,
     goto failure;
   }
 
-  /* Grab the function pointer for ConnectEx for that specific socket.
-     It may change depending on the interface. */
+  // Grab the function pointer for ConnectEx for that specific socket.
+  // It may change depending on the interface.
   status =
       WSAIoctl(sock, SIO_GET_EXTENSION_FUNCTION_POINTER, &guid, sizeof(guid),
                &ConnectEx, sizeof(ConnectEx), &ioctl_num_bytes, NULL, NULL);
@@ -190,8 +191,8 @@ static int64_t tcp_connect(grpc_closure* on_done, grpc_endpoint** endpoint,
   success = ConnectEx(sock, (grpc_sockaddr*)&addr->addr, (int)addr->len, NULL,
                       0, NULL, &info->overlapped);
 
-  /* It wouldn't be unusual to get a success immediately. But we'll still get
-     an IOCP notification, so let's ignore it. */
+  // It wouldn't be unusual to get a success immediately. But we'll still get
+  // an IOCP notification, so let's ignore it.
   if (!success) {
     int last_error = WSAGetLastError();
     if (last_error != ERROR_IO_PENDING) {
@@ -236,4 +237,4 @@ static bool tcp_cancel_connect(int64_t /*connection_handle*/) { return false; }
 grpc_tcp_client_vtable grpc_windows_tcp_client_vtable = {tcp_connect,
                                                          tcp_cancel_connect};
 
-#endif /* GRPC_WINSOCK_SOCKET */
+#endif  // GRPC_WINSOCK_SOCKET