grpc 1.67.0.pre1 → 1.68.1

data/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h

@@ -3,7 +3,8 @@
  *     xds/type/v3/cel.proto
  *
  * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
+ * regenerated.
+ * NO CHECKED-IN PROTOBUF GENCODE */
 
 #ifndef XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_
 #define XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_

data/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c

@@ -3,7 +3,8 @@
  *     xds/type/v3/range.proto
  *
  * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
+ * regenerated.
+ * NO CHECKED-IN PROTOBUF GENCODE */
 
 #include "upb/reflection/def.h"
 #include "xds/type/v3/range.upbdefs.h"

data/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h

@@ -3,7 +3,8 @@
  *     xds/type/v3/range.proto
  *
  * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
+ * regenerated.
+ * NO CHECKED-IN PROTOBUF GENCODE */
 
 #ifndef XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_
 #define XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_

data/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c

@@ -3,7 +3,8 @@
  *     xds/type/v3/typed_struct.proto
  *
  * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
+ * regenerated.
+ * NO CHECKED-IN PROTOBUF GENCODE */
 
 #include "upb/reflection/def.h"
 #include "xds/type/v3/typed_struct.upbdefs.h"

data/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h

@@ -3,7 +3,8 @@
  *     xds/type/v3/typed_struct.proto
  *
  * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
+ * regenerated.
+ * NO CHECKED-IN PROTOBUF GENCODE */
 
 #ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_
 #define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_

data/src/core/filter/blackboard.cc

@@ -0,0 +1,33 @@
+//
+// Copyright 2024 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 "src/core/filter/blackboard.h"
+
+namespace grpc_core {
+
+RefCountedPtr<Blackboard::Entry> Blackboard::Get(UniqueTypeName type,
+                                                 const std::string& key) const {
+  auto it = map_.find(std::make_pair(type, key));
+  if (it == map_.end()) return nullptr;
+  return it->second;
+}
+
+void Blackboard::Set(UniqueTypeName type, const std::string& key,
+                     RefCountedPtr<Entry> entry) {
+  map_[std::make_pair(type, key)] = std::move(entry);
+}
+
+}  // namespace grpc_core

data/src/core/filter/blackboard.h

@@ -0,0 +1,70 @@
+//
+// Copyright 2024 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_SRC_CORE_FILTER_BLACKBOARD_H
+#define GRPC_SRC_CORE_FILTER_BLACKBOARD_H
+
+#include <string>
+#include <utility>
+
+#include "absl/container/flat_hash_map.h"
+#include "absl/strings/string_view.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/util/debug_location.h"
+#include "src/core/util/ref_counted.h"
+#include "src/core/util/ref_counted_ptr.h"
+#include "src/core/util/unique_type_name.h"
+#include "src/core/util/useful.h"
+
+namespace grpc_core {
+
+// A blackboard is a place where dynamic filters can stash global state
+// that they may want to retain across resolver updates.  Entries are
+// identified by by the unique type and a name that identifies the instance,
+// which means that it's possible for two filter instances to use the same
+// type (e.g., if there are two instantiations of the same filter).
+class Blackboard : public RefCounted<Blackboard> {
+ public:
+  // All entries must derive from this type.
+  // They must also have a static method with the following signature:
+  //  static UniqueTypeName Type();
+  class Entry : public RefCounted<Entry> {};
+
+  // Returns an entry for a particular type and name, or null if not present.
+  template <typename T>
+  RefCountedPtr<T> Get(const std::string& key) const {
+    return Get(T::Type(), key).template TakeAsSubclass<T>();
+  }
+
+  // Sets an entry for a particular type and name.
+  template <typename T>
+  void Set(const std::string& key, RefCountedPtr<T> entry) {
+    Set(T::Type(), key, std::move(entry));
+  }
+
+ private:
+  RefCountedPtr<Entry> Get(UniqueTypeName type, const std::string& key) const;
+  void Set(UniqueTypeName type, const std::string& key,
+           RefCountedPtr<Entry> entry);
+
+  absl::flat_hash_map<std::pair<UniqueTypeName, std::string>,
+                      RefCountedPtr<Entry>>
+      map_;
+};
+
+}  // namespace grpc_core
+
+#endif  // GRPC_SRC_CORE_FILTER_BLACKBOARD_H

data/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc

@@ -16,23 +16,22 @@
 
 #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/handshaker_factory.h"
 #include "src/core/handshaker/handshaker_registry.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/gprpp/debug_location.h"
-#include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/util/debug_location.h"
+#include "src/core/util/ref_counted_ptr.h"
 
 namespace grpc_core {
 

data/src/core/handshaker/handshaker.cc

@@ -18,6 +18,11 @@
 
 #include "src/core/handshaker/handshaker.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <string>
@@ -29,22 +34,14 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gprpp/debug_location.h"
-#include "src/core/lib/gprpp/status_helper.h"
-#include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/endpoint.h"
-#include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/event_engine_shims/endpoint.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/util/debug_location.h"
+#include "src/core/util/status_helper.h"
+#include "src/core/util/time.h"
 
 using ::grpc_event_engine::experimental::EventEngine;
 

data/src/core/handshaker/handshaker.h

@@ -19,28 +19,26 @@
 #ifndef GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_H
 #define GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <memory>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/container/inlined_vector.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/gprpp/orphanable.h"
-#include "src/core/lib/gprpp/ref_counted.h"
-#include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/gprpp/sync.h"
-#include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/tcp_server.h"
 #include "src/core/lib/slice/slice_buffer.h"
+#include "src/core/util/orphanable.h"
+#include "src/core/util/ref_counted.h"
+#include "src/core/util/ref_counted_ptr.h"
+#include "src/core/util/sync.h"
+#include "src/core/util/time.h"
 
 namespace grpc_core {
 

data/src/core/handshaker/handshaker_registry.cc

@@ -18,13 +18,12 @@
 
 #include "src/core/handshaker/handshaker_registry.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 void HandshakerRegistry::Builder::RegisterHandshakerFactory(

data/src/core/handshaker/handshaker_registry.h

@@ -19,11 +19,11 @@
 #ifndef GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_REGISTRY_H
 #define GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_REGISTRY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/handshaker_factory.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"

data/src/core/handshaker/http_connect/http_connect_handshaker.cc

@@ -18,6 +18,10 @@
 
 #include "src/core/handshaker/http_connect/http_connect_handshaker.h"
 
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <limits.h>
 #include <string.h>
 
@@ -31,20 +35,11 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/handshaker_factory.h"
 #include "src/core/handshaker/handshaker_registry.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/gprpp/debug_location.h"
-#include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/error.h"
@@ -55,7 +50,9 @@
 #include "src/core/lib/slice/slice_buffer.h"
 #include "src/core/util/http_client/format_request.h"
 #include "src/core/util/http_client/parser.h"
+#include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/string.h"
+#include "src/core/util/sync.h"
 
 namespace grpc_core {
 
@@ -279,7 +276,7 @@ void HttpConnectHandshaker::DoHandshake(
     for (size_t i = 0; i < num_header_strings; ++i) {
       char* sep = strchr(header_strings[i], ':');
       if (sep == nullptr) {
-        LOG(ERROR) << "skipping unparseable HTTP CONNECT header: "
+        LOG(ERROR) << "skipping unparsable HTTP CONNECT header: "
                    << header_strings[i];
         continue;
       }

data/src/core/handshaker/http_connect/http_proxy_mapper.cc

@@ -18,6 +18,9 @@
 
 #include "src/core/handshaker/http_connect/http_proxy_mapper.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -38,21 +41,16 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/http_connect/http_connect_handshaker.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/gprpp/env.h"
-#include "src/core/lib/gprpp/host_port.h"
-#include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/iomgr/resolve_address.h"
-#include "src/core/lib/uri/uri_parser.h"
+#include "src/core/util/env.h"
+#include "src/core/util/host_port.h"
+#include "src/core/util/memory.h"
 #include "src/core/util/string.h"
+#include "src/core/util/uri.h"
 
 namespace grpc_core {
 namespace {

data/src/core/handshaker/http_connect/http_proxy_mapper.h

@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_HTTP_PROXY_MAPPER_H
 #define GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_HTTP_PROXY_MAPPER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/proxy_mapper.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"

data/src/core/handshaker/http_connect/xds_http_proxy_mapper.cc

@@ -0,0 +1,57 @@
+//
+// Copyright 2024 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 "src/core/handshaker/http_connect/xds_http_proxy_mapper.h"
+
+#include <memory>
+#include <string>
+
+#include "absl/log/log.h"
+#include "absl/types/optional.h"
+#include "src/core/handshaker/http_connect/http_connect_handshaker.h"
+#include "src/core/lib/address_utils/parse_address.h"
+#include "src/core/lib/address_utils/sockaddr_utils.h"
+#include "src/core/lib/channel/channel_args.h"
+#include "src/core/xds/grpc/xds_endpoint.h"
+
+namespace grpc_core {
+
+absl::optional<grpc_resolved_address> XdsHttpProxyMapper::MapAddress(
+    const grpc_resolved_address& endpoint_address, ChannelArgs* args) {
+  auto proxy_address_str = args->GetString(GRPC_ARG_XDS_HTTP_PROXY);
+  if (!proxy_address_str.has_value()) return absl::nullopt;
+  auto proxy_address = StringToSockaddr(*proxy_address_str);
+  if (!proxy_address.ok()) {
+    LOG(ERROR) << "error parsing address \"" << *proxy_address_str
+               << "\": " << proxy_address.status();
+    return absl::nullopt;
+  }
+  auto endpoint_address_str = grpc_sockaddr_to_string(&endpoint_address, true);
+  if (!endpoint_address_str.ok()) {
+    LOG(ERROR) << "error converting address to string: "
+               << endpoint_address_str.status();
+    return absl::nullopt;
+  }
+  *args = args->Set(GRPC_ARG_HTTP_CONNECT_SERVER, *endpoint_address_str);
+  return *proxy_address;
+}
+
+void RegisterXdsHttpProxyMapper(CoreConfiguration::Builder* builder) {
+  builder->proxy_mapper_registry()->Register(
+      /*at_start=*/true, std::make_unique<XdsHttpProxyMapper>());
+}
+
+}  // namespace grpc_core

data/src/core/handshaker/http_connect/xds_http_proxy_mapper.h

@@ -0,0 +1,46 @@
+//
+// Copyright 2024 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_SRC_CORE_HANDSHAKER_HTTP_CONNECT_XDS_HTTP_PROXY_MAPPER_H
+#define GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_XDS_HTTP_PROXY_MAPPER_H
+
+#include <string>
+
+#include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
+#include "src/core/handshaker/proxy_mapper.h"
+#include "src/core/lib/channel/channel_args.h"
+#include "src/core/lib/config/core_configuration.h"
+#include "src/core/lib/iomgr/resolved_address.h"
+
+namespace grpc_core {
+
+class XdsHttpProxyMapper final : public ProxyMapperInterface {
+ public:
+  absl::optional<std::string> MapName(absl::string_view /*server_uri*/,
+                                      ChannelArgs* /*args*/) override {
+    return absl::nullopt;
+  }
+
+  absl::optional<grpc_resolved_address> MapAddress(
+      const grpc_resolved_address& address, ChannelArgs* args) override;
+};
+
+void RegisterXdsHttpProxyMapper(CoreConfiguration::Builder* builder);
+
+}  // namespace grpc_core
+
+#endif  // GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_XDS_HTTP_PROXY_MAPPER_H

data/src/core/handshaker/proxy_mapper.h

@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_H
 #define GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 

data/src/core/handshaker/proxy_mapper_registry.cc

@@ -18,6 +18,8 @@
 
 #include "src/core/handshaker/proxy_mapper_registry.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <memory>
 #include <utility>
@@ -25,8 +27,6 @@
 
 #include "absl/types/optional.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 void ProxyMapperRegistry::Builder::Register(

data/src/core/handshaker/proxy_mapper_registry.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_REGISTRY_H
 #define GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_REGISTRY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -26,9 +28,6 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/proxy_mapper.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"

data/src/core/handshaker/security/secure_endpoint.cc

@@ -18,6 +18,14 @@
 
 #include "src/core/handshaker/security/secure_endpoint.h"
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/memory_request.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
 #include <inttypes.h>
 
 #include <algorithm>
@@ -31,21 +39,7 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/memory_request.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gprpp/debug_location.h"
-#include "src/core/lib/gprpp/orphanable.h"
-#include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/error.h"
@@ -58,7 +52,11 @@
 #include "src/core/lib/slice/slice_string_helpers.h"
 #include "src/core/tsi/transport_security_grpc.h"
 #include "src/core/tsi/transport_security_interface.h"
+#include "src/core/util/debug_location.h"
+#include "src/core/util/orphanable.h"
+#include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/string.h"
+#include "src/core/util/sync.h"
 
 #define STAGING_BUFFER_SIZE 8192
 

data/src/core/handshaker/security/secure_endpoint.h

@@ -19,15 +19,14 @@
 #ifndef GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURE_ENDPOINT_H
 #define GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURE_ENDPOINT_H
 
-#include <stddef.h>
-
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/iomgr/endpoint.h"
+#include "src/core/util/orphanable.h"
 
 // Takes ownership of protector, zero_copy_protector, and to_wrap, and refs
 // leftover_slices. If zero_copy_protector is not NULL, protector will never be