grpc 1.51.0 → 1.52.0

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

@@ -1,69 +1,69 @@
-/*
- *
- * Copyright 2017 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 2017 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_SOCKET_FACTORY_POSIX_H
 #define GRPC_CORE_LIB_IOMGR_SOCKET_FACTORY_POSIX_H
 
 #include <grpc/support/port_platform.h>
 
-#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/impl/grpc_types.h>
 #include <grpc/support/sync.h>
 
 #include "src/core/lib/iomgr/resolve_address.h"
 
-/** The virtual table of grpc_socket_factory */
+/// The virtual table of grpc_socket_factory
 struct grpc_socket_factory_vtable {
-  /** Replacement for socket(2) */
+  /// Replacement for socket(2)
   int (*socket)(grpc_socket_factory* factory, int domain, int type,
                 int protocol);
-  /** Replacement for bind(2) */
+  /// Replacement for bind(2)
   int (*bind)(grpc_socket_factory* factory, int sockfd,
               const grpc_resolved_address* addr);
-  /** Compare socket factory \a a and \a b */
+  /// Compare socket factory \a a and \a b
   int (*compare)(grpc_socket_factory* a, grpc_socket_factory* b);
-  /** Destroys the socket factory instance */
+  /// Destroys the socket factory instance
   void (*destroy)(grpc_socket_factory* factory);
 };
-/** The Socket Factory interface allows changes on socket options */
+/// The Socket Factory interface allows changes on socket options
 struct grpc_socket_factory {
   const grpc_socket_factory_vtable* vtable;
   gpr_refcount refcount;
 };
 
-/** called by concrete implementations to initialize the base struct */
+/// called by concrete implementations to initialize the base struct
 void grpc_socket_factory_init(grpc_socket_factory* factory,
                               const grpc_socket_factory_vtable* vtable);
 
-/** Wrap \a factory as a grpc_arg */
+/// Wrap \a factory as a grpc_arg
 grpc_arg grpc_socket_factory_to_arg(grpc_socket_factory* factory);
 
-/** Perform the equivalent of a socket(2) operation using \a factory */
+/// Perform the equivalent of a socket(2) operation using \a factory
 int grpc_socket_factory_socket(grpc_socket_factory* factory, int domain,
                                int type, int protocol);
 
-/** Perform the equivalent of a bind(2) operation using \a factory */
+/// Perform the equivalent of a bind(2) operation using \a factory
 int grpc_socket_factory_bind(grpc_socket_factory* factory, int sockfd,
                              const grpc_resolved_address* addr);
 
-/** Compare if \a a and \a b are the same factory or have same settings */
+/// Compare if \a a and \a b are the same factory or have same settings
 int grpc_socket_factory_compare(grpc_socket_factory* a, grpc_socket_factory* b);
 
 grpc_socket_factory* grpc_socket_factory_ref(grpc_socket_factory* factory);
 void grpc_socket_factory_unref(grpc_socket_factory* factory);
 
-#endif /* GRPC_CORE_LIB_IOMGR_SOCKET_FACTORY_POSIX_H */
+#endif  // GRPC_CORE_LIB_IOMGR_SOCKET_FACTORY_POSIX_H

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

@@ -1,31 +1,32 @@
-/*
- *
- * 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>
 
 #include "src/core/lib/iomgr/socket_mutator.h"
 
-#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/impl/grpc_types.h>
 #include <grpc/support/log.h>
 #include <grpc/support/sync.h>
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gpr/useful.h"
+#include "src/core/lib/gprpp/crash.h"
 
 void grpc_socket_mutator_init(grpc_socket_mutator* mutator,
                               const grpc_socket_mutator_vtable* vtable) {

data/src/core/lib/iomgr/socket_mutator.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_SOCKET_MUTATOR_H
 #define GRPC_CORE_LIB_IOMGR_SOCKET_MUTATOR_H
@@ -23,62 +23,62 @@
 
 #include <stdbool.h>
 
-#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/impl/grpc_types.h>
 #include <grpc/support/sync.h>
 
-/** How is an fd to be used? */
+/// How is an fd to be used?
 typedef enum {
-  /** Used for client connection */
+  /// Used for client connection
   GRPC_FD_CLIENT_CONNECTION_USAGE,
-  /** Used for server listening */
+  /// Used for server listening
   GRPC_FD_SERVER_LISTENER_USAGE,
-  /** Used for server connection */
+  /// Used for server connection
   GRPC_FD_SERVER_CONNECTION_USAGE,
 } grpc_fd_usage;
 
-/** Information about an fd to mutate */
+/// Information about an fd to mutate
 typedef struct {
-  /** File descriptor to mutate */
+  /// File descriptor to mutate
   int fd;
-  /** How the fd will be used */
+  /// How the fd will be used
   grpc_fd_usage usage;
 } grpc_mutate_socket_info;
 
-/** The virtual table of grpc_socket_mutator */
+/// The virtual table of grpc_socket_mutator
 struct grpc_socket_mutator_vtable {
-  /** Mutates the socket options of \a fd -- deprecated, prefer mutate_fd_2 */
+  /// Mutates the socket options of \a fd -- deprecated, prefer mutate_fd_2
   bool (*mutate_fd)(int fd, grpc_socket_mutator* mutator);
-  /** Compare socket mutator \a a and \a b */
+  /// Compare socket mutator \a a and \a b
   int (*compare)(grpc_socket_mutator* a, grpc_socket_mutator* b);
-  /** Destroys the socket mutator instance */
+  /// Destroys the socket mutator instance
   void (*destroy)(grpc_socket_mutator* mutator);
-  /** Mutates the socket options of the fd in \a info - if set takes preference
-   * to mutate_fd */
+  /// Mutates the socket options of the fd in \a info - if set takes preference
+  /// to mutate_fd
   bool (*mutate_fd_2)(const grpc_mutate_socket_info* info,
                       grpc_socket_mutator* mutator);
 };
 
-/** The Socket Mutator interface allows changes on socket options */
+/// The Socket Mutator interface allows changes on socket options
 struct grpc_socket_mutator {
   const grpc_socket_mutator_vtable* vtable;
   gpr_refcount refcount;
 };
 
-/** called by concrete implementations to initialize the base struct */
+/// called by concrete implementations to initialize the base struct
 void grpc_socket_mutator_init(grpc_socket_mutator* mutator,
                               const grpc_socket_mutator_vtable* vtable);
 
-/** Wrap \a mutator as a grpc_arg */
+/// Wrap \a mutator as a grpc_arg
 grpc_arg grpc_socket_mutator_to_arg(grpc_socket_mutator* mutator);
 
-/** Perform the file descriptor mutation operation of \a mutator on \a fd */
+/// Perform the file descriptor mutation operation of \a mutator on \a fd
 bool grpc_socket_mutator_mutate_fd(grpc_socket_mutator* mutator, int fd,
                                    grpc_fd_usage usage);
 
-/** Compare if \a a and \a b are the same mutator or have same settings */
+/// Compare if \a a and \a b are the same mutator or have same settings
 int grpc_socket_mutator_compare(grpc_socket_mutator* a, grpc_socket_mutator* b);
 
 grpc_socket_mutator* grpc_socket_mutator_ref(grpc_socket_mutator* mutator);
 void grpc_socket_mutator_unref(grpc_socket_mutator* mutator);
 
-#endif /* GRPC_CORE_LIB_IOMGR_SOCKET_MUTATOR_H */
+#endif  // GRPC_CORE_LIB_IOMGR_SOCKET_MUTATOR_H

data/src/core/lib/iomgr/socket_utils.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_SOCKET_UTILS_H
 #define GRPC_CORE_LIB_IOMGR_SOCKET_UTILS_H
@@ -26,22 +26,22 @@
 // TODO(juanlishen): The following functions might be simple enough to implement
 // ourselves, so that they don't cause any portability hassle.
 
-/* A wrapper for htons on POSIX and Windows */
+// A wrapper for htons on POSIX and Windows
 uint16_t grpc_htons(uint16_t hostshort);
 
-/* A wrapper for ntohs on POSIX and WINDOWS */
+// A wrapper for ntohs on POSIX and WINDOWS
 uint16_t grpc_ntohs(uint16_t netshort);
 
-/* A wrapper for htonl on POSIX and Windows */
+// A wrapper for htonl on POSIX and Windows
 uint32_t grpc_htonl(uint32_t hostlong);
 
-/* A wrapper for ntohl on POSIX and WINDOWS */
+// A wrapper for ntohl on POSIX and WINDOWS
 uint32_t grpc_ntohl(uint32_t netlong);
 
-/* A wrapper for inet_pton on POSIX and WINDOWS */
+// A wrapper for inet_pton on POSIX and WINDOWS
 int grpc_inet_pton(int af, const char* src, void* dst);
 
-/* A wrapper for inet_ntop on POSIX systems and InetNtop on Windows systems */
+// A wrapper for inet_ntop on POSIX systems and InetNtop on Windows systems
 const char* grpc_inet_ntop(int af, const void* src, char* dst, size_t size);
 
-#endif /* GRPC_CORE_LIB_IOMGR_SOCKET_UTILS_H */
+#endif  // GRPC_CORE_LIB_IOMGR_SOCKET_UTILS_H

data/src/core/lib/iomgr/socket_utils_common_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>
 
@@ -50,10 +50,11 @@
 
 #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/gprpp/strerror.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 
-/* set a socket to use zerocopy */
+// set a socket to use zerocopy
 grpc_error_handle grpc_set_socket_zerocopy(int fd) {
 #ifdef GRPC_LINUX_ERRQUEUE
   const int enable = 1;
@@ -68,7 +69,7 @@ grpc_error_handle grpc_set_socket_zerocopy(int fd) {
 #endif
 }
 
-/* set a socket to non blocking mode */
+// set a socket to non blocking mode
 grpc_error_handle grpc_set_socket_nonblocking(int fd, int non_blocking) {
   int oldflags = fcntl(fd, F_GETFL, 0);
   if (oldflags < 0) {
@@ -149,7 +150,7 @@ grpc_error_handle grpc_set_socket_rcvbuf(int fd, int buffer_size_bytes) {
              : GRPC_OS_ERROR(errno, "setsockopt(SO_RCVBUF)");
 }
 
-/* set a socket to close on exec */
+// set a socket to close on exec
 grpc_error_handle grpc_set_socket_cloexec(int fd, int close_on_exec) {
   int oldflags = fcntl(fd, F_GETFD, 0);
   if (oldflags < 0) {
@@ -169,7 +170,7 @@ grpc_error_handle grpc_set_socket_cloexec(int fd, int close_on_exec) {
   return absl::OkStatus();
 }
 
-/* set a socket to reuse old addresses */
+// set a socket to reuse old addresses
 grpc_error_handle grpc_set_socket_reuse_addr(int fd, int reuse) {
   int val = (reuse != 0);
   int newval;
@@ -187,7 +188,7 @@ grpc_error_handle grpc_set_socket_reuse_addr(int fd, int reuse) {
   return absl::OkStatus();
 }
 
-/* set a socket to reuse old addresses */
+// set a socket to reuse old addresses
 grpc_error_handle grpc_set_socket_reuse_port(int fd, int reuse) {
 #ifndef SO_REUSEPORT
   return GRPC_ERROR_CREATE("SO_REUSEPORT unavailable on compiling system");
@@ -215,8 +216,8 @@ static int g_support_so_reuseport = false;
 void probe_so_reuseport_once(void) {
   int s = socket(AF_INET, SOCK_STREAM, 0);
   if (s < 0) {
-    /* This might be an ipv6-only environment in which case 'socket(AF_INET,..)'
-       call would fail. Try creating IPv6 socket in that case */
+    // This might be an ipv6-only environment in which case 'socket(AF_INET,..)'
+    // call would fail. Try creating IPv6 socket in that case
     s = socket(AF_INET6, SOCK_STREAM, 0);
   }
   if (s >= 0) {
@@ -231,7 +232,7 @@ bool grpc_is_socket_reuse_port_supported() {
   return g_support_so_reuseport;
 }
 
-/* disable nagle */
+// disable nagle
 grpc_error_handle grpc_set_socket_low_latency(int fd, int low_latency) {
   int val = (low_latency != 0);
   int newval;
@@ -248,11 +249,11 @@ grpc_error_handle grpc_set_socket_low_latency(int fd, int low_latency) {
   return absl::OkStatus();
 }
 
-/* The default values for TCP_USER_TIMEOUT are currently configured to be in
- * line with the default values of KEEPALIVE_TIMEOUT as proposed in
- * https://github.com/grpc/proposal/blob/master/A18-tcp-user-timeout.md */
-#define DEFAULT_CLIENT_TCP_USER_TIMEOUT_MS 20000 /* 20 seconds */
-#define DEFAULT_SERVER_TCP_USER_TIMEOUT_MS 20000 /* 20 seconds */
+// The default values for TCP_USER_TIMEOUT are currently configured to be in
+// line with the default values of KEEPALIVE_TIMEOUT as proposed in
+// https://github.com/grpc/proposal/blob/master/A18-tcp-user-timeout.md
+#define DEFAULT_CLIENT_TCP_USER_TIMEOUT_MS 20000  // 20 seconds
+#define DEFAULT_SERVER_TCP_USER_TIMEOUT_MS 20000  // 20 seconds
 
 static int g_default_client_tcp_user_timeout_ms =
     DEFAULT_CLIENT_TCP_USER_TIMEOUT_MS;
@@ -296,7 +297,7 @@ void config_default_tcp_user_timeout(bool enable, int timeout, bool is_client) {
   }
 }
 
-/* Set TCP_USER_TIMEOUT */
+// Set TCP_USER_TIMEOUT
 grpc_error_handle grpc_set_socket_tcp_user_timeout(
     int fd, const grpc_core::PosixTcpOptions& options, bool is_client) {
   // Use conditionally-important parameter to avoid warning
@@ -356,7 +357,7 @@ grpc_error_handle grpc_set_socket_tcp_user_timeout(
           return absl::OkStatus();
         }
         if (newval != timeout) {
-          /* Do not fail on failing to set TCP_USER_TIMEOUT for now. */
+          // Do not fail on failing to set TCP_USER_TIMEOUT for now.
           gpr_log(GPR_ERROR, "Failed to set TCP_USER_TIMEOUT");
           return absl::OkStatus();
         }
@@ -370,7 +371,7 @@ grpc_error_handle grpc_set_socket_tcp_user_timeout(
   return absl::OkStatus();
 }
 
-/* set a socket using a grpc_socket_mutator */
+// set a socket using a grpc_socket_mutator
 grpc_error_handle grpc_set_socket_with_mutator(int fd, grpc_fd_usage usage,
                                                grpc_socket_mutator* mutator) {
   GPR_ASSERT(mutator);
@@ -400,7 +401,7 @@ static void probe_ipv6_once(void) {
     grpc_sockaddr_in6 addr;
     memset(&addr, 0, sizeof(addr));
     addr.sin6_family = AF_INET6;
-    addr.sin6_addr.s6_addr[15] = 1; /* [::1]:0 */
+    addr.sin6_addr.s6_addr[15] = 1;  // [::1]:0
     if (bind(fd, reinterpret_cast<grpc_sockaddr*>(&addr), sizeof(addr)) == 0) {
       g_ipv6_loopback_available = 1;
     } else {
@@ -454,17 +455,17 @@ grpc_error_handle grpc_create_dualstack_socket_using_factory(
       *newfd = -1;
       errno = EAFNOSUPPORT;
     }
-    /* Check if we've got a valid dualstack socket. */
+    // Check if we've got a valid dualstack socket.
     if (*newfd >= 0 && grpc_set_socket_dualstack(*newfd)) {
       *dsmode = GRPC_DSMODE_DUALSTACK;
       return absl::OkStatus();
     }
-    /* If this isn't an IPv4 address, then return whatever we've got. */
+    // If this isn't an IPv4 address, then return whatever we've got.
     if (!grpc_sockaddr_is_v4mapped(resolved_addr, nullptr)) {
       *dsmode = GRPC_DSMODE_IPV6;
       return error_for_fd(*newfd, resolved_addr);
     }
-    /* Fall back to AF_INET. */
+    // Fall back to AF_INET.
     if (*newfd >= 0) {
       close(*newfd);
     }

data/src/core/lib/iomgr/socket_utils_linux.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>
 
@@ -27,6 +27,7 @@
 
 #include <grpc/support/log.h>
 
+#include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils_posix.h"
 

data/src/core/lib/iomgr/socket_utils_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>
 
@@ -27,9 +27,10 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/impl/grpc_types.h>
 #include <grpc/support/log.h>
 
+#include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils_posix.h"
 #endif
@@ -110,7 +111,7 @@ PosixTcpOptions TcpOptionsFromEndpointConfig(const EndpointConfig& config) {
   return options;
 }
 
-#endif /* GRPC_POSIX_SOCKET_TCP */
+#endif  // GRPC_POSIX_SOCKET_TCP
 
 #ifdef GRPC_POSIX_SOCKETUTILS
 
@@ -138,4 +139,4 @@ close_and_error:
   return -1;
 }
 
-#endif /* GRPC_POSIX_SOCKETUTILS */
+#endif  // GRPC_POSIX_SOCKETUTILS