grpc 1.51.0 → 1.52.0.pre2

data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2016 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 2016 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>
 
@@ -23,6 +23,8 @@
 
 #include "absl/strings/string_view.h"
 
+#include <grpc/grpc.h>
+
 #include "src/core/lib/gprpp/status_helper.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 
@@ -50,7 +52,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 
-#include <grpc/impl/codegen/grpc_types.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
@@ -80,61 +81,61 @@ grpc_core::TraceFlag grpc_trace_cares_address_sorting(false,
 grpc_core::TraceFlag grpc_trace_cares_resolver(false, "cares_resolver");
 
 typedef struct fd_node {
-  /* default constructor exists only for linked list manipulation */
+  // default constructor exists only for linked list manipulation
   fd_node() : ev_driver(nullptr) {}
 
   explicit fd_node(grpc_ares_ev_driver* ev_driver) : ev_driver(ev_driver) {}
 
-  /** the owner of this fd node */
+  /// the owner of this fd node
   grpc_ares_ev_driver* const ev_driver;
-  /** a closure wrapping on_readable_locked, which should be
-     invoked when the grpc_fd in this node becomes readable. */
+  /// a closure wrapping on_readable_locked, which should be
+  /// invoked when the grpc_fd in this node becomes readable.
   grpc_closure read_closure ABSL_GUARDED_BY(&grpc_ares_request::mu);
-  /** a closure wrapping on_writable_locked, which should be
-     invoked when the grpc_fd in this node becomes writable. */
+  /// a closure wrapping on_writable_locked, which should be
+  /// invoked when the grpc_fd in this node becomes writable.
   grpc_closure write_closure ABSL_GUARDED_BY(&grpc_ares_request::mu);
-  /** next fd node in the list */
+  /// next fd node in the list
   struct fd_node* next ABSL_GUARDED_BY(&grpc_ares_request::mu);
 
-  /** wrapped fd that's polled by grpc's poller for the current platform */
+  /// wrapped fd that's polled by grpc's poller for the current platform
   grpc_core::GrpcPolledFd* grpc_polled_fd
       ABSL_GUARDED_BY(&grpc_ares_request::mu);
-  /** if the readable closure has been registered */
+  /// if the readable closure has been registered
   bool readable_registered ABSL_GUARDED_BY(&grpc_ares_request::mu);
-  /** if the writable closure has been registered */
+  /// if the writable closure has been registered
   bool writable_registered ABSL_GUARDED_BY(&grpc_ares_request::mu);
-  /** if the fd has been shutdown yet from grpc iomgr perspective */
+  /// if the fd has been shutdown yet from grpc iomgr perspective
   bool already_shutdown ABSL_GUARDED_BY(&grpc_ares_request::mu);
 } fd_node;
 
 struct grpc_ares_ev_driver {
   explicit grpc_ares_ev_driver(grpc_ares_request* request) : request(request) {}
 
-  /** the ares_channel owned by this event driver */
+  /// the ares_channel owned by this event driver
   ares_channel channel ABSL_GUARDED_BY(&grpc_ares_request::mu);
-  /** pollset set for driving the IO events of the channel */
+  /// pollset set for driving the IO events of the channel
   grpc_pollset_set* pollset_set ABSL_GUARDED_BY(&grpc_ares_request::mu);
-  /** refcount of the event driver */
+  /// refcount of the event driver
   gpr_refcount refs;
 
-  /** a list of grpc_fd that this event driver is currently using. */
+  /// a list of grpc_fd that this event driver is currently using.
   fd_node* fds ABSL_GUARDED_BY(&grpc_ares_request::mu);
-  /** is this event driver being shut down */
+  /// is this event driver being shut down
   bool shutting_down ABSL_GUARDED_BY(&grpc_ares_request::mu);
-  /** request object that's using this ev driver */
+  /// request object that's using this ev driver
   grpc_ares_request* const request;
-  /** Owned by the ev_driver. Creates new GrpcPolledFd's */
+  /// Owned by the ev_driver. Creates new GrpcPolledFd's
   std::unique_ptr<grpc_core::GrpcPolledFdFactory> polled_fd_factory
       ABSL_GUARDED_BY(&grpc_ares_request::mu);
-  /** query timeout in milliseconds */
+  /// query timeout in milliseconds
   int query_timeout_ms ABSL_GUARDED_BY(&grpc_ares_request::mu);
-  /** alarm to cancel active queries */
+  /// alarm to cancel active queries
   grpc_timer query_timeout ABSL_GUARDED_BY(&grpc_ares_request::mu);
-  /** cancels queries on a timeout */
+  /// cancels queries on a timeout
   grpc_closure on_timeout_locked ABSL_GUARDED_BY(&grpc_ares_request::mu);
-  /** alarm to poll ares_process on in case fd events don't happen */
+  /// alarm to poll ares_process on in case fd events don't happen
   grpc_timer ares_backup_poll_alarm ABSL_GUARDED_BY(&grpc_ares_request::mu);
-  /** polls ares_process on a periodic timer */
+  /// polls ares_process on a periodic timer
   grpc_closure on_ares_backup_poll_alarm_locked
       ABSL_GUARDED_BY(&grpc_ares_request::mu);
 };
@@ -142,17 +143,17 @@ struct grpc_ares_ev_driver {
 // TODO(apolcyn): make grpc_ares_hostbyname_request a sub-class
 // of GrpcAresQuery.
 typedef struct grpc_ares_hostbyname_request {
-  /** following members are set in create_hostbyname_request_locked
-   */
-  /** the top-level request instance */
+  /// following members are set in create_hostbyname_request_locked
+  ///
+  /// the top-level request instance
   grpc_ares_request* parent_request;
-  /** host to resolve, parsed from the name to resolve */
+  /// host to resolve, parsed from the name to resolve
   char* host;
-  /** port to fill in sockaddr_in, parsed from the name to resolve */
+  /// port to fill in sockaddr_in, parsed from the name to resolve
   uint16_t port;
-  /** is it a grpclb address */
+  /// is it a grpclb address
   bool is_balancer;
-  /** for logging and errors: the query type ("A" or "AAAA") */
+  /// for logging and errors: the query type ("A" or "AAAA")
   const char* qtype;
 } grpc_ares_hostbyname_request;
 
@@ -179,9 +180,9 @@ class GrpcAresQuery {
   const std::string& name() { return name_; }
 
  private:
-  /* the top level request instance */
+  // the top level request instance
   grpc_ares_request* r_;
-  /** for logging and errors */
+  /// for logging and errors
   const std::string name_;
 };
 
@@ -304,14 +305,14 @@ static void on_timeout(void* arg, grpc_error_handle error) {
 static void grpc_ares_notify_on_event_locked(grpc_ares_ev_driver* ev_driver)
     ABSL_EXCLUSIVE_LOCKS_REQUIRED(&grpc_ares_request::mu);
 
-/* In case of non-responsive DNS servers, dropped packets, etc., c-ares has
- * intelligent timeout and retry logic, which we can take advantage of by
- * polling ares_process_fd on time intervals. Overall, the c-ares library is
- * meant to be called into and given a chance to proceed name resolution:
- *   a) when fd events happen
- *   b) when some time has passed without fd events having happened
- * For the latter, we use this backup poller. Also see
- * https://github.com/grpc/grpc/pull/17688 description for more details. */
+// In case of non-responsive DNS servers, dropped packets, etc., c-ares has
+// intelligent timeout and retry logic, which we can take advantage of by
+// polling ares_process_fd on time intervals. Overall, the c-ares library is
+// meant to be called into and given a chance to proceed name resolution:
+//   a) when fd events happen
+//   b) when some time has passed without fd events having happened
+// For the latter, we use this backup poller. Also see
+// https://github.com/grpc/grpc/pull/17688 description for more details.
 static void on_ares_backup_poll_alarm(void* arg, grpc_error_handle error) {
   grpc_ares_ev_driver* driver = static_cast<grpc_ares_ev_driver*>(arg);
   grpc_core::MutexLock lock(&driver->request->mu);
@@ -616,8 +617,8 @@ void grpc_ares_complete_request_locked(grpc_ares_request* r)
   grpc_core::ExecCtx::Run(DEBUG_LOCATION, r->on_done, r->error);
 }
 
-/* Note that the returned object takes a reference to qtype, so
- * qtype must outlive it. */
+// Note that the returned object takes a reference to qtype, so
+// qtype must outlive it.
 static grpc_ares_hostbyname_request* create_hostbyname_request_locked(
     grpc_ares_request* parent_request, const char* host, uint16_t port,
     bool is_balancer, const char* qtype)
@@ -867,7 +868,7 @@ grpc_error_handle grpc_dns_lookup_ares_continued(
     int query_timeout_ms, std::string* host, std::string* port, bool check_port)
     ABSL_EXCLUSIVE_LOCKS_REQUIRED(r->mu) {
   grpc_error_handle error;
-  /* parse name, splitting it into host and port parts */
+  // parse name, splitting it into host and port parts
   grpc_core::SplitHostPort(name, host, port);
   if (host->empty()) {
     error =
@@ -1011,14 +1012,14 @@ static bool grpc_ares_maybe_resolve_localhost_manually_locked(
   return inner_maybe_resolve_localhost_manually_locked(r, name, default_port,
                                                        addrs, &host, &port);
 }
-#else  /* GRPC_ARES_RESOLVE_LOCALHOST_MANUALLY */
+#else   // GRPC_ARES_RESOLVE_LOCALHOST_MANUALLY
 static bool grpc_ares_maybe_resolve_localhost_manually_locked(
     const grpc_ares_request* /*r*/, const char* /*name*/,
     const char* /*default_port*/,
     std::unique_ptr<grpc_core::ServerAddressList>* /*addrs*/) {
   return false;
 }
-#endif /* GRPC_ARES_RESOLVE_LOCALHOST_MANUALLY */
+#endif  // GRPC_ARES_RESOLVE_LOCALHOST_MANUALLY
 
 static grpc_ares_request* grpc_dns_lookup_hostname_ares_impl(
     const char* dns_server, const char* name, const char* default_port,
@@ -1103,7 +1104,7 @@ grpc_ares_request* grpc_dns_lookup_srv_ares_impl(
     return r;
   }
   r->pending_queries = 1;
-  /* Query the SRV record */
+  // Query the SRV record
   std::string service_name = absl::StrCat("_grpclb._tcp.", host);
   GrpcAresQuery* srv_query = new GrpcAresQuery(r, service_name);
   ares_query(r->ev_driver->channel, service_name.c_str(), ns_c_in, ns_t_srv,
@@ -1141,7 +1142,7 @@ grpc_ares_request* grpc_dns_lookup_txt_ares_impl(
     return r;
   }
   r->pending_queries = 1;
-  /* Query the TXT record */
+  // Query the TXT record
   std::string config_name = absl::StrCat("_grpc_config.", host);
   GrpcAresQuery* txt_query = new GrpcAresQuery(r, config_name);
   ares_search(r->ev_driver->channel, config_name.c_str(), ns_c_in, ns_t_txt,
@@ -1201,4 +1202,4 @@ grpc_error_handle grpc_ares_init(void) { return absl::OkStatus(); }
 void grpc_ares_cleanup(void) {}
 #endif  // GPR_WINDOWS
 
-#endif /* GRPC_ARES == 1 */
+#endif  // GRPC_ARES == 1

data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2016 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 2016 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_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H
 #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H
@@ -54,41 +54,41 @@ extern grpc_core::TraceFlag grpc_trace_cares_resolver;
 typedef struct grpc_ares_ev_driver grpc_ares_ev_driver;
 
 struct grpc_ares_request {
-  /** synchronizes access to this request, and also to associated
-   * ev_driver and fd_node objects */
+  /// synchronizes access to this request, and also to associated
+  /// ev_driver and fd_node objects
   grpc_core::Mutex mu;
-  /** indicates the DNS server to use, if specified */
+  /// indicates the DNS server to use, if specified
   struct ares_addr_port_node dns_server_addr ABSL_GUARDED_BY(mu);
-  /** following members are set in grpc_resolve_address_ares_impl */
-  /** closure to call when the request completes */
+  /// following members are set in grpc_resolve_address_ares_impl
+  /// closure to call when the request completes
   grpc_closure* on_done ABSL_GUARDED_BY(mu) = nullptr;
-  /** the pointer to receive the resolved addresses */
+  /// the pointer to receive the resolved addresses
   std::unique_ptr<grpc_core::ServerAddressList>* addresses_out
       ABSL_GUARDED_BY(mu);
-  /** the pointer to receive the resolved balancer addresses */
+  /// the pointer to receive the resolved balancer addresses
   std::unique_ptr<grpc_core::ServerAddressList>* balancer_addresses_out
       ABSL_GUARDED_BY(mu);
-  /** the pointer to receive the service config in JSON */
+  /// the pointer to receive the service config in JSON
   char** service_config_json_out ABSL_GUARDED_BY(mu) = nullptr;
-  /** the evernt driver used by this request */
+  /// the event driver used by this request
   grpc_ares_ev_driver* ev_driver ABSL_GUARDED_BY(mu) = nullptr;
-  /** number of ongoing queries */
+  /// number of ongoing queries
   size_t pending_queries ABSL_GUARDED_BY(mu) = 0;
-  /** the errors explaining query failures, appended to in query callbacks */
+  /// the errors explaining query failures, appended to in query callbacks
   grpc_error_handle error ABSL_GUARDED_BY(mu);
 };
 
-/* Asynchronously resolve \a name (A/AAAA records only).
-  It uses \a default_port if a port isn't designated in \a name, otherwise it
-  uses the port in \a name. grpc_ares_init() must be called at least once before
-  this function. The returned grpc_ares_request object is owned by the caller
-  and it is safe to free after on_done is called back.
-
-  Note on synchronization: \a as on_done might be called from another thread
-  ~immediately, access to the grpc_ares_request* return value must be
-  synchronized by the caller. TODO(apolcyn): we should remove this requirement
-  by changing this API to use two phase initialization - one API to create
-  the grpc_ares_request* and another to start the async work. */
+// Asynchronously resolve \a name (A/AAAA records only).
+// It uses \a default_port if a port isn't designated in \a name, otherwise it
+// uses the port in \a name. grpc_ares_init() must be called at least once
+// before this function. The returned grpc_ares_request object is owned by the
+// caller and it is safe to free after on_done is called back.
+
+// Note on synchronization: \a as on_done might be called from another thread
+//~immediately, access to the grpc_ares_request* return value must be
+// synchronized by the caller. TODO(apolcyn): we should remove this requirement
+// by changing this API to use two phase initialization - one API to create
+// the grpc_ares_request* and another to start the async work.
 extern grpc_ares_request* (*grpc_dns_lookup_hostname_ares)(
     const char* dns_server, const char* name, const char* default_port,
     grpc_pollset_set* interested_parties, grpc_closure* on_done,
@@ -110,28 +110,27 @@ extern grpc_ares_request* (*grpc_dns_lookup_txt_ares)(
     grpc_pollset_set* interested_parties, grpc_closure* on_done,
     char** service_config_json, int query_timeout_ms);
 
-/* Cancel the pending grpc_ares_request \a request */
+// Cancel the pending grpc_ares_request \a request
 extern void (*grpc_cancel_ares_request)(grpc_ares_request* request);
 
-/* Initialize gRPC ares wrapper. Must be called at least once before
-   grpc_resolve_address_ares(). */
+// Initialize gRPC ares wrapper. Must be called at least once before
+// grpc_resolve_address_ares().
 grpc_error_handle grpc_ares_init(void);
 
-/* Uninitialized gRPC ares wrapper. If there was more than one previous call to
-   grpc_ares_init(), this function uninitializes the gRPC ares wrapper only if
-   it has been called the same number of times as grpc_ares_init(). */
+// Uninitialized gRPC ares wrapper. If there was more than one previous call to
+// grpc_ares_init(), this function uninitializes the gRPC ares wrapper only if
+// it has been called the same number of times as grpc_ares_init().
 void grpc_ares_cleanup(void);
 
-/* Indicates whether or not AAAA queries should be attempted. */
-/* E.g., return false if ipv6 is known to not be available. */
+// Indicates whether or not AAAA queries should be attempted.
+// E.g., return false if ipv6 is known to not be available.
 bool grpc_ares_query_ipv6();
 
-/* Sorts destinations in lb_addrs according to RFC 6724. */
+// Sorts destinations in lb_addrs according to RFC 6724.
 void grpc_cares_wrapper_address_sorting_sort(
     const grpc_ares_request* request, grpc_core::ServerAddressList* addresses);
 
-/* Exposed in this header for C-core tests only */
+// Exposed in this header for C-core tests only
 extern void (*grpc_ares_test_only_inject_config)(ares_channel channel);
 
-#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H \
-        */
+#endif  // GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H

data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2016 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 2016 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>
 
@@ -26,4 +26,4 @@
 
 bool grpc_ares_query_ipv6() { return grpc_ipv6_loopback_available(); }
 
-#endif /* GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) */
+#endif  // GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER)

data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2016 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 2016 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>
 
@@ -32,4 +32,4 @@
 
 bool grpc_ares_query_ipv6() { return grpc_ipv6_loopback_available(); }
 
-#endif /* GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER) */
+#endif  // GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)

data/src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.h

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2019 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 2019 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_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_DNS_RESOLVER_SELECTION_H
 #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_DNS_RESOLVER_SELECTION_H
@@ -26,5 +26,4 @@
 
 GPR_GLOBAL_CONFIG_DECLARE_STRING(grpc_dns_resolver);
 
-#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_DNS_RESOLVER_SELECTION_H \
-        */
+#endif  // GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_DNS_RESOLVER_SELECTION_H

data/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc

@@ -30,7 +30,7 @@
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
 
-#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/grpc.h>
 #include <grpc/support/log.h>
 
 #include "src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.h"

data/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h

@@ -22,7 +22,7 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/grpc.h>
 
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/ref_counted.h"

data/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc

@@ -34,7 +34,6 @@
 
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
-#include <grpc/impl/codegen/grpc_types.h>
 #include <grpc/support/log.h>
 
 #include "src/core/ext/xds/xds_bootstrap.h"