Chiebot-Mirror
/
grpc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'transport-refs-4' into transport-refs-5

Browse Source
pull/36632/head
Craig Tiller 11 months ago
parent b589d49e6c f64a8193f3
commit b9d3d4a528
157 changed files with 20433 additions and 1197 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      .github/CODEOWNERS
  2. 30
      BUILD
  3. 54
      CMakeLists.txt
  4. 50
      Makefile
  5. 108
      Package.swift
  6. 2
      _metadata.py
  7. 110
      build_autogenerated.yaml
  8. 4
      build_handwritten.yaml
  9. 53
      config.m4
  10. 52
      config.w32
  11. 3
      doc/g_stands_for.md
  12. 126
      gRPC-C++.podspec
  13. 170
      gRPC-Core.podspec
  14. 2
      gRPC-ProtoRPC.podspec
  15. 2
      gRPC-RxLibrary.podspec
  16. 2
      gRPC.podspec
  17. 108
      grpc.gemspec
  18. 4
      include/grpcpp/version_info.h
  19. 114
      package.xml
  20. 86
      src/core/BUILD
  21. 12
      src/core/lib/gprpp/validation_errors.cc
  22. 11
      src/core/lib/gprpp/validation_errors.h
  23. 2
      src/core/lib/security/credentials/xds/xds_credentials.cc
  24. 2
      src/core/lib/security/credentials/xds/xds_credentials.h
  25. 2
      src/core/lib/surface/version.cc
  26. 6
      src/core/load_balancing/xds/cds.cc
  27. 12
      src/core/load_balancing/xds/xds_cluster_impl.cc
  28. 2
      src/core/load_balancing/xds/xds_override_host.cc
  29. 2
      src/core/load_balancing/xds/xds_wrr_locality.cc
  30. 4
      src/core/resolver/google_c2p/google_c2p_resolver.cc
  31. 2
      src/core/resolver/xds/xds_dependency_manager.cc
  32. 10
      src/core/resolver/xds/xds_dependency_manager.h
  33. 14
      src/core/resolver/xds/xds_resolver.cc
  34. 20
      src/core/server/xds_server_config_fetcher.cc
  35. 2
      src/core/xds/grpc/certificate_provider_store.cc
  36. 6
      src/core/xds/grpc/certificate_provider_store.h
  37. 2
      src/core/xds/grpc/file_watcher_certificate_provider_factory.cc
  38. 6
      src/core/xds/grpc/file_watcher_certificate_provider_factory.h
  39. 6
      src/core/xds/grpc/upb_utils.h
  40. 4
      src/core/xds/grpc/xds_audit_logger_registry.cc
  41. 8
      src/core/xds/grpc/xds_audit_logger_registry.h
  42. 2
      src/core/xds/grpc/xds_bootstrap_grpc.cc
  43. 18
      src/core/xds/grpc/xds_bootstrap_grpc.h
  44. 2
      src/core/xds/grpc/xds_certificate_provider.cc
  45. 6
      src/core/xds/grpc/xds_certificate_provider.h
  46. 18
      src/core/xds/grpc/xds_client_grpc.cc
  47. 14
      src/core/xds/grpc/xds_client_grpc.h
  48. 12
      src/core/xds/grpc/xds_cluster.cc
  49. 20
      src/core/xds/grpc/xds_cluster.h
  50. 2
      src/core/xds/grpc/xds_cluster_specifier_plugin.cc
  51. 8
      src/core/xds/grpc/xds_cluster_specifier_plugin.h
  52. 8
      src/core/xds/grpc/xds_common_types.cc
  53. 8
      src/core/xds/grpc/xds_common_types.h
  54. 6
      src/core/xds/grpc/xds_enabled_server.h
  55. 8
      src/core/xds/grpc/xds_endpoint.cc
  56. 14
      src/core/xds/grpc/xds_endpoint.h
  57. 2
      src/core/xds/grpc/xds_health_status.cc
  58. 6
      src/core/xds/grpc/xds_health_status.h
  59. 6
      src/core/xds/grpc/xds_http_fault_filter.cc
  60. 12
      src/core/xds/grpc/xds_http_fault_filter.h
  61. 8
      src/core/xds/grpc/xds_http_filters.cc
  62. 10
      src/core/xds/grpc/xds_http_filters.h
  63. 10
      src/core/xds/grpc/xds_http_rbac_filter.cc
  64. 12
      src/core/xds/grpc/xds_http_rbac_filter.h
  65. 8
      src/core/xds/grpc/xds_http_stateful_session_filter.cc
  66. 12
      src/core/xds/grpc/xds_http_stateful_session_filter.h
  67. 4
      src/core/xds/grpc/xds_lb_policy_registry.cc
  68. 8
      src/core/xds/grpc/xds_lb_policy_registry.h
  69. 8
      src/core/xds/grpc/xds_listener.cc
  70. 20
      src/core/xds/grpc/xds_listener.h
  71. 14
      src/core/xds/grpc/xds_route_config.cc
  72. 18
      src/core/xds/grpc/xds_route_config.h
  73. 4
      src/core/xds/grpc/xds_routing.cc
  74. 12
      src/core/xds/grpc/xds_routing.h
  75. 6
      src/core/xds/grpc/xds_transport_grpc.cc
  76. 10
      src/core/xds/grpc/xds_transport_grpc.h
  77. 6
      src/core/xds/xds_client/xds_api.cc
  78. 10
      src/core/xds/xds_client/xds_api.h
  79. 2
      src/core/xds/xds_client/xds_bootstrap.cc
  80. 6
      src/core/xds/xds_client/xds_bootstrap.h
  81. 6
      src/core/xds/xds_client/xds_channel_args.h
  82. 10
      src/core/xds/xds_client/xds_client.cc
  83. 18
      src/core/xds/xds_client/xds_client.h
  84. 4
      src/core/xds/xds_client/xds_client_stats.cc
  85. 8
      src/core/xds/xds_client/xds_client_stats.h
  86. 6
      src/core/xds/xds_client/xds_metrics.h
  87. 8
      src/core/xds/xds_client/xds_resource_type.h
  88. 10
      src/core/xds/xds_client/xds_resource_type_impl.h
  89. 8
      src/core/xds/xds_client/xds_transport.h
  90. 2
      src/cpp/ext/csm/csm_observability.cc
  91. 2
      src/cpp/server/xds_server_builder.cc
  92. 2
      src/csharp/build/dependencies.props
  93. 2
      src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
  94. 2
      src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
  95. 2
      src/objective-c/GRPCClient/version.h
  96. 2
      src/objective-c/tests/version.h
  97. 2
      src/php/composer.json
  98. 2
      src/php/ext/grpc/version.h
  99. 2
      src/python/grpcio/grpc/_grpcio_metadata.py
  100. 48
      src/python/grpcio/grpc_core_dependencies.py
  101. Some files were not shown because too many files have changed in this diff Show More

11
.github/CODEOWNERS
Unescape View File

@ -1,11 +1,12 @@
/**/OWNERS @markdroth @a11r
/bazel/** @veblush @gnossen
/bazel/experiments.yaml
/cmake/** @veblush @apolcyn
/src/core/ext/filters/client_channel/** @markdroth
/src/core/client_channel/** @markdroth
/src/core/ext/transport/chttp2/transport/** @ctiller
/src/core/ext/xds/** @markdroth
/src/core/lib/resolver/** @markdroth
/src/core/lib/service_config/** @markdroth
/src/core/load_balancing/** @markdroth
/src/core/resolver/** @markdroth
/src/core/server/xds* @markdroth
/src/core/service_config/** @markdroth
/src/core/xds/** @markdroth
/tools/dockerfile/** @drfloob @apolcyn @gnossen
/tools/run_tests/xds_k8s_test_driver/** @sergiitk @XuanWang-Amos @gnossen

30
BUILD
Unescape View File

@ -242,11 +242,11 @@ config_setting(
python_config_settings()
# This should be updated along with build_handwritten.yaml
g_stands_for = "grateful" # @unused
g_stands_for = "gnarly" # @unused
core_version = "41.0.0" # @unused
version = "1.64.0-dev" # @unused
version = "1.65.0-dev" # @unused
GPR_PUBLIC_HDRS = [
"include/grpc/support/alloc.h",
@ -4317,21 +4317,21 @@ grpc_cc_library(
grpc_cc_library(
name = "xds_client",
srcs = [
"//src/core:ext/xds/xds_api.cc",
"//src/core:ext/xds/xds_bootstrap.cc",
"//src/core:ext/xds/xds_client.cc",
"//src/core:ext/xds/xds_client_stats.cc",
"//src/core:xds/xds_client/xds_api.cc",
"//src/core:xds/xds_client/xds_bootstrap.cc",
"//src/core:xds/xds_client/xds_client.cc",
"//src/core:xds/xds_client/xds_client_stats.cc",
],
hdrs = [
"//src/core:ext/xds/xds_api.h",
"//src/core:ext/xds/xds_bootstrap.h",
"//src/core:ext/xds/xds_channel_args.h",
"//src/core:ext/xds/xds_client.h",
"//src/core:ext/xds/xds_client_stats.h",
"//src/core:ext/xds/xds_metrics.h",
"//src/core:ext/xds/xds_resource_type.h",
"//src/core:ext/xds/xds_resource_type_impl.h",
"//src/core:ext/xds/xds_transport.h",
"//src/core:xds/xds_client/xds_api.h",
"//src/core:xds/xds_client/xds_bootstrap.h",
"//src/core:xds/xds_client/xds_channel_args.h",
"//src/core:xds/xds_client/xds_client.h",
"//src/core:xds/xds_client/xds_client_stats.h",
"//src/core:xds/xds_client/xds_metrics.h",
"//src/core:xds/xds_client/xds_resource_type.h",
"//src/core:xds/xds_client/xds_resource_type_impl.h",
"//src/core:xds/xds_client/xds_transport.h",
],
external_deps = [
"absl/base:core_headers",

54
CMakeLists.txt generated
Unescape View File

@ -25,11 +25,11 @@
cmake_minimum_required(VERSION 3.13)
set(PACKAGE_NAME "grpc")
set(PACKAGE_VERSION "1.64.0-dev")
set(PACKAGE_VERSION "1.65.0-dev")
set(gRPC_CORE_VERSION "41.0.0")
set(gRPC_CORE_SOVERSION "41")
set(gRPC_CPP_VERSION "1.64.0-dev")
set(gRPC_CPP_SOVERSION "1.64")
set(gRPC_CPP_VERSION "1.65.0-dev")
set(gRPC_CPP_SOVERSION "1.65")
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}")
set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/")
@ -2213,30 +2213,6 @@ add_library(grpc
src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c
src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c
src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c
src/core/ext/xds/certificate_provider_store.cc
src/core/ext/xds/file_watcher_certificate_provider_factory.cc
src/core/ext/xds/xds_api.cc
src/core/ext/xds/xds_audit_logger_registry.cc
src/core/ext/xds/xds_bootstrap.cc
src/core/ext/xds/xds_bootstrap_grpc.cc
src/core/ext/xds/xds_certificate_provider.cc
src/core/ext/xds/xds_client.cc
src/core/ext/xds/xds_client_grpc.cc
src/core/ext/xds/xds_client_stats.cc
src/core/ext/xds/xds_cluster.cc
src/core/ext/xds/xds_cluster_specifier_plugin.cc
src/core/ext/xds/xds_common_types.cc
src/core/ext/xds/xds_endpoint.cc
src/core/ext/xds/xds_health_status.cc
src/core/ext/xds/xds_http_fault_filter.cc
src/core/ext/xds/xds_http_filters.cc
src/core/ext/xds/xds_http_rbac_filter.cc
src/core/ext/xds/xds_http_stateful_session_filter.cc
src/core/ext/xds/xds_lb_policy_registry.cc
src/core/ext/xds/xds_listener.cc
src/core/ext/xds/xds_route_config.cc
src/core/ext/xds/xds_routing.cc
src/core/ext/xds/xds_transport_grpc.cc
src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
src/core/handshaker/handshaker.cc
src/core/handshaker/handshaker_registry.cc
@ -2623,6 +2599,30 @@ add_library(grpc
src/core/tsi/ssl_transport_security_utils.cc
src/core/tsi/transport_security.cc
src/core/tsi/transport_security_grpc.cc
src/core/xds/grpc/certificate_provider_store.cc
src/core/xds/grpc/file_watcher_certificate_provider_factory.cc
src/core/xds/grpc/xds_audit_logger_registry.cc
src/core/xds/grpc/xds_bootstrap_grpc.cc
src/core/xds/grpc/xds_certificate_provider.cc
src/core/xds/grpc/xds_client_grpc.cc
src/core/xds/grpc/xds_cluster.cc
src/core/xds/grpc/xds_cluster_specifier_plugin.cc
src/core/xds/grpc/xds_common_types.cc
src/core/xds/grpc/xds_endpoint.cc
src/core/xds/grpc/xds_health_status.cc
src/core/xds/grpc/xds_http_fault_filter.cc
src/core/xds/grpc/xds_http_filters.cc
src/core/xds/grpc/xds_http_rbac_filter.cc
src/core/xds/grpc/xds_http_stateful_session_filter.cc
src/core/xds/grpc/xds_lb_policy_registry.cc
src/core/xds/grpc/xds_listener.cc
src/core/xds/grpc/xds_route_config.cc
src/core/xds/grpc/xds_routing.cc
src/core/xds/grpc/xds_transport_grpc.cc
src/core/xds/xds_client/xds_api.cc
src/core/xds/xds_client/xds_bootstrap.cc
src/core/xds/xds_client/xds_client.cc
src/core/xds/xds_client/xds_client_stats.cc
)
target_compile_features(grpc PUBLIC cxx_std_14)

50
Makefile generated
Unescape View File

@ -368,7 +368,7 @@ Q = @
endif
CORE_VERSION = 41.0.0
CPP_VERSION = 1.64.0-dev
CPP_VERSION = 1.65.0-dev
CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
@ -1054,30 +1054,6 @@ LIBGRPC_SRC = \
src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c \
src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c \
src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c \
src/core/ext/xds/certificate_provider_store.cc \
src/core/ext/xds/file_watcher_certificate_provider_factory.cc \
src/core/ext/xds/xds_api.cc \
src/core/ext/xds/xds_audit_logger_registry.cc \
src/core/ext/xds/xds_bootstrap.cc \
src/core/ext/xds/xds_bootstrap_grpc.cc \
src/core/ext/xds/xds_certificate_provider.cc \
src/core/ext/xds/xds_client.cc \
src/core/ext/xds/xds_client_grpc.cc \
src/core/ext/xds/xds_client_stats.cc \
src/core/ext/xds/xds_cluster.cc \
src/core/ext/xds/xds_cluster_specifier_plugin.cc \
src/core/ext/xds/xds_common_types.cc \
src/core/ext/xds/xds_endpoint.cc \
src/core/ext/xds/xds_health_status.cc \
src/core/ext/xds/xds_http_fault_filter.cc \
src/core/ext/xds/xds_http_filters.cc \
src/core/ext/xds/xds_http_rbac_filter.cc \
src/core/ext/xds/xds_http_stateful_session_filter.cc \
src/core/ext/xds/xds_lb_policy_registry.cc \
src/core/ext/xds/xds_listener.cc \
src/core/ext/xds/xds_route_config.cc \
src/core/ext/xds/xds_routing.cc \
src/core/ext/xds/xds_transport_grpc.cc \
src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \
src/core/handshaker/handshaker.cc \
src/core/handshaker/handshaker_registry.cc \
@ -1509,6 +1485,30 @@ LIBGRPC_SRC = \
src/core/tsi/ssl_transport_security_utils.cc \
src/core/tsi/transport_security.cc \
src/core/tsi/transport_security_grpc.cc \
src/core/xds/grpc/certificate_provider_store.cc \
src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \
src/core/xds/grpc/xds_audit_logger_registry.cc \
src/core/xds/grpc/xds_bootstrap_grpc.cc \
src/core/xds/grpc/xds_certificate_provider.cc \
src/core/xds/grpc/xds_client_grpc.cc \
src/core/xds/grpc/xds_cluster.cc \
src/core/xds/grpc/xds_cluster_specifier_plugin.cc \
src/core/xds/grpc/xds_common_types.cc \
src/core/xds/grpc/xds_endpoint.cc \
src/core/xds/grpc/xds_health_status.cc \
src/core/xds/grpc/xds_http_fault_filter.cc \
src/core/xds/grpc/xds_http_filters.cc \
src/core/xds/grpc/xds_http_rbac_filter.cc \
src/core/xds/grpc/xds_http_stateful_session_filter.cc \
src/core/xds/grpc/xds_lb_policy_registry.cc \
src/core/xds/grpc/xds_listener.cc \
src/core/xds/grpc/xds_route_config.cc \
src/core/xds/grpc/xds_routing.cc \
src/core/xds/grpc/xds_transport_grpc.cc \
src/core/xds/xds_client/xds_api.cc \
src/core/xds/xds_client/xds_bootstrap.cc \
src/core/xds/xds_client/xds_client.cc \
src/core/xds/xds_client/xds_client_stats.cc \
third_party/abseil-cpp/absl/base/internal/cycleclock.cc \
third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc \
third_party/abseil-cpp/absl/base/internal/raw_logging.cc \

108
Package.swift generated
Unescape View File

@ -1059,60 +1059,6 @@ let package = Package(
"src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h",
"src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c",
"src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h",
"src/core/ext/xds/certificate_provider_store.cc",
"src/core/ext/xds/certificate_provider_store.h",
"src/core/ext/xds/file_watcher_certificate_provider_factory.cc",
"src/core/ext/xds/file_watcher_certificate_provider_factory.h",
"src/core/ext/xds/upb_utils.h",
"src/core/ext/xds/xds_api.cc",
"src/core/ext/xds/xds_api.h",
"src/core/ext/xds/xds_audit_logger_registry.cc",
"src/core/ext/xds/xds_audit_logger_registry.h",
"src/core/ext/xds/xds_bootstrap.cc",
"src/core/ext/xds/xds_bootstrap.h",
"src/core/ext/xds/xds_bootstrap_grpc.cc",
"src/core/ext/xds/xds_bootstrap_grpc.h",
"src/core/ext/xds/xds_certificate_provider.cc",
"src/core/ext/xds/xds_certificate_provider.h",
"src/core/ext/xds/xds_channel_args.h",
"src/core/ext/xds/xds_client.cc",
"src/core/ext/xds/xds_client.h",
"src/core/ext/xds/xds_client_grpc.cc",
"src/core/ext/xds/xds_client_grpc.h",
"src/core/ext/xds/xds_client_stats.cc",
"src/core/ext/xds/xds_client_stats.h",
"src/core/ext/xds/xds_cluster.cc",
"src/core/ext/xds/xds_cluster.h",
"src/core/ext/xds/xds_cluster_specifier_plugin.cc",
"src/core/ext/xds/xds_cluster_specifier_plugin.h",
"src/core/ext/xds/xds_common_types.cc",
"src/core/ext/xds/xds_common_types.h",
"src/core/ext/xds/xds_endpoint.cc",
"src/core/ext/xds/xds_endpoint.h",
"src/core/ext/xds/xds_health_status.cc",
"src/core/ext/xds/xds_health_status.h",
"src/core/ext/xds/xds_http_fault_filter.cc",
"src/core/ext/xds/xds_http_fault_filter.h",
"src/core/ext/xds/xds_http_filters.cc",
"src/core/ext/xds/xds_http_filters.h",
"src/core/ext/xds/xds_http_rbac_filter.cc",
"src/core/ext/xds/xds_http_rbac_filter.h",
"src/core/ext/xds/xds_http_stateful_session_filter.cc",
"src/core/ext/xds/xds_http_stateful_session_filter.h",
"src/core/ext/xds/xds_lb_policy_registry.cc",
"src/core/ext/xds/xds_lb_policy_registry.h",
"src/core/ext/xds/xds_listener.cc",
"src/core/ext/xds/xds_listener.h",
"src/core/ext/xds/xds_metrics.h",
"src/core/ext/xds/xds_resource_type.h",
"src/core/ext/xds/xds_resource_type_impl.h",
"src/core/ext/xds/xds_route_config.cc",
"src/core/ext/xds/xds_route_config.h",
"src/core/ext/xds/xds_routing.cc",
"src/core/ext/xds/xds_routing.h",
"src/core/ext/xds/xds_transport.h",
"src/core/ext/xds/xds_transport_grpc.cc",
"src/core/ext/xds/xds_transport_grpc.h",
"src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc",
"src/core/handshaker/endpoint_info/endpoint_info_handshaker.h",
"src/core/handshaker/handshaker.cc",
@ -2009,6 +1955,60 @@ let package = Package(
"src/core/tsi/transport_security_grpc.cc",
"src/core/tsi/transport_security_grpc.h",
"src/core/tsi/transport_security_interface.h",
"src/core/xds/grpc/certificate_provider_store.cc",
"src/core/xds/grpc/certificate_provider_store.h",
"src/core/xds/grpc/file_watcher_certificate_provider_factory.cc",
"src/core/xds/grpc/file_watcher_certificate_provider_factory.h",
"src/core/xds/grpc/upb_utils.h",
"src/core/xds/grpc/xds_audit_logger_registry.cc",
"src/core/xds/grpc/xds_audit_logger_registry.h",
"src/core/xds/grpc/xds_bootstrap_grpc.cc",
"src/core/xds/grpc/xds_bootstrap_grpc.h",
"src/core/xds/grpc/xds_certificate_provider.cc",
"src/core/xds/grpc/xds_certificate_provider.h",
"src/core/xds/grpc/xds_client_grpc.cc",
"src/core/xds/grpc/xds_client_grpc.h",
"src/core/xds/grpc/xds_cluster.cc",
"src/core/xds/grpc/xds_cluster.h",
"src/core/xds/grpc/xds_cluster_specifier_plugin.cc",
"src/core/xds/grpc/xds_cluster_specifier_plugin.h",
"src/core/xds/grpc/xds_common_types.cc",
"src/core/xds/grpc/xds_common_types.h",
"src/core/xds/grpc/xds_endpoint.cc",
"src/core/xds/grpc/xds_endpoint.h",
"src/core/xds/grpc/xds_health_status.cc",
"src/core/xds/grpc/xds_health_status.h",
"src/core/xds/grpc/xds_http_fault_filter.cc",
"src/core/xds/grpc/xds_http_fault_filter.h",
"src/core/xds/grpc/xds_http_filters.cc",
"src/core/xds/grpc/xds_http_filters.h",
"src/core/xds/grpc/xds_http_rbac_filter.cc",
"src/core/xds/grpc/xds_http_rbac_filter.h",
"src/core/xds/grpc/xds_http_stateful_session_filter.cc",
"src/core/xds/grpc/xds_http_stateful_session_filter.h",
"src/core/xds/grpc/xds_lb_policy_registry.cc",
"src/core/xds/grpc/xds_lb_policy_registry.h",
"src/core/xds/grpc/xds_listener.cc",
"src/core/xds/grpc/xds_listener.h",
"src/core/xds/grpc/xds_route_config.cc",
"src/core/xds/grpc/xds_route_config.h",
"src/core/xds/grpc/xds_routing.cc",
"src/core/xds/grpc/xds_routing.h",
"src/core/xds/grpc/xds_transport_grpc.cc",
"src/core/xds/grpc/xds_transport_grpc.h",
"src/core/xds/xds_client/xds_api.cc",
"src/core/xds/xds_client/xds_api.h",
"src/core/xds/xds_client/xds_bootstrap.cc",
"src/core/xds/xds_client/xds_bootstrap.h",
"src/core/xds/xds_client/xds_channel_args.h",
"src/core/xds/xds_client/xds_client.cc",
"src/core/xds/xds_client/xds_client.h",
"src/core/xds/xds_client/xds_client_stats.cc",
"src/core/xds/xds_client/xds_client_stats.h",
"src/core/xds/xds_client/xds_metrics.h",
"src/core/xds/xds_client/xds_resource_type.h",
"src/core/xds/xds_client/xds_resource_type_impl.h",
"src/core/xds/xds_client/xds_transport.h",
"third_party/re2/re2/bitmap256.h",
"third_party/re2/re2/bitstate.cc",
"third_party/re2/re2/compile.cc",

2
_metadata.py
Unescape View File

@ -14,4 +14,4 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/_metadata.py.template`!!!
__version__ = """1.64.0.dev0"""
__version__ = """1.65.0.dev0"""

110
build_autogenerated.yaml generated
Unescape View File

@ -776,36 +776,6 @@ libs:
- src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h
- src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h
- src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h
- src/core/ext/xds/certificate_provider_store.h
- src/core/ext/xds/file_watcher_certificate_provider_factory.h
- src/core/ext/xds/upb_utils.h
- src/core/ext/xds/xds_api.h
- src/core/ext/xds/xds_audit_logger_registry.h
- src/core/ext/xds/xds_bootstrap.h
- src/core/ext/xds/xds_bootstrap_grpc.h
- src/core/ext/xds/xds_certificate_provider.h
- src/core/ext/xds/xds_channel_args.h
- src/core/ext/xds/xds_client.h
- src/core/ext/xds/xds_client_grpc.h
- src/core/ext/xds/xds_client_stats.h
- src/core/ext/xds/xds_cluster.h
- src/core/ext/xds/xds_cluster_specifier_plugin.h
- src/core/ext/xds/xds_common_types.h
- src/core/ext/xds/xds_endpoint.h
- src/core/ext/xds/xds_health_status.h
- src/core/ext/xds/xds_http_fault_filter.h
- src/core/ext/xds/xds_http_filters.h
- src/core/ext/xds/xds_http_rbac_filter.h
- src/core/ext/xds/xds_http_stateful_session_filter.h
- src/core/ext/xds/xds_lb_policy_registry.h
- src/core/ext/xds/xds_listener.h
- src/core/ext/xds/xds_metrics.h
- src/core/ext/xds/xds_resource_type.h
- src/core/ext/xds/xds_resource_type_impl.h
- src/core/ext/xds/xds_route_config.h
- src/core/ext/xds/xds_routing.h
- src/core/ext/xds/xds_transport.h
- src/core/ext/xds/xds_transport_grpc.h
- src/core/handshaker/endpoint_info/endpoint_info_handshaker.h
- src/core/handshaker/handshaker.h
- src/core/handshaker/handshaker_factory.h
@ -1243,6 +1213,36 @@ libs:
- src/core/tsi/transport_security.h
- src/core/tsi/transport_security_grpc.h
- src/core/tsi/transport_security_interface.h
- src/core/xds/grpc/certificate_provider_store.h
- src/core/xds/grpc/file_watcher_certificate_provider_factory.h
- src/core/xds/grpc/upb_utils.h
- src/core/xds/grpc/xds_audit_logger_registry.h
- src/core/xds/grpc/xds_bootstrap_grpc.h
- src/core/xds/grpc/xds_certificate_provider.h
- src/core/xds/grpc/xds_client_grpc.h
- src/core/xds/grpc/xds_cluster.h
- src/core/xds/grpc/xds_cluster_specifier_plugin.h
- src/core/xds/grpc/xds_common_types.h
- src/core/xds/grpc/xds_endpoint.h
- src/core/xds/grpc/xds_health_status.h
- src/core/xds/grpc/xds_http_fault_filter.h
- src/core/xds/grpc/xds_http_filters.h
- src/core/xds/grpc/xds_http_rbac_filter.h
- src/core/xds/grpc/xds_http_stateful_session_filter.h
- src/core/xds/grpc/xds_lb_policy_registry.h
- src/core/xds/grpc/xds_listener.h
- src/core/xds/grpc/xds_route_config.h
- src/core/xds/grpc/xds_routing.h
- src/core/xds/grpc/xds_transport_grpc.h
- src/core/xds/xds_client/xds_api.h
- src/core/xds/xds_client/xds_bootstrap.h
- src/core/xds/xds_client/xds_channel_args.h
- src/core/xds/xds_client/xds_client.h
- src/core/xds/xds_client/xds_client_stats.h
- src/core/xds/xds_client/xds_metrics.h
- src/core/xds/xds_client/xds_resource_type.h
- src/core/xds/xds_client/xds_resource_type_impl.h
- src/core/xds/xds_client/xds_transport.h
- third_party/upb/upb/generated_code_support.h
- third_party/xxhash/xxhash.h
src:
@ -1634,30 +1634,6 @@ libs:
- src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c
- src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c
- src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c
- src/core/ext/xds/certificate_provider_store.cc
- src/core/ext/xds/file_watcher_certificate_provider_factory.cc
- src/core/ext/xds/xds_api.cc
- src/core/ext/xds/xds_audit_logger_registry.cc
- src/core/ext/xds/xds_bootstrap.cc
- src/core/ext/xds/xds_bootstrap_grpc.cc
- src/core/ext/xds/xds_certificate_provider.cc
- src/core/ext/xds/xds_client.cc
- src/core/ext/xds/xds_client_grpc.cc
- src/core/ext/xds/xds_client_stats.cc
- src/core/ext/xds/xds_cluster.cc
- src/core/ext/xds/xds_cluster_specifier_plugin.cc
- src/core/ext/xds/xds_common_types.cc
- src/core/ext/xds/xds_endpoint.cc
- src/core/ext/xds/xds_health_status.cc
- src/core/ext/xds/xds_http_fault_filter.cc
- src/core/ext/xds/xds_http_filters.cc
- src/core/ext/xds/xds_http_rbac_filter.cc
- src/core/ext/xds/xds_http_stateful_session_filter.cc
- src/core/ext/xds/xds_lb_policy_registry.cc
- src/core/ext/xds/xds_listener.cc
- src/core/ext/xds/xds_route_config.cc
- src/core/ext/xds/xds_routing.cc
- src/core/ext/xds/xds_transport_grpc.cc
- src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
- src/core/handshaker/handshaker.cc
- src/core/handshaker/handshaker_registry.cc
@ -2044,6 +2020,30 @@ libs:
- src/core/tsi/ssl_transport_security_utils.cc
- src/core/tsi/transport_security.cc
- src/core/tsi/transport_security_grpc.cc
- src/core/xds/grpc/certificate_provider_store.cc
- src/core/xds/grpc/file_watcher_certificate_provider_factory.cc
- src/core/xds/grpc/xds_audit_logger_registry.cc
- src/core/xds/grpc/xds_bootstrap_grpc.cc
- src/core/xds/grpc/xds_certificate_provider.cc
- src/core/xds/grpc/xds_client_grpc.cc
- src/core/xds/grpc/xds_cluster.cc
- src/core/xds/grpc/xds_cluster_specifier_plugin.cc
- src/core/xds/grpc/xds_common_types.cc
- src/core/xds/grpc/xds_endpoint.cc
- src/core/xds/grpc/xds_health_status.cc
- src/core/xds/grpc/xds_http_fault_filter.cc
- src/core/xds/grpc/xds_http_filters.cc
- src/core/xds/grpc/xds_http_rbac_filter.cc
- src/core/xds/grpc/xds_http_stateful_session_filter.cc
- src/core/xds/grpc/xds_lb_policy_registry.cc
- src/core/xds/grpc/xds_listener.cc
- src/core/xds/grpc/xds_route_config.cc
- src/core/xds/grpc/xds_routing.cc
- src/core/xds/grpc/xds_transport_grpc.cc
- src/core/xds/xds_client/xds_api.cc
- src/core/xds/xds_client/xds_bootstrap.cc
- src/core/xds/xds_client/xds_client.cc
- src/core/xds/xds_client/xds_client_stats.cc
deps:
- upb_json_lib
- upb_textformat_lib
@ -3856,7 +3856,7 @@ libs:
- src/core/ext/transport/binder/wire_format/wire_reader.h
- src/core/ext/transport/binder/wire_format/wire_reader_impl.h
- src/core/ext/transport/binder/wire_format/wire_writer.h
- src/core/ext/xds/xds_enabled_server.h
- src/core/xds/grpc/xds_enabled_server.h
- src/cpp/client/client_stats_interceptor.h
- src/cpp/client/create_channel_internal.h
- src/cpp/client/secure_credentials.h

4
build_handwritten.yaml
Unescape View File

@ -14,9 +14,9 @@ settings:
'#10': See the expand_version.py for all the quirks here
core_version: 41.0.0
csharp_major_version: 2
g_stands_for: grateful
g_stands_for: gnarly
protobuf_version: 3.26.1
version: 1.64.0-dev
version: 1.65.0-dev
configs:
asan:
CC: clang

53
config.m4 generated
Unescape View File

@ -429,30 +429,6 @@ if test "$PHP_GRPC" != "no"; then
src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c \
src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c \
src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c \
src/core/ext/xds/certificate_provider_store.cc \
src/core/ext/xds/file_watcher_certificate_provider_factory.cc \
src/core/ext/xds/xds_api.cc \
src/core/ext/xds/xds_audit_logger_registry.cc \
src/core/ext/xds/xds_bootstrap.cc \
src/core/ext/xds/xds_bootstrap_grpc.cc \
src/core/ext/xds/xds_certificate_provider.cc \
src/core/ext/xds/xds_client.cc \
src/core/ext/xds/xds_client_grpc.cc \
src/core/ext/xds/xds_client_stats.cc \
src/core/ext/xds/xds_cluster.cc \
src/core/ext/xds/xds_cluster_specifier_plugin.cc \
src/core/ext/xds/xds_common_types.cc \
src/core/ext/xds/xds_endpoint.cc \
src/core/ext/xds/xds_health_status.cc \
src/core/ext/xds/xds_http_fault_filter.cc \
src/core/ext/xds/xds_http_filters.cc \
src/core/ext/xds/xds_http_rbac_filter.cc \
src/core/ext/xds/xds_http_stateful_session_filter.cc \
src/core/ext/xds/xds_lb_policy_registry.cc \
src/core/ext/xds/xds_listener.cc \
src/core/ext/xds/xds_route_config.cc \
src/core/ext/xds/xds_routing.cc \
src/core/ext/xds/xds_transport_grpc.cc \
src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \
src/core/handshaker/handshaker.cc \
src/core/handshaker/handshaker_registry.cc \
@ -884,6 +860,30 @@ if test "$PHP_GRPC" != "no"; then
src/core/tsi/ssl_transport_security_utils.cc \
src/core/tsi/transport_security.cc \
src/core/tsi/transport_security_grpc.cc \
src/core/xds/grpc/certificate_provider_store.cc \
src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \
src/core/xds/grpc/xds_audit_logger_registry.cc \
src/core/xds/grpc/xds_bootstrap_grpc.cc \
src/core/xds/grpc/xds_certificate_provider.cc \
src/core/xds/grpc/xds_client_grpc.cc \
src/core/xds/grpc/xds_cluster.cc \
src/core/xds/grpc/xds_cluster_specifier_plugin.cc \
src/core/xds/grpc/xds_common_types.cc \
src/core/xds/grpc/xds_endpoint.cc \
src/core/xds/grpc/xds_health_status.cc \
src/core/xds/grpc/xds_http_fault_filter.cc \
src/core/xds/grpc/xds_http_filters.cc \
src/core/xds/grpc/xds_http_rbac_filter.cc \
src/core/xds/grpc/xds_http_stateful_session_filter.cc \
src/core/xds/grpc/xds_lb_policy_registry.cc \
src/core/xds/grpc/xds_listener.cc \
src/core/xds/grpc/xds_route_config.cc \
src/core/xds/grpc/xds_routing.cc \
src/core/xds/grpc/xds_transport_grpc.cc \
src/core/xds/xds_client/xds_api.cc \
src/core/xds/xds_client/xds_bootstrap.cc \
src/core/xds/xds_client/xds_client.cc \
src/core/xds/xds_client/xds_client_stats.cc \
src/php/ext/grpc/byte_buffer.c \
src/php/ext/grpc/call.c \
src/php/ext/grpc/call_credentials.c \
@ -1384,7 +1384,7 @@ if test "$PHP_GRPC" != "no"; then
-D_HAS_EXCEPTIONS=0 -DNOMINMAX -DGRPC_ARES=0 \
-DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1 \
-DGRPC_XDS_USER_AGENT_NAME_SUFFIX='"\"PHP\""' \
-DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.64.0dev\""')
-DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.65.0dev\""')
PHP_ADD_BUILD_DIR($ext_builddir/src/core/channelz)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/client_channel)
@ -1507,7 +1507,6 @@ if test "$PHP_GRPC" != "no"; then
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/xds/core/v3)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/xds/type/matcher/v3)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/xds/type/v3)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/xds)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/endpoint_info)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/http_connect)
@ -1607,6 +1606,8 @@ if test "$PHP_GRPC" != "no"; then
PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/alts/zero_copy_frame_protector)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/ssl/key_logging)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/ssl/session_cache)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/xds/grpc)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/xds/xds_client)
PHP_ADD_BUILD_DIR($ext_builddir/src/php/ext/grpc)
PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/base)
PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/base/internal)

52
config.w32 generated
Unescape View File

@ -394,30 +394,6 @@ if (PHP_GRPC != "no") {
"src\\core\\ext\\upbdefs-gen\\xds\\type\\v3\\cel.upbdefs.c " +
"src\\core\\ext\\upbdefs-gen\\xds\\type\\v3\\range.upbdefs.c " +
"src\\core\\ext\\upbdefs-gen\\xds\\type\\v3\\typed_struct.upbdefs.c " +
"src\\core\\ext\\xds\\certificate_provider_store.cc " +
"src\\core\\ext\\xds\\file_watcher_certificate_provider_factory.cc " +
"src\\core\\ext\\xds\\xds_api.cc " +
"src\\core\\ext\\xds\\xds_audit_logger_registry.cc " +
"src\\core\\ext\\xds\\xds_bootstrap.cc " +
"src\\core\\ext\\xds\\xds_bootstrap_grpc.cc " +
"src\\core\\ext\\xds\\xds_certificate_provider.cc " +
"src\\core\\ext\\xds\\xds_client.cc " +
"src\\core\\ext\\xds\\xds_client_grpc.cc " +
"src\\core\\ext\\xds\\xds_client_stats.cc " +
"src\\core\\ext\\xds\\xds_cluster.cc " +
"src\\core\\ext\\xds\\xds_cluster_specifier_plugin.cc " +
"src\\core\\ext\\xds\\xds_common_types.cc " +
"src\\core\\ext\\xds\\xds_endpoint.cc " +
"src\\core\\ext\\xds\\xds_health_status.cc " +
"src\\core\\ext\\xds\\xds_http_fault_filter.cc " +
"src\\core\\ext\\xds\\xds_http_filters.cc " +
"src\\core\\ext\\xds\\xds_http_rbac_filter.cc " +
"src\\core\\ext\\xds\\xds_http_stateful_session_filter.cc " +
"src\\core\\ext\\xds\\xds_lb_policy_registry.cc " +
"src\\core\\ext\\xds\\xds_listener.cc " +
"src\\core\\ext\\xds\\xds_route_config.cc " +
"src\\core\\ext\\xds\\xds_routing.cc " +
"src\\core\\ext\\xds\\xds_transport_grpc.cc " +
"src\\core\\handshaker\\endpoint_info\\endpoint_info_handshaker.cc " +
"src\\core\\handshaker\\handshaker.cc " +
"src\\core\\handshaker\\handshaker_registry.cc " +
@ -849,6 +825,30 @@ if (PHP_GRPC != "no") {
"src\\core\\tsi\\ssl_transport_security_utils.cc " +
"src\\core\\tsi\\transport_security.cc " +
"src\\core\\tsi\\transport_security_grpc.cc " +
"src\\core\\xds\\grpc\\certificate_provider_store.cc " +
"src\\core\\xds\\grpc\\file_watcher_certificate_provider_factory.cc " +
"src\\core\\xds\\grpc\\xds_audit_logger_registry.cc " +
"src\\core\\xds\\grpc\\xds_bootstrap_grpc.cc " +
"src\\core\\xds\\grpc\\xds_certificate_provider.cc " +
"src\\core\\xds\\grpc\\xds_client_grpc.cc " +
"src\\core\\xds\\grpc\\xds_cluster.cc " +
"src\\core\\xds\\grpc\\xds_cluster_specifier_plugin.cc " +
"src\\core\\xds\\grpc\\xds_common_types.cc " +
"src\\core\\xds\\grpc\\xds_endpoint.cc " +
"src\\core\\xds\\grpc\\xds_health_status.cc " +
"src\\core\\xds\\grpc\\xds_http_fault_filter.cc " +
"src\\core\\xds\\grpc\\xds_http_filters.cc " +
"src\\core\\xds\\grpc\\xds_http_rbac_filter.cc " +
"src\\core\\xds\\grpc\\xds_http_stateful_session_filter.cc " +
"src\\core\\xds\\grpc\\xds_lb_policy_registry.cc " +
"src\\core\\xds\\grpc\\xds_listener.cc " +
"src\\core\\xds\\grpc\\xds_route_config.cc " +
"src\\core\\xds\\grpc\\xds_routing.cc " +
"src\\core\\xds\\grpc\\xds_transport_grpc.cc " +
"src\\core\\xds\\xds_client\\xds_api.cc " +
"src\\core\\xds\\xds_client\\xds_bootstrap.cc " +
"src\\core\\xds\\xds_client\\xds_client.cc " +
"src\\core\\xds\\xds_client\\xds_client_stats.cc " +
"src\\php\\ext\\grpc\\byte_buffer.c " +
"src\\php\\ext\\grpc\\call.c " +
"src\\php\\ext\\grpc\\call_credentials.c " +
@ -1643,7 +1643,6 @@ if (PHP_GRPC != "no") {
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\xds\\type\\matcher");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\xds\\type\\matcher\\v3");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\xds\\type\\v3");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\xds");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker\\endpoint_info");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker\\http_connect");
@ -1747,6 +1746,9 @@ if (PHP_GRPC != "no") {
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\ssl");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\ssl\\key_logging");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\ssl\\session_cache");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\xds");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\xds\\grpc");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\xds\\xds_client");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\php");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\php\\ext");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\php\\ext\\grpc");

3
doc/g_stands_for.md
Unescape View File

@ -63,4 +63,5 @@
- 1.61 'g' stands for ['grand'](https://github.com/grpc/grpc/tree/v1.61.x)
- 1.62 'g' stands for ['guardian'](https://github.com/grpc/grpc/tree/v1.62.x)
- 1.63 'g' stands for ['giggle'](https://github.com/grpc/grpc/tree/v1.63.x)
- 1.64 'g' stands for ['grateful'](https://github.com/grpc/grpc/tree/master)
- 1.64 'g' stands for ['grateful'](https://github.com/grpc/grpc/tree/v1.64.x)
- 1.65 'g' stands for ['gnarly'](https://github.com/grpc/grpc/tree/master)

126
gRPC-C++.podspec generated
Unescape View File

@ -22,7 +22,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC-C++'
# TODO (mxyan): use version that match gRPC version when pod is stabilized
version = '1.64.0-dev'
version = '1.65.0-dev'
s.version = version
s.summary = 'gRPC C++ library'
s.homepage = 'https://grpc.io'
@ -855,37 +855,6 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h',
'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h',
'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h',
'src/core/ext/xds/certificate_provider_store.h',
'src/core/ext/xds/file_watcher_certificate_provider_factory.h',
'src/core/ext/xds/upb_utils.h',
'src/core/ext/xds/xds_api.h',
'src/core/ext/xds/xds_audit_logger_registry.h',
'src/core/ext/xds/xds_bootstrap.h',
'src/core/ext/xds/xds_bootstrap_grpc.h',
'src/core/ext/xds/xds_certificate_provider.h',
'src/core/ext/xds/xds_channel_args.h',
'src/core/ext/xds/xds_client.h',
'src/core/ext/xds/xds_client_grpc.h',
'src/core/ext/xds/xds_client_stats.h',
'src/core/ext/xds/xds_cluster.h',
'src/core/ext/xds/xds_cluster_specifier_plugin.h',
'src/core/ext/xds/xds_common_types.h',
'src/core/ext/xds/xds_enabled_server.h',
'src/core/ext/xds/xds_endpoint.h',
'src/core/ext/xds/xds_health_status.h',
'src/core/ext/xds/xds_http_fault_filter.h',
'src/core/ext/xds/xds_http_filters.h',
'src/core/ext/xds/xds_http_rbac_filter.h',
'src/core/ext/xds/xds_http_stateful_session_filter.h',
'src/core/ext/xds/xds_lb_policy_registry.h',
'src/core/ext/xds/xds_listener.h',
'src/core/ext/xds/xds_metrics.h',
'src/core/ext/xds/xds_resource_type.h',
'src/core/ext/xds/xds_resource_type_impl.h',
'src/core/ext/xds/xds_route_config.h',
'src/core/ext/xds/xds_routing.h',
'src/core/ext/xds/xds_transport.h',
'src/core/ext/xds/xds_transport_grpc.h',
'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h',
'src/core/handshaker/handshaker.h',
'src/core/handshaker/handshaker_factory.h',
@ -1347,6 +1316,37 @@ Pod::Spec.new do |s|
'src/core/tsi/transport_security.h',
'src/core/tsi/transport_security_grpc.h',
'src/core/tsi/transport_security_interface.h',
'src/core/xds/grpc/certificate_provider_store.h',
'src/core/xds/grpc/file_watcher_certificate_provider_factory.h',
'src/core/xds/grpc/upb_utils.h',
'src/core/xds/grpc/xds_audit_logger_registry.h',
'src/core/xds/grpc/xds_bootstrap_grpc.h',
'src/core/xds/grpc/xds_certificate_provider.h',
'src/core/xds/grpc/xds_client_grpc.h',
'src/core/xds/grpc/xds_cluster.h',
'src/core/xds/grpc/xds_cluster_specifier_plugin.h',
'src/core/xds/grpc/xds_common_types.h',
'src/core/xds/grpc/xds_enabled_server.h',
'src/core/xds/grpc/xds_endpoint.h',
'src/core/xds/grpc/xds_health_status.h',
'src/core/xds/grpc/xds_http_fault_filter.h',
'src/core/xds/grpc/xds_http_filters.h',
'src/core/xds/grpc/xds_http_rbac_filter.h',
'src/core/xds/grpc/xds_http_stateful_session_filter.h',
'src/core/xds/grpc/xds_lb_policy_registry.h',
'src/core/xds/grpc/xds_listener.h',
'src/core/xds/grpc/xds_route_config.h',
'src/core/xds/grpc/xds_routing.h',
'src/core/xds/grpc/xds_transport_grpc.h',
'src/core/xds/xds_client/xds_api.h',
'src/core/xds/xds_client/xds_bootstrap.h',
'src/core/xds/xds_client/xds_channel_args.h',
'src/core/xds/xds_client/xds_client.h',
'src/core/xds/xds_client/xds_client_stats.h',
'src/core/xds/xds_client/xds_metrics.h',
'src/core/xds/xds_client/xds_resource_type.h',
'src/core/xds/xds_client/xds_resource_type_impl.h',
'src/core/xds/xds_client/xds_transport.h',
'src/cpp/client/call_credentials.cc',
'src/cpp/client/channel_cc.cc',
'src/cpp/client/channel_credentials.cc',
@ -2126,37 +2126,6 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h',
'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h',
'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h',
'src/core/ext/xds/certificate_provider_store.h',
'src/core/ext/xds/file_watcher_certificate_provider_factory.h',
'src/core/ext/xds/upb_utils.h',
'src/core/ext/xds/xds_api.h',
'src/core/ext/xds/xds_audit_logger_registry.h',
'src/core/ext/xds/xds_bootstrap.h',
'src/core/ext/xds/xds_bootstrap_grpc.h',
'src/core/ext/xds/xds_certificate_provider.h',
'src/core/ext/xds/xds_channel_args.h',
'src/core/ext/xds/xds_client.h',
'src/core/ext/xds/xds_client_grpc.h',
'src/core/ext/xds/xds_client_stats.h',
'src/core/ext/xds/xds_cluster.h',
'src/core/ext/xds/xds_cluster_specifier_plugin.h',
'src/core/ext/xds/xds_common_types.h',
'src/core/ext/xds/xds_enabled_server.h',
'src/core/ext/xds/xds_endpoint.h',
'src/core/ext/xds/xds_health_status.h',
'src/core/ext/xds/xds_http_fault_filter.h',
'src/core/ext/xds/xds_http_filters.h',
'src/core/ext/xds/xds_http_rbac_filter.h',
'src/core/ext/xds/xds_http_stateful_session_filter.h',
'src/core/ext/xds/xds_lb_policy_registry.h',
'src/core/ext/xds/xds_listener.h',
'src/core/ext/xds/xds_metrics.h',
'src/core/ext/xds/xds_resource_type.h',
'src/core/ext/xds/xds_resource_type_impl.h',
'src/core/ext/xds/xds_route_config.h',
'src/core/ext/xds/xds_routing.h',
'src/core/ext/xds/xds_transport.h',
'src/core/ext/xds/xds_transport_grpc.h',
'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h',
'src/core/handshaker/handshaker.h',
'src/core/handshaker/handshaker_factory.h',
@ -2618,6 +2587,37 @@ Pod::Spec.new do |s|
'src/core/tsi/transport_security.h',
'src/core/tsi/transport_security_grpc.h',
'src/core/tsi/transport_security_interface.h',
'src/core/xds/grpc/certificate_provider_store.h',
'src/core/xds/grpc/file_watcher_certificate_provider_factory.h',
'src/core/xds/grpc/upb_utils.h',
'src/core/xds/grpc/xds_audit_logger_registry.h',
'src/core/xds/grpc/xds_bootstrap_grpc.h',
'src/core/xds/grpc/xds_certificate_provider.h',
'src/core/xds/grpc/xds_client_grpc.h',
'src/core/xds/grpc/xds_cluster.h',
'src/core/xds/grpc/xds_cluster_specifier_plugin.h',
'src/core/xds/grpc/xds_common_types.h',
'src/core/xds/grpc/xds_enabled_server.h',
'src/core/xds/grpc/xds_endpoint.h',
'src/core/xds/grpc/xds_health_status.h',
'src/core/xds/grpc/xds_http_fault_filter.h',
'src/core/xds/grpc/xds_http_filters.h',
'src/core/xds/grpc/xds_http_rbac_filter.h',
'src/core/xds/grpc/xds_http_stateful_session_filter.h',
'src/core/xds/grpc/xds_lb_policy_registry.h',
'src/core/xds/grpc/xds_listener.h',
'src/core/xds/grpc/xds_route_config.h',
'src/core/xds/grpc/xds_routing.h',
'src/core/xds/grpc/xds_transport_grpc.h',
'src/core/xds/xds_client/xds_api.h',
'src/core/xds/xds_client/xds_bootstrap.h',
'src/core/xds/xds_client/xds_channel_args.h',
'src/core/xds/xds_client/xds_client.h',
'src/core/xds/xds_client/xds_client_stats.h',
'src/core/xds/xds_client/xds_metrics.h',
'src/core/xds/xds_client/xds_resource_type.h',
'src/core/xds/xds_client/xds_resource_type_impl.h',
'src/core/xds/xds_client/xds_transport.h',
'src/cpp/client/client_stats_interceptor.h',
'src/cpp/client/create_channel_internal.h',
'src/cpp/client/secure_credentials.h',

170
gRPC-Core.podspec generated
Unescape View File

@ -21,7 +21,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC-Core'
version = '1.64.0-dev'
version = '1.65.0-dev'
s.version = version
s.summary = 'Core cross-platform gRPC library, written in C'
s.homepage = 'https://grpc.io'
@ -1178,60 +1178,6 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h',
'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c',
'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h',
'src/core/ext/xds/certificate_provider_store.cc',
'src/core/ext/xds/certificate_provider_store.h',
'src/core/ext/xds/file_watcher_certificate_provider_factory.cc',
'src/core/ext/xds/file_watcher_certificate_provider_factory.h',
'src/core/ext/xds/upb_utils.h',
'src/core/ext/xds/xds_api.cc',
'src/core/ext/xds/xds_api.h',
'src/core/ext/xds/xds_audit_logger_registry.cc',
'src/core/ext/xds/xds_audit_logger_registry.h',
'src/core/ext/xds/xds_bootstrap.cc',
'src/core/ext/xds/xds_bootstrap.h',
'src/core/ext/xds/xds_bootstrap_grpc.cc',
'src/core/ext/xds/xds_bootstrap_grpc.h',
'src/core/ext/xds/xds_certificate_provider.cc',
'src/core/ext/xds/xds_certificate_provider.h',
'src/core/ext/xds/xds_channel_args.h',
'src/core/ext/xds/xds_client.cc',
'src/core/ext/xds/xds_client.h',
'src/core/ext/xds/xds_client_grpc.cc',
'src/core/ext/xds/xds_client_grpc.h',
'src/core/ext/xds/xds_client_stats.cc',
'src/core/ext/xds/xds_client_stats.h',
'src/core/ext/xds/xds_cluster.cc',
'src/core/ext/xds/xds_cluster.h',
'src/core/ext/xds/xds_cluster_specifier_plugin.cc',
'src/core/ext/xds/xds_cluster_specifier_plugin.h',
'src/core/ext/xds/xds_common_types.cc',
'src/core/ext/xds/xds_common_types.h',
'src/core/ext/xds/xds_endpoint.cc',
'src/core/ext/xds/xds_endpoint.h',
'src/core/ext/xds/xds_health_status.cc',
'src/core/ext/xds/xds_health_status.h',
'src/core/ext/xds/xds_http_fault_filter.cc',
'src/core/ext/xds/xds_http_fault_filter.h',
'src/core/ext/xds/xds_http_filters.cc',
'src/core/ext/xds/xds_http_filters.h',
'src/core/ext/xds/xds_http_rbac_filter.cc',
'src/core/ext/xds/xds_http_rbac_filter.h',
'src/core/ext/xds/xds_http_stateful_session_filter.cc',
'src/core/ext/xds/xds_http_stateful_session_filter.h',
'src/core/ext/xds/xds_lb_policy_registry.cc',
'src/core/ext/xds/xds_lb_policy_registry.h',
'src/core/ext/xds/xds_listener.cc',
'src/core/ext/xds/xds_listener.h',
'src/core/ext/xds/xds_metrics.h',
'src/core/ext/xds/xds_resource_type.h',
'src/core/ext/xds/xds_resource_type_impl.h',
'src/core/ext/xds/xds_route_config.cc',
'src/core/ext/xds/xds_route_config.h',
'src/core/ext/xds/xds_routing.cc',
'src/core/ext/xds/xds_routing.h',
'src/core/ext/xds/xds_transport.h',
'src/core/ext/xds/xds_transport_grpc.cc',
'src/core/ext/xds/xds_transport_grpc.h',
'src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc',
'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h',
'src/core/handshaker/handshaker.cc',
@ -2124,6 +2070,60 @@ Pod::Spec.new do |s|
'src/core/tsi/transport_security_grpc.cc',
'src/core/tsi/transport_security_grpc.h',
'src/core/tsi/transport_security_interface.h',
'src/core/xds/grpc/certificate_provider_store.cc',
'src/core/xds/grpc/certificate_provider_store.h',
'src/core/xds/grpc/file_watcher_certificate_provider_factory.cc',
'src/core/xds/grpc/file_watcher_certificate_provider_factory.h',
'src/core/xds/grpc/upb_utils.h',
'src/core/xds/grpc/xds_audit_logger_registry.cc',
'src/core/xds/grpc/xds_audit_logger_registry.h',
'src/core/xds/grpc/xds_bootstrap_grpc.cc',
'src/core/xds/grpc/xds_bootstrap_grpc.h',
'src/core/xds/grpc/xds_certificate_provider.cc',
'src/core/xds/grpc/xds_certificate_provider.h',
'src/core/xds/grpc/xds_client_grpc.cc',
'src/core/xds/grpc/xds_client_grpc.h',
'src/core/xds/grpc/xds_cluster.cc',
'src/core/xds/grpc/xds_cluster.h',
'src/core/xds/grpc/xds_cluster_specifier_plugin.cc',
'src/core/xds/grpc/xds_cluster_specifier_plugin.h',
'src/core/xds/grpc/xds_common_types.cc',
'src/core/xds/grpc/xds_common_types.h',
'src/core/xds/grpc/xds_endpoint.cc',
'src/core/xds/grpc/xds_endpoint.h',
'src/core/xds/grpc/xds_health_status.cc',
'src/core/xds/grpc/xds_health_status.h',
'src/core/xds/grpc/xds_http_fault_filter.cc',
'src/core/xds/grpc/xds_http_fault_filter.h',
'src/core/xds/grpc/xds_http_filters.cc',
'src/core/xds/grpc/xds_http_filters.h',
'src/core/xds/grpc/xds_http_rbac_filter.cc',
'src/core/xds/grpc/xds_http_rbac_filter.h',
'src/core/xds/grpc/xds_http_stateful_session_filter.cc',
'src/core/xds/grpc/xds_http_stateful_session_filter.h',
'src/core/xds/grpc/xds_lb_policy_registry.cc',
'src/core/xds/grpc/xds_lb_policy_registry.h',
'src/core/xds/grpc/xds_listener.cc',
'src/core/xds/grpc/xds_listener.h',
'src/core/xds/grpc/xds_route_config.cc',
'src/core/xds/grpc/xds_route_config.h',
'src/core/xds/grpc/xds_routing.cc',
'src/core/xds/grpc/xds_routing.h',
'src/core/xds/grpc/xds_transport_grpc.cc',
'src/core/xds/grpc/xds_transport_grpc.h',
'src/core/xds/xds_client/xds_api.cc',
'src/core/xds/xds_client/xds_api.h',
'src/core/xds/xds_client/xds_bootstrap.cc',
'src/core/xds/xds_client/xds_bootstrap.h',
'src/core/xds/xds_client/xds_channel_args.h',
'src/core/xds/xds_client/xds_client.cc',
'src/core/xds/xds_client/xds_client.h',
'src/core/xds/xds_client/xds_client_stats.cc',
'src/core/xds/xds_client/xds_client_stats.h',
'src/core/xds/xds_client/xds_metrics.h',
'src/core/xds/xds_client/xds_resource_type.h',
'src/core/xds/xds_client/xds_resource_type_impl.h',
'src/core/xds/xds_client/xds_transport.h',
'third_party/re2/re2/bitmap256.h',
'third_party/re2/re2/bitstate.cc',
'third_party/re2/re2/compile.cc',
@ -2906,36 +2906,6 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h',
'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h',
'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h',
'src/core/ext/xds/certificate_provider_store.h',
'src/core/ext/xds/file_watcher_certificate_provider_factory.h',
'src/core/ext/xds/upb_utils.h',
'src/core/ext/xds/xds_api.h',
'src/core/ext/xds/xds_audit_logger_registry.h',
'src/core/ext/xds/xds_bootstrap.h',
'src/core/ext/xds/xds_bootstrap_grpc.h',
'src/core/ext/xds/xds_certificate_provider.h',
'src/core/ext/xds/xds_channel_args.h',
'src/core/ext/xds/xds_client.h',
'src/core/ext/xds/xds_client_grpc.h',
'src/core/ext/xds/xds_client_stats.h',
'src/core/ext/xds/xds_cluster.h',
'src/core/ext/xds/xds_cluster_specifier_plugin.h',
'src/core/ext/xds/xds_common_types.h',
'src/core/ext/xds/xds_endpoint.h',
'src/core/ext/xds/xds_health_status.h',
'src/core/ext/xds/xds_http_fault_filter.h',
'src/core/ext/xds/xds_http_filters.h',
'src/core/ext/xds/xds_http_rbac_filter.h',
'src/core/ext/xds/xds_http_stateful_session_filter.h',
'src/core/ext/xds/xds_lb_policy_registry.h',
'src/core/ext/xds/xds_listener.h',
'src/core/ext/xds/xds_metrics.h',
'src/core/ext/xds/xds_resource_type.h',
'src/core/ext/xds/xds_resource_type_impl.h',
'src/core/ext/xds/xds_route_config.h',
'src/core/ext/xds/xds_routing.h',
'src/core/ext/xds/xds_transport.h',
'src/core/ext/xds/xds_transport_grpc.h',
'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h',
'src/core/handshaker/handshaker.h',
'src/core/handshaker/handshaker_factory.h',
@ -3397,6 +3367,36 @@ Pod::Spec.new do |s|
'src/core/tsi/transport_security.h',
'src/core/tsi/transport_security_grpc.h',
'src/core/tsi/transport_security_interface.h',
'src/core/xds/grpc/certificate_provider_store.h',
'src/core/xds/grpc/file_watcher_certificate_provider_factory.h',
'src/core/xds/grpc/upb_utils.h',
'src/core/xds/grpc/xds_audit_logger_registry.h',
'src/core/xds/grpc/xds_bootstrap_grpc.h',
'src/core/xds/grpc/xds_certificate_provider.h',
'src/core/xds/grpc/xds_client_grpc.h',
'src/core/xds/grpc/xds_cluster.h',
'src/core/xds/grpc/xds_cluster_specifier_plugin.h',
'src/core/xds/grpc/xds_common_types.h',
'src/core/xds/grpc/xds_endpoint.h',
'src/core/xds/grpc/xds_health_status.h',
'src/core/xds/grpc/xds_http_fault_filter.h',
'src/core/xds/grpc/xds_http_filters.h',
'src/core/xds/grpc/xds_http_rbac_filter.h',
'src/core/xds/grpc/xds_http_stateful_session_filter.h',
'src/core/xds/grpc/xds_lb_policy_registry.h',
'src/core/xds/grpc/xds_listener.h',
'src/core/xds/grpc/xds_route_config.h',
'src/core/xds/grpc/xds_routing.h',
'src/core/xds/grpc/xds_transport_grpc.h',
'src/core/xds/xds_client/xds_api.h',
'src/core/xds/xds_client/xds_bootstrap.h',
'src/core/xds/xds_client/xds_channel_args.h',
'src/core/xds/xds_client/xds_client.h',
'src/core/xds/xds_client/xds_client_stats.h',
'src/core/xds/xds_client/xds_metrics.h',
'src/core/xds/xds_client/xds_resource_type.h',
'src/core/xds/xds_client/xds_resource_type_impl.h',
'src/core/xds/xds_client/xds_transport.h',
'third_party/re2/re2/bitmap256.h',
'third_party/re2/re2/filtered_re2.h',
'third_party/re2/re2/pod_array.h',

2
gRPC-ProtoRPC.podspec generated
Unescape View File

@ -21,7 +21,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC-ProtoRPC'
version = '1.64.0-dev'
version = '1.65.0-dev'
s.version = version
s.summary = 'RPC library for Protocol Buffers, based on gRPC'
s.homepage = 'https://grpc.io'

2
gRPC-RxLibrary.podspec generated
Unescape View File

@ -21,7 +21,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC-RxLibrary'
version = '1.64.0-dev'
version = '1.65.0-dev'
s.version = version
s.summary = 'Reactive Extensions library for iOS/OSX.'
s.homepage = 'https://grpc.io'

2
gRPC.podspec generated
Unescape View File

@ -20,7 +20,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC'
version = '1.64.0-dev'
version = '1.65.0-dev'
s.version = version
s.summary = 'gRPC client library for iOS/OSX'
s.homepage = 'https://grpc.io'

108
grpc.gemspec generated
Unescape View File

@ -1065,60 +1065,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c )
s.files += %w( src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h )
s.files += %w( src/core/ext/xds/certificate_provider_store.cc )
s.files += %w( src/core/ext/xds/certificate_provider_store.h )
s.files += %w( src/core/ext/xds/file_watcher_certificate_provider_factory.cc )
s.files += %w( src/core/ext/xds/file_watcher_certificate_provider_factory.h )
s.files += %w( src/core/ext/xds/upb_utils.h )
s.files += %w( src/core/ext/xds/xds_api.cc )
s.files += %w( src/core/ext/xds/xds_api.h )
s.files += %w( src/core/ext/xds/xds_audit_logger_registry.cc )
s.files += %w( src/core/ext/xds/xds_audit_logger_registry.h )
s.files += %w( src/core/ext/xds/xds_bootstrap.cc )
s.files += %w( src/core/ext/xds/xds_bootstrap.h )
s.files += %w( src/core/ext/xds/xds_bootstrap_grpc.cc )
s.files += %w( src/core/ext/xds/xds_bootstrap_grpc.h )
s.files += %w( src/core/ext/xds/xds_certificate_provider.cc )
s.files += %w( src/core/ext/xds/xds_certificate_provider.h )
s.files += %w( src/core/ext/xds/xds_channel_args.h )
s.files += %w( src/core/ext/xds/xds_client.cc )
s.files += %w( src/core/ext/xds/xds_client.h )
s.files += %w( src/core/ext/xds/xds_client_grpc.cc )
s.files += %w( src/core/ext/xds/xds_client_grpc.h )
s.files += %w( src/core/ext/xds/xds_client_stats.cc )
s.files += %w( src/core/ext/xds/xds_client_stats.h )
s.files += %w( src/core/ext/xds/xds_cluster.cc )
s.files += %w( src/core/ext/xds/xds_cluster.h )
s.files += %w( src/core/ext/xds/xds_cluster_specifier_plugin.cc )
s.files += %w( src/core/ext/xds/xds_cluster_specifier_plugin.h )
s.files += %w( src/core/ext/xds/xds_common_types.cc )
s.files += %w( src/core/ext/xds/xds_common_types.h )
s.files += %w( src/core/ext/xds/xds_endpoint.cc )
s.files += %w( src/core/ext/xds/xds_endpoint.h )
s.files += %w( src/core/ext/xds/xds_health_status.cc )
s.files += %w( src/core/ext/xds/xds_health_status.h )
s.files += %w( src/core/ext/xds/xds_http_fault_filter.cc )
s.files += %w( src/core/ext/xds/xds_http_fault_filter.h )
s.files += %w( src/core/ext/xds/xds_http_filters.cc )
s.files += %w( src/core/ext/xds/xds_http_filters.h )
s.files += %w( src/core/ext/xds/xds_http_rbac_filter.cc )
s.files += %w( src/core/ext/xds/xds_http_rbac_filter.h )
s.files += %w( src/core/ext/xds/xds_http_stateful_session_filter.cc )
s.files += %w( src/core/ext/xds/xds_http_stateful_session_filter.h )
s.files += %w( src/core/ext/xds/xds_lb_policy_registry.cc )
s.files += %w( src/core/ext/xds/xds_lb_policy_registry.h )
s.files += %w( src/core/ext/xds/xds_listener.cc )
s.files += %w( src/core/ext/xds/xds_listener.h )
s.files += %w( src/core/ext/xds/xds_metrics.h )
s.files += %w( src/core/ext/xds/xds_resource_type.h )
s.files += %w( src/core/ext/xds/xds_resource_type_impl.h )
s.files += %w( src/core/ext/xds/xds_route_config.cc )
s.files += %w( src/core/ext/xds/xds_route_config.h )
s.files += %w( src/core/ext/xds/xds_routing.cc )
s.files += %w( src/core/ext/xds/xds_routing.h )
s.files += %w( src/core/ext/xds/xds_transport.h )
s.files += %w( src/core/ext/xds/xds_transport_grpc.cc )
s.files += %w( src/core/ext/xds/xds_transport_grpc.h )
s.files += %w( src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc )
s.files += %w( src/core/handshaker/endpoint_info/endpoint_info_handshaker.h )
s.files += %w( src/core/handshaker/handshaker.cc )
@ -2011,6 +1957,60 @@ Gem::Specification.new do |s|
s.files += %w( src/core/tsi/transport_security_grpc.cc )
s.files += %w( src/core/tsi/transport_security_grpc.h )
s.files += %w( src/core/tsi/transport_security_interface.h )
s.files += %w( src/core/xds/grpc/certificate_provider_store.cc )
s.files += %w( src/core/xds/grpc/certificate_provider_store.h )
s.files += %w( src/core/xds/grpc/file_watcher_certificate_provider_factory.cc )
s.files += %w( src/core/xds/grpc/file_watcher_certificate_provider_factory.h )
s.files += %w( src/core/xds/grpc/upb_utils.h )
s.files += %w( src/core/xds/grpc/xds_audit_logger_registry.cc )
s.files += %w( src/core/xds/grpc/xds_audit_logger_registry.h )
s.files += %w( src/core/xds/grpc/xds_bootstrap_grpc.cc )
s.files += %w( src/core/xds/grpc/xds_bootstrap_grpc.h )
s.files += %w( src/core/xds/grpc/xds_certificate_provider.cc )
s.files += %w( src/core/xds/grpc/xds_certificate_provider.h )
s.files += %w( src/core/xds/grpc/xds_client_grpc.cc )
s.files += %w( src/core/xds/grpc/xds_client_grpc.h )
s.files += %w( src/core/xds/grpc/xds_cluster.cc )
s.files += %w( src/core/xds/grpc/xds_cluster.h )
s.files += %w( src/core/xds/grpc/xds_cluster_specifier_plugin.cc )
s.files += %w( src/core/xds/grpc/xds_cluster_specifier_plugin.h )
s.files += %w( src/core/xds/grpc/xds_common_types.cc )
s.files += %w( src/core/xds/grpc/xds_common_types.h )
s.files += %w( src/core/xds/grpc/xds_endpoint.cc )
s.files += %w( src/core/xds/grpc/xds_endpoint.h )
s.files += %w( src/core/xds/grpc/xds_health_status.cc )
s.files += %w( src/core/xds/grpc/xds_health_status.h )
s.files += %w( src/core/xds/grpc/xds_http_fault_filter.cc )
s.files += %w( src/core/xds/grpc/xds_http_fault_filter.h )
s.files += %w( src/core/xds/grpc/xds_http_filters.cc )
s.files += %w( src/core/xds/grpc/xds_http_filters.h )
s.files += %w( src/core/xds/grpc/xds_http_rbac_filter.cc )
s.files += %w( src/core/xds/grpc/xds_http_rbac_filter.h )
s.files += %w( src/core/xds/grpc/xds_http_stateful_session_filter.cc )
s.files += %w( src/core/xds/grpc/xds_http_stateful_session_filter.h )
s.files += %w( src/core/xds/grpc/xds_lb_policy_registry.cc )
s.files += %w( src/core/xds/grpc/xds_lb_policy_registry.h )
s.files += %w( src/core/xds/grpc/xds_listener.cc )
s.files += %w( src/core/xds/grpc/xds_listener.h )
s.files += %w( src/core/xds/grpc/xds_route_config.cc )
s.files += %w( src/core/xds/grpc/xds_route_config.h )
s.files += %w( src/core/xds/grpc/xds_routing.cc )
s.files += %w( src/core/xds/grpc/xds_routing.h )
s.files += %w( src/core/xds/grpc/xds_transport_grpc.cc )
s.files += %w( src/core/xds/grpc/xds_transport_grpc.h )
s.files += %w( src/core/xds/xds_client/xds_api.cc )
s.files += %w( src/core/xds/xds_client/xds_api.h )
s.files += %w( src/core/xds/xds_client/xds_bootstrap.cc )
s.files += %w( src/core/xds/xds_client/xds_bootstrap.h )
s.files += %w( src/core/xds/xds_client/xds_channel_args.h )
s.files += %w( src/core/xds/xds_client/xds_client.cc )
s.files += %w( src/core/xds/xds_client/xds_client.h )
s.files += %w( src/core/xds/xds_client/xds_client_stats.cc )
s.files += %w( src/core/xds/xds_client/xds_client_stats.h )
s.files += %w( src/core/xds/xds_client/xds_metrics.h )
s.files += %w( src/core/xds/xds_client/xds_resource_type.h )
s.files += %w( src/core/xds/xds_client/xds_resource_type_impl.h )
s.files += %w( src/core/xds/xds_client/xds_transport.h )
s.files += %w( third_party/abseil-cpp/absl/algorithm/algorithm.h )
s.files += %w( third_party/abseil-cpp/absl/algorithm/container.h )
s.files += %w( third_party/abseil-cpp/absl/base/attributes.h )

4
include/grpcpp/version_info.h
Unescape View File

@ -19,9 +19,9 @@
#define GRPCPP_VERSION_INFO_H
#define GRPC_CPP_VERSION_MAJOR 1
#define GRPC_CPP_VERSION_MINOR 64
#define GRPC_CPP_VERSION_MINOR 65
#define GRPC_CPP_VERSION_PATCH 0
#define GRPC_CPP_VERSION_TAG "dev"
#define GRPC_CPP_VERSION_STRING "1.64.0-dev"
#define GRPC_CPP_VERSION_STRING "1.65.0-dev"
#endif // GRPCPP_VERSION_INFO_H

114
package.xml generated
Unescape View File

@ -13,8 +13,8 @@
<date>2019-09-24</date>
<time>16:06:07</time>
<version>
<release>1.64.0dev</release>
<api>1.64.0dev</api>
<release>1.65.0dev</release>
<api>1.65.0dev</api>
</version>
<stability>
<release>beta</release>
@ -22,7 +22,7 @@
</stability>
<license>Apache 2.0</license>
<notes>
- gRPC Core 1.64.0 update
- gRPC Core 1.65.0 update
</notes>
<contents>
<dir baseinstalldir="/" name="/">
@ -1047,60 +1047,6 @@
<file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/certificate_provider_store.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/certificate_provider_store.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/file_watcher_certificate_provider_factory.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/file_watcher_certificate_provider_factory.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/upb_utils.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_api.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_api.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_audit_logger_registry.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_audit_logger_registry.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_bootstrap.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_bootstrap.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_bootstrap_grpc.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_bootstrap_grpc.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_certificate_provider.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_certificate_provider.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_channel_args.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_client.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_client.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_client_grpc.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_client_grpc.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_client_stats.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_client_stats.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_cluster.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_cluster.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_cluster_specifier_plugin.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_cluster_specifier_plugin.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_common_types.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_common_types.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_endpoint.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_endpoint.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_health_status.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_health_status.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_http_fault_filter.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_http_fault_filter.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_http_filters.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_http_filters.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_http_rbac_filter.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_http_rbac_filter.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_http_stateful_session_filter.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_http_stateful_session_filter.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_lb_policy_registry.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_lb_policy_registry.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_listener.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_listener.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_metrics.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_resource_type.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_resource_type_impl.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_route_config.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_route_config.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_routing.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_routing.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_transport.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_transport_grpc.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_transport_grpc.h" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/endpoint_info/endpoint_info_handshaker.h" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/handshaker.cc" role="src" />
@ -1993,6 +1939,60 @@
<file baseinstalldir="/" name="src/core/tsi/transport_security_grpc.cc" role="src" />
<file baseinstalldir="/" name="src/core/tsi/transport_security_grpc.h" role="src" />
<file baseinstalldir="/" name="src/core/tsi/transport_security_interface.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/certificate_provider_store.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/certificate_provider_store.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/file_watcher_certificate_provider_factory.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/file_watcher_certificate_provider_factory.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/upb_utils.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_audit_logger_registry.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_audit_logger_registry.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_bootstrap_grpc.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_bootstrap_grpc.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_certificate_provider.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_certificate_provider.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_client_grpc.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_client_grpc.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_cluster.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_cluster.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_cluster_specifier_plugin.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_cluster_specifier_plugin.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_common_types.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_common_types.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_endpoint.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_endpoint.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_health_status.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_health_status.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_http_fault_filter.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_http_fault_filter.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_http_filters.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_http_filters.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_http_rbac_filter.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_http_rbac_filter.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_http_stateful_session_filter.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_http_stateful_session_filter.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_lb_policy_registry.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_lb_policy_registry.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_listener.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_listener.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_route_config.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_route_config.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_routing.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_routing.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_transport_grpc.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/grpc/xds_transport_grpc.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/xds_client/xds_api.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/xds_client/xds_api.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/xds_client/xds_bootstrap.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/xds_client/xds_bootstrap.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/xds_client/xds_channel_args.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/xds_client/xds_client.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/xds_client/xds_client.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/xds_client/xds_client_stats.cc" role="src" />
<file baseinstalldir="/" name="src/core/xds/xds_client/xds_client_stats.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/xds_client/xds_metrics.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/xds_client/xds_resource_type.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/xds_client/xds_resource_type_impl.h" role="src" />
<file baseinstalldir="/" name="src/core/xds/xds_client/xds_transport.h" role="src" />
<file baseinstalldir="/" name="src/php/ext/grpc/byte_buffer.c" role="src" />
<file baseinstalldir="/" name="src/php/ext/grpc/byte_buffer.h" role="src" />
<file baseinstalldir="/" name="src/php/ext/grpc/call.c" role="src" />

86
src/core/BUILD
Unescape View File

@ -399,7 +399,7 @@ grpc_cc_library(
"absl/strings",
],
language = "c++",
deps = ["//:gpr_platform"],
deps = ["//:gpr"],
)
grpc_cc_library(
@ -5006,7 +5006,7 @@ grpc_cc_library(
grpc_cc_library(
name = "upb_utils",
hdrs = [
"ext/xds/upb_utils.h",
"xds/grpc/upb_utils.h",
],
external_deps = [
"absl/strings",
@ -5019,7 +5019,7 @@ grpc_cc_library(
grpc_cc_library(
name = "xds_enabled_server",
hdrs = [
"ext/xds/xds_enabled_server.h",
"xds/grpc/xds_enabled_server.h",
],
language = "c++",
)
@ -5027,50 +5027,50 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_xds_client",
srcs = [
"ext/xds/certificate_provider_store.cc",
"ext/xds/file_watcher_certificate_provider_factory.cc",
"ext/xds/xds_audit_logger_registry.cc",
"ext/xds/xds_bootstrap_grpc.cc",
"ext/xds/xds_certificate_provider.cc",
"ext/xds/xds_client_grpc.cc",
"ext/xds/xds_cluster.cc",
"ext/xds/xds_cluster_specifier_plugin.cc",
"ext/xds/xds_common_types.cc",
"ext/xds/xds_endpoint.cc",
"ext/xds/xds_health_status.cc",
"ext/xds/xds_http_fault_filter.cc",
"ext/xds/xds_http_filters.cc",
"ext/xds/xds_http_rbac_filter.cc",
"ext/xds/xds_http_stateful_session_filter.cc",
"ext/xds/xds_lb_policy_registry.cc",
"ext/xds/xds_listener.cc",
"ext/xds/xds_route_config.cc",
"ext/xds/xds_routing.cc",
"ext/xds/xds_transport_grpc.cc",
"lib/security/credentials/xds/xds_credentials.cc",
"xds/grpc/certificate_provider_store.cc",
"xds/grpc/file_watcher_certificate_provider_factory.cc",
"xds/grpc/xds_audit_logger_registry.cc",
"xds/grpc/xds_bootstrap_grpc.cc",
"xds/grpc/xds_certificate_provider.cc",
"xds/grpc/xds_client_grpc.cc",
"xds/grpc/xds_cluster.cc",
"xds/grpc/xds_cluster_specifier_plugin.cc",
"xds/grpc/xds_common_types.cc",
"xds/grpc/xds_endpoint.cc",
"xds/grpc/xds_health_status.cc",
"xds/grpc/xds_http_fault_filter.cc",
"xds/grpc/xds_http_filters.cc",
"xds/grpc/xds_http_rbac_filter.cc",
"xds/grpc/xds_http_stateful_session_filter.cc",
"xds/grpc/xds_lb_policy_registry.cc",
"xds/grpc/xds_listener.cc",
"xds/grpc/xds_route_config.cc",
"xds/grpc/xds_routing.cc",
"xds/grpc/xds_transport_grpc.cc",
],
hdrs = [
"ext/xds/certificate_provider_store.h",
"ext/xds/file_watcher_certificate_provider_factory.h",
"ext/xds/xds_audit_logger_registry.h",
"ext/xds/xds_bootstrap_grpc.h",
"ext/xds/xds_certificate_provider.h",
"ext/xds/xds_client_grpc.h",
"ext/xds/xds_cluster.h",
"ext/xds/xds_cluster_specifier_plugin.h",
"ext/xds/xds_common_types.h",
"ext/xds/xds_endpoint.h",
"ext/xds/xds_health_status.h",
"ext/xds/xds_http_fault_filter.h",
"ext/xds/xds_http_filters.h",
"ext/xds/xds_http_rbac_filter.h",
"ext/xds/xds_http_stateful_session_filter.h",
"ext/xds/xds_lb_policy_registry.h",
"ext/xds/xds_listener.h",
"ext/xds/xds_route_config.h",
"ext/xds/xds_routing.h",
"ext/xds/xds_transport_grpc.h",
"lib/security/credentials/xds/xds_credentials.h",
"xds/grpc/certificate_provider_store.h",
"xds/grpc/file_watcher_certificate_provider_factory.h",
"xds/grpc/xds_audit_logger_registry.h",
"xds/grpc/xds_bootstrap_grpc.h",
"xds/grpc/xds_certificate_provider.h",
"xds/grpc/xds_client_grpc.h",
"xds/grpc/xds_cluster.h",
"xds/grpc/xds_cluster_specifier_plugin.h",
"xds/grpc/xds_common_types.h",
"xds/grpc/xds_endpoint.h",
"xds/grpc/xds_health_status.h",
"xds/grpc/xds_http_fault_filter.h",
"xds/grpc/xds_http_filters.h",
"xds/grpc/xds_http_rbac_filter.h",
"xds/grpc/xds_http_stateful_session_filter.h",
"xds/grpc/xds_lb_policy_registry.h",
"xds/grpc/xds_listener.h",
"xds/grpc/xds_route_config.h",
"xds/grpc/xds_routing.h",
"xds/grpc/xds_transport_grpc.h",
],
external_deps = [
"absl/base:core_headers",

12
src/core/lib/gprpp/validation_errors.cc
Unescape View File

@ -14,6 +14,8 @@
#include "src/core/lib/gprpp/validation_errors.h"
#include <inttypes.h>
#include <utility>
#include "absl/status/status.h"
@ -21,6 +23,7 @@
#include "absl/strings/str_join.h"
#include "absl/strings/strip.h"
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
namespace grpc_core {
@ -34,7 +37,14 @@ void ValidationErrors::PushField(absl::string_view ext) {
void ValidationErrors::PopField() { fields_.pop_back(); }
void ValidationErrors::AddError(absl::string_view error) {
field_errors_[absl::StrJoin(fields_, "")].emplace_back(error);
auto key = absl::StrJoin(fields_, "");
if (field_errors_[key].size() >= max_error_count_) {
gpr_log(GPR_DEBUG,
"Ignoring validation error: too many errors found (%" PRIuPTR ")",
max_error_count_);
return;
}
field_errors_[key].emplace_back(error);
}
bool ValidationErrors::FieldHasErrors() const {

11
src/core/lib/gprpp/validation_errors.h
Unescape View File

@ -63,6 +63,9 @@ namespace grpc_core {
// }
class ValidationErrors {
public:
// Default maximum number of errors to track per scope.
static constexpr size_t kMaxErrorCount = 20;
// Pushes a field name onto the stack at construction and pops it off
// of the stack at destruction.
class ScopedField {
@ -93,6 +96,12 @@ class ValidationErrors {
ValidationErrors* errors_;
};
ValidationErrors() : ValidationErrors(kMaxErrorCount) {}
// Creates a tracker that collects at most `max_error_count` errors per field.
explicit ValidationErrors(size_t max_error_count)
: max_error_count_(max_error_count) {}
// Records that we've encountered an error associated with the current
// field.
void AddError(absl::string_view error) GPR_ATTRIBUTE_NOINLINE;
@ -127,6 +136,8 @@ class ValidationErrors {
// Stack of field names indicating the field that we are currently
// validating.
std::vector<std::string> fields_;
size_t max_error_count_;
};
} // namespace grpc_core

2
src/core/lib/security/credentials/xds/xds_credentials.cc
Unescape View File

@ -26,7 +26,6 @@
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_certificate_provider.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/gpr/useful.h"
#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
@ -34,6 +33,7 @@
#include "src/core/lib/security/credentials/tls/tls_credentials.h"
#include "src/core/lib/security/credentials/tls/tls_utils.h"
#include "src/core/load_balancing/xds/xds_channel_args.h"
#include "src/core/xds/grpc/xds_certificate_provider.h"
namespace grpc_core {

2
src/core/lib/security/credentials/xds/xds_credentials.h
Unescape View File

@ -33,7 +33,6 @@
#include <grpc/grpc_security.h>
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_certificate_provider.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/unique_type_name.h"
@ -41,6 +40,7 @@
#include "src/core/lib/security/credentials/credentials.h"
#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h"
#include "src/core/lib/security/security_connector/security_connector.h"
#include "src/core/xds/grpc/xds_certificate_provider.h"
namespace grpc_core {

2
src/core/lib/surface/version.cc
Unescape View File

@ -24,4 +24,4 @@
const char* grpc_version_string(void) { return "41.0.0"; }
const char* grpc_g_stands_for(void) { return "grateful"; }
const char* grpc_g_stands_for(void) { return "gnarly"; }

6
src/core/load_balancing/xds/cds.cc
Unescape View File

@ -37,9 +37,6 @@
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_cluster.h"
#include "src/core/ext/xds/xds_common_types.h"
#include "src/core/ext/xds/xds_health_status.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/debug/trace.h"
@ -64,6 +61,9 @@
#include "src/core/load_balancing/outlier_detection/outlier_detection.h"
#include "src/core/load_balancing/xds/xds_channel_args.h"
#include "src/core/resolver/xds/xds_dependency_manager.h"
#include "src/core/xds/grpc/xds_cluster.h"
#include "src/core/xds/grpc/xds_common_types.h"
#include "src/core/xds/grpc/xds_health_status.h"
namespace grpc_core {

12
src/core/load_balancing/xds/xds_cluster_impl.cc
Unescape View File

@ -38,12 +38,6 @@
#include <grpc/support/port_platform.h>
#include "src/core/client_channel/client_channel_internal.h"
#include "src/core/ext/xds/xds_bootstrap.h"
#include "src/core/ext/xds/xds_bootstrap_grpc.h"
#include "src/core/ext/xds/xds_client.h"
#include "src/core/ext/xds/xds_client_grpc.h"
#include "src/core/ext/xds/xds_client_stats.h"
#include "src/core/ext/xds/xds_endpoint.h"
#include "src/core/lib/channel/call_tracer.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/config/core_configuration.h"
@ -73,6 +67,12 @@
#include "src/core/load_balancing/xds/xds_channel_args.h"
#include "src/core/resolver/endpoint_addresses.h"
#include "src/core/resolver/xds/xds_dependency_manager.h"
#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
#include "src/core/xds/grpc/xds_client_grpc.h"
#include "src/core/xds/grpc/xds_endpoint.h"
#include "src/core/xds/xds_client/xds_bootstrap.h"
#include "src/core/xds/xds_client/xds_client.h"
#include "src/core/xds/xds_client/xds_client_stats.h"
namespace grpc_core {

2
src/core/load_balancing/xds/xds_override_host.cc
Unescape View File

@ -49,7 +49,6 @@
#include "src/core/client_channel/client_channel_internal.h"
#include "src/core/ext/filters/stateful_session/stateful_session_filter.h"
#include "src/core/ext/xds/xds_health_status.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"
@ -82,6 +81,7 @@
#include "src/core/load_balancing/subchannel_interface.h"
#include "src/core/resolver/endpoint_addresses.h"
#include "src/core/resolver/xds/xds_dependency_manager.h"
#include "src/core/xds/grpc/xds_health_status.h"
namespace grpc_core {

2
src/core/load_balancing/xds/xds_wrr_locality.cc
Unescape View File

@ -31,7 +31,6 @@
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_client_stats.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/debug/trace.h"
@ -51,6 +50,7 @@
#include "src/core/load_balancing/lb_policy_registry.h"
#include "src/core/load_balancing/xds/xds_channel_args.h"
#include "src/core/resolver/endpoint_addresses.h"
#include "src/core/xds/xds_client/xds_client_stats.h"
namespace grpc_core {

4
src/core/resolver/google_c2p/google_c2p_resolver.cc
Unescape View File

@ -33,8 +33,6 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/gcp/metadata_query.h"
#include "src/core/ext/xds/xds_bootstrap.h"
#include "src/core/ext/xds/xds_client_grpc.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"
@ -52,6 +50,8 @@
#include "src/core/resolver/resolver.h"
#include "src/core/resolver/resolver_factory.h"
#include "src/core/resolver/resolver_registry.h"
#include "src/core/xds/grpc/xds_client_grpc.h"
#include "src/core/xds/xds_client/xds_bootstrap.h"
namespace grpc_core {

2
src/core/resolver/xds/xds_dependency_manager.cc
Unescape View File

@ -23,12 +23,12 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_routing.h"
#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/gprpp/match.h"
#include "src/core/load_balancing/xds/xds_channel_args.h"
#include "src/core/resolver/fake/fake_resolver.h"
#include "src/core/resolver/xds/xds_resolver_trace.h"
#include "src/core/xds/grpc/xds_routing.h"
namespace grpc_core {

10
src/core/resolver/xds/xds_dependency_manager.h
Unescape View File

@ -23,13 +23,13 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_client_grpc.h"
#include "src/core/ext/xds/xds_cluster.h"
#include "src/core/ext/xds/xds_endpoint.h"
#include "src/core/ext/xds/xds_listener.h"
#include "src/core/ext/xds/xds_route_config.h"
#include "src/core/lib/gprpp/ref_counted.h"
#include "src/core/resolver/resolver.h"
#include "src/core/xds/grpc/xds_client_grpc.h"
#include "src/core/xds/grpc/xds_cluster.h"
#include "src/core/xds/grpc/xds_endpoint.h"
#include "src/core/xds/grpc/xds_listener.h"
#include "src/core/xds/grpc/xds_route_config.h"
namespace grpc_core {

14
src/core/resolver/xds/xds_resolver.cc
Unescape View File

@ -50,13 +50,6 @@
#include "src/core/client_channel/client_channel_internal.h"
#include "src/core/client_channel/config_selector.h"
#include "src/core/ext/xds/xds_bootstrap.h"
#include "src/core/ext/xds/xds_bootstrap_grpc.h"
#include "src/core/ext/xds/xds_client_grpc.h"
#include "src/core/ext/xds/xds_http_filters.h"
#include "src/core/ext/xds/xds_listener.h"
#include "src/core/ext/xds/xds_route_config.h"
#include "src/core/ext/xds/xds_routing.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/channel_fwd.h"
#include "src/core/lib/channel/channel_stack.h"
@ -93,6 +86,13 @@
#include "src/core/resolver/xds/xds_resolver_trace.h"
#include "src/core/service_config/service_config.h"
#include "src/core/service_config/service_config_impl.h"
#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
#include "src/core/xds/grpc/xds_client_grpc.h"
#include "src/core/xds/grpc/xds_http_filters.h"
#include "src/core/xds/grpc/xds_listener.h"
#include "src/core/xds/grpc/xds_route_config.h"
#include "src/core/xds/grpc/xds_routing.h"
#include "src/core/xds/xds_client/xds_bootstrap.h"
namespace grpc_core {

20
src/core/server/xds_server_config_fetcher.cc
Unescape View File

@ -47,16 +47,6 @@
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/certificate_provider_store.h"
#include "src/core/ext/xds/xds_bootstrap_grpc.h"
#include "src/core/ext/xds/xds_certificate_provider.h"
#include "src/core/ext/xds/xds_client.h"
#include "src/core/ext/xds/xds_client_grpc.h"
#include "src/core/ext/xds/xds_common_types.h"
#include "src/core/ext/xds/xds_http_filters.h"
#include "src/core/ext/xds/xds_listener.h"
#include "src/core/ext/xds/xds_route_config.h"
#include "src/core/ext/xds/xds_routing.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"
@ -89,6 +79,16 @@
#include "src/core/server/xds_channel_stack_modifier.h"
#include "src/core/service_config/service_config.h"
#include "src/core/service_config/service_config_impl.h"
#include "src/core/xds/grpc/certificate_provider_store.h"
#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
#include "src/core/xds/grpc/xds_certificate_provider.h"
#include "src/core/xds/grpc/xds_client_grpc.h"
#include "src/core/xds/grpc/xds_common_types.h"
#include "src/core/xds/grpc/xds_http_filters.h"
#include "src/core/xds/grpc/xds_listener.h"
#include "src/core/xds/grpc/xds_route_config.h"
#include "src/core/xds/grpc/xds_routing.h"
#include "src/core/xds/xds_client/xds_client.h"
namespace grpc_core {
namespace {

2
src/core/ext/xds/certificate_provider_store.cc → src/core/xds/grpc/certificate_provider_store.cc
Unescape View File

@ -16,7 +16,7 @@
//
//
#include "src/core/ext/xds/certificate_provider_store.h"
#include "src/core/xds/grpc/certificate_provider_store.h"
#include "absl/strings/str_cat.h"

6
src/core/ext/xds/certificate_provider_store.h → src/core/xds/grpc/certificate_provider_store.h
Unescape View File

@ -16,8 +16,8 @@
//
//
#ifndef GRPC_SRC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_STORE_H
#define GRPC_SRC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_STORE_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_CERTIFICATE_PROVIDER_STORE_H
#define GRPC_SRC_CORE_XDS_GRPC_CERTIFICATE_PROVIDER_STORE_H
#include <map>
#include <string>
@ -130,4 +130,4 @@ class CertificateProviderStore final
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_STORE_H
#endif // GRPC_SRC_CORE_XDS_GRPC_CERTIFICATE_PROVIDER_STORE_H

2
src/core/ext/xds/file_watcher_certificate_provider_factory.cc → src/core/xds/grpc/file_watcher_certificate_provider_factory.cc
Unescape View File

@ -16,7 +16,7 @@
//
//
#include "src/core/ext/xds/file_watcher_certificate_provider_factory.h"
#include "src/core/xds/grpc/file_watcher_certificate_provider_factory.h"
#include <algorithm>
#include <map>

6
src/core/ext/xds/file_watcher_certificate_provider_factory.h → src/core/xds/grpc/file_watcher_certificate_provider_factory.h
Unescape View File

@ -16,8 +16,8 @@
//
//
#ifndef GRPC_SRC_CORE_EXT_XDS_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H
#define GRPC_SRC_CORE_EXT_XDS_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H
#define GRPC_SRC_CORE_XDS_GRPC_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H
#include <string>
@ -78,4 +78,4 @@ class FileWatcherCertificateProviderFactory final
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H
#endif // GRPC_SRC_CORE_XDS_GRPC_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H

6
src/core/ext/xds/upb_utils.h → src/core/xds/grpc/upb_utils.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_UPB_UTILS_H
#define GRPC_SRC_CORE_EXT_XDS_UPB_UTILS_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_UPB_UTILS_H
#define GRPC_SRC_CORE_XDS_GRPC_UPB_UTILS_H
#include <string>
@ -42,4 +42,4 @@ inline std::string UpbStringToStdString(const upb_StringView& str) {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_UPB_UTILS_H
#endif // GRPC_SRC_CORE_XDS_GRPC_UPB_UTILS_H

4
src/core/ext/xds/xds_audit_logger_registry.cc → src/core/xds/grpc/xds_audit_logger_registry.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License.
//
#include "src/core/ext/xds/xds_audit_logger_registry.h"
#include "src/core/xds/grpc/xds_audit_logger_registry.h"
#include <string>
#include <utility>
@ -28,10 +28,10 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_common_types.h"
#include "src/core/lib/gprpp/match.h"
#include "src/core/lib/gprpp/validation_errors.h"
#include "src/core/lib/security/authorization/audit_logging.h"
#include "src/core/xds/grpc/xds_common_types.h"
namespace grpc_core {

8
src/core/ext/xds/xds_audit_logger_registry.h → src/core/xds/grpc/xds_audit_logger_registry.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_AUDIT_LOGGER_REGISTRY_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_AUDIT_LOGGER_REGISTRY_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_AUDIT_LOGGER_REGISTRY_H
#define GRPC_SRC_CORE_XDS_GRPC_XDS_AUDIT_LOGGER_REGISTRY_H
#include <map>
#include <memory>
@ -25,9 +25,9 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_resource_type.h"
#include "src/core/lib/gprpp/validation_errors.h"
#include "src/core/lib/json/json.h"
#include "src/core/xds/xds_client/xds_resource_type.h"
namespace grpc_core {
@ -65,4 +65,4 @@ class XdsAuditLoggerRegistry final {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_AUDIT_LOGGER_REGISTRY_H
#endif // GRPC_SRC_CORE_XDS_GRPC_XDS_AUDIT_LOGGER_REGISTRY_H

2
src/core/ext/xds/xds_bootstrap_grpc.cc → src/core/xds/grpc/xds_bootstrap_grpc.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License.
//
#include "src/core/ext/xds/xds_bootstrap_grpc.h"
#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
#include <stdlib.h>

18
src/core/ext/xds/xds_bootstrap_grpc.h → src/core/xds/grpc/xds_bootstrap_grpc.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_BOOTSTRAP_GRPC_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_BOOTSTRAP_GRPC_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_BOOTSTRAP_GRPC_H
#define GRPC_SRC_CORE_XDS_GRPC_XDS_BOOTSTRAP_GRPC_H
#include <map>
#include <memory>
@ -29,18 +29,18 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/certificate_provider_store.h"
#include "src/core/ext/xds/xds_audit_logger_registry.h"
#include "src/core/ext/xds/xds_bootstrap.h"
#include "src/core/ext/xds/xds_cluster_specifier_plugin.h"
#include "src/core/ext/xds/xds_http_filters.h"
#include "src/core/ext/xds/xds_lb_policy_registry.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/validation_errors.h"
#include "src/core/lib/json/json.h"
#include "src/core/lib/json/json_args.h"
#include "src/core/lib/json/json_object_loader.h"
#include "src/core/lib/security/credentials/channel_creds_registry.h"
#include "src/core/xds/grpc/certificate_provider_store.h"
#include "src/core/xds/grpc/xds_audit_logger_registry.h"
#include "src/core/xds/grpc/xds_cluster_specifier_plugin.h"
#include "src/core/xds/grpc/xds_http_filters.h"
#include "src/core/xds/grpc/xds_lb_policy_registry.h"
#include "src/core/xds/xds_client/xds_bootstrap.h"
namespace grpc_core {
@ -194,4 +194,4 @@ class GrpcXdsBootstrap final : public XdsBootstrap {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_BOOTSTRAP_GRPC_H
#endif // GRPC_SRC_CORE_XDS_GRPC_XDS_BOOTSTRAP_GRPC_H

2
src/core/ext/xds/xds_certificate_provider.cc → src/core/xds/grpc/xds_certificate_provider.cc
Unescape View File

@ -16,7 +16,7 @@
//
//
#include "src/core/ext/xds/xds_certificate_provider.h"
#include "src/core/xds/grpc/xds_certificate_provider.h"
#include <utility>

6
src/core/ext/xds/xds_certificate_provider.h → src/core/xds/grpc/xds_certificate_provider.h
Unescape View File

@ -16,8 +16,8 @@
//
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CERTIFICATE_PROVIDER_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_CERTIFICATE_PROVIDER_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_CERTIFICATE_PROVIDER_H
#define GRPC_SRC_CORE_XDS_GRPC_XDS_CERTIFICATE_PROVIDER_H
#include <map>
#include <memory>
@ -112,4 +112,4 @@ class XdsCertificateProvider final : public grpc_tls_certificate_provider {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_CERTIFICATE_PROVIDER_H
#endif // GRPC_SRC_CORE_XDS_GRPC_XDS_CERTIFICATE_PROVIDER_H

18
src/core/ext/xds/xds_client_grpc.cc → src/core/xds/grpc/xds_client_grpc.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License.
//
#include "src/core/ext/xds/xds_client_grpc.h"
#include "src/core/xds/grpc/xds_client_grpc.h"
#include <algorithm>
#include <cstddef>
@ -39,14 +39,6 @@
#include <grpc/support/port_platform.h>
#include <grpc/support/string_util.h>
#include "src/core/ext/xds/upb_utils.h"
#include "src/core/ext/xds/xds_api.h"
#include "src/core/ext/xds/xds_bootstrap.h"
#include "src/core/ext/xds/xds_bootstrap_grpc.h"
#include "src/core/ext/xds/xds_channel_args.h"
#include "src/core/ext/xds/xds_client.h"
#include "src/core/ext/xds/xds_transport.h"
#include "src/core/ext/xds/xds_transport_grpc.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/metrics.h"
#include "src/core/lib/debug/trace.h"
@ -63,6 +55,14 @@
#include "src/core/lib/slice/slice.h"
#include "src/core/lib/slice/slice_internal.h"
#include "src/core/lib/transport/error_utils.h"
#include "src/core/xds/grpc/upb_utils.h"
#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
#include "src/core/xds/grpc/xds_transport_grpc.h"
#include "src/core/xds/xds_client/xds_api.h"
#include "src/core/xds/xds_client/xds_bootstrap.h"
#include "src/core/xds/xds_client/xds_channel_args.h"
#include "src/core/xds/xds_client/xds_client.h"
#include "src/core/xds/xds_client/xds_transport.h"
// If gRPC is built with -DGRPC_XDS_USER_AGENT_NAME_SUFFIX="...", that string
// will be appended to the user agent name reported to the xDS server.

14
src/core/ext/xds/xds_client_grpc.h → src/core/xds/grpc/xds_client_grpc.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_GRPC_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_GRPC_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_CLIENT_GRPC_H
#define GRPC_SRC_CORE_XDS_GRPC_XDS_CLIENT_GRPC_H
#include <memory>
@ -25,10 +25,6 @@
#include <grpc/grpc.h>
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/certificate_provider_store.h"
#include "src/core/ext/xds/xds_bootstrap_grpc.h"
#include "src/core/ext/xds/xds_client.h"
#include "src/core/ext/xds/xds_transport.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/metrics.h"
#include "src/core/lib/gpr/useful.h"
@ -36,6 +32,10 @@
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/iomgr/iomgr_fwd.h"
#include "src/core/resolver/endpoint_addresses.h"
#include "src/core/xds/grpc/certificate_provider_store.h"
#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
#include "src/core/xds/xds_client/xds_client.h"
#include "src/core/xds/xds_client/xds_transport.h"
namespace grpc_core {
@ -106,4 +106,4 @@ void SetXdsFallbackBootstrapConfig(const char* config);
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_GRPC_H
#endif // GRPC_SRC_CORE_XDS_GRPC_XDS_CLIENT_GRPC_H

12
src/core/ext/xds/xds_cluster.cc → src/core/xds/grpc/xds_cluster.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License.
//
#include "src/core/ext/xds/xds_cluster.h"
#include "src/core/xds/grpc/xds_cluster.h"
#include <stddef.h>
@ -56,11 +56,6 @@
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/upb_utils.h"
#include "src/core/ext/xds/xds_client.h"
#include "src/core/ext/xds/xds_common_types.h"
#include "src/core/ext/xds/xds_lb_policy_registry.h"
#include "src/core/ext/xds/xds_resource_type.h"
#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/debug/trace.h"
#include "src/core/lib/gprpp/host_port.h"
@ -71,6 +66,11 @@
#include "src/core/lib/json/json_writer.h"
#include "src/core/lib/matchers/matchers.h"
#include "src/core/load_balancing/lb_policy_registry.h"
#include "src/core/xds/grpc/upb_utils.h"
#include "src/core/xds/grpc/xds_common_types.h"
#include "src/core/xds/grpc/xds_lb_policy_registry.h"
#include "src/core/xds/xds_client/xds_client.h"
#include "src/core/xds/xds_client/xds_resource_type.h"
namespace grpc_core {

20
src/core/ext/xds/xds_cluster.h → src/core/xds/grpc/xds_cluster.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_CLUSTER_H
#define GRPC_SRC_CORE_XDS_GRPC_XDS_CLUSTER_H
#include <stdint.h>
@ -35,15 +35,15 @@
#include <grpc/support/json.h>
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_bootstrap.h"
#include "src/core/ext/xds/xds_bootstrap_grpc.h"
#include "src/core/ext/xds/xds_client.h"
#include "src/core/ext/xds/xds_common_types.h"
#include "src/core/ext/xds/xds_health_status.h"
#include "src/core/ext/xds/xds_resource_type.h"
#include "src/core/ext/xds/xds_resource_type_impl.h"
#include "src/core/lib/json/json.h"
#include "src/core/load_balancing/outlier_detection/outlier_detection.h"
#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
#include "src/core/xds/grpc/xds_common_types.h"
#include "src/core/xds/grpc/xds_health_status.h"
#include "src/core/xds/xds_client/xds_bootstrap.h"
#include "src/core/xds/xds_client/xds_client.h"
#include "src/core/xds/xds_client/xds_resource_type.h"
#include "src/core/xds/xds_client/xds_resource_type_impl.h"
namespace grpc_core {
@ -141,4 +141,4 @@ class XdsClusterResourceType
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_H
#endif // GRPC_SRC_CORE_XDS_GRPC_XDS_CLUSTER_H

2
src/core/ext/xds/xds_cluster_specifier_plugin.cc → src/core/xds/grpc/xds_cluster_specifier_plugin.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License.
//
#include "src/core/ext/xds/xds_cluster_specifier_plugin.h"
#include "src/core/xds/grpc/xds_cluster_specifier_plugin.h"
#include <stddef.h>

8
src/core/ext/xds/xds_cluster_specifier_plugin.h → src/core/xds/grpc/xds_cluster_specifier_plugin.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_SPECIFIER_PLUGIN_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_SPECIFIER_PLUGIN_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_CLUSTER_SPECIFIER_PLUGIN_H
#define GRPC_SRC_CORE_XDS_GRPC_XDS_CLUSTER_SPECIFIER_PLUGIN_H
#include <map>
#include <memory>
@ -27,9 +27,9 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_common_types.h"
#include "src/core/lib/gprpp/validation_errors.h"
#include "src/core/lib/json/json.h"
#include "src/core/xds/grpc/xds_common_types.h"
namespace grpc_core {
@ -94,4 +94,4 @@ class XdsClusterSpecifierPluginRegistry final {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_SPECIFIER_PLUGIN_H
#endif // GRPC_SRC_CORE_XDS_GRPC_XDS_CLUSTER_SPECIFIER_PLUGIN_H

8
src/core/ext/xds/xds_common_types.cc → src/core/xds/grpc/xds_common_types.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License.
//
#include "src/core/ext/xds/xds_common_types.h"
#include "src/core/xds/grpc/xds_common_types.h"
#include <stddef.h>
#include <stdint.h>
@ -44,10 +44,10 @@
#include <grpc/support/json.h>
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/upb_utils.h"
#include "src/core/ext/xds/xds_bootstrap_grpc.h"
#include "src/core/ext/xds/xds_client.h"
#include "src/core/lib/json/json_reader.h"
#include "src/core/xds/grpc/upb_utils.h"
#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
#include "src/core/xds/xds_client/xds_client.h"
namespace grpc_core {

8
src/core/ext/xds/xds_common_types.h → src/core/xds/grpc/xds_common_types.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_COMMON_TYPES_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_COMMON_TYPES_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_COMMON_TYPES_H
#define GRPC_SRC_CORE_XDS_GRPC_XDS_COMMON_TYPES_H
#include <string>
#include <vector>
@ -29,11 +29,11 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_resource_type.h"
#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/gprpp/validation_errors.h"
#include "src/core/lib/json/json.h"
#include "src/core/lib/matchers/matchers.h"
#include "src/core/xds/xds_client/xds_resource_type.h"
namespace grpc_core {
@ -105,4 +105,4 @@ absl::optional<XdsExtension> ExtractXdsExtension(
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_COMMON_TYPES_H
#endif // GRPC_SRC_CORE_XDS_GRPC_XDS_COMMON_TYPES_H

6
src/core/ext/xds/xds_enabled_server.h → src/core/xds/grpc/xds_enabled_server.h
Unescape View File

@ -14,11 +14,11 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_ENABLED_SERVER_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_ENABLED_SERVER_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_ENABLED_SERVER_H
#define GRPC_SRC_CORE_XDS_GRPC_XDS_ENABLED_SERVER_H
// EXPERIMENTAL. Bool-valued channel arg used as an indicator that a server is
// xds enabled.
#define GRPC_ARG_XDS_ENABLED_SERVER "grpc.experimental.xds_enabled_server"
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_ENABLED_SERVER_H
#endif // GRPC_SRC_CORE_XDS_GRPC_XDS_ENABLED_SERVER_H

8
src/core/ext/xds/xds_endpoint.cc → src/core/xds/grpc/xds_endpoint.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License.
//
#include "src/core/ext/xds/xds_endpoint.h"
#include "src/core/xds/grpc/xds_endpoint.h"
#include <stdlib.h>
#include <string.h>
@ -43,9 +43,6 @@
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/upb_utils.h"
#include "src/core/ext/xds/xds_health_status.h"
#include "src/core/ext/xds/xds_resource_type.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"
@ -54,6 +51,9 @@
#include "src/core/lib/gprpp/env.h"
#include "src/core/lib/gprpp/validation_errors.h"
#include "src/core/lib/iomgr/resolved_address.h"
#include "src/core/xds/grpc/upb_utils.h"
#include "src/core/xds/grpc/xds_health_status.h"
#include "src/core/xds/xds_client/xds_resource_type.h"
// IWYU pragma: no_include "absl/meta/type_traits.h"

14
src/core/ext/xds/xds_endpoint.h → src/core/xds/grpc/xds_endpoint.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_ENDPOINT_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_ENDPOINT_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_ENDPOINT_H
#define GRPC_SRC_CORE_XDS_GRPC_XDS_ENDPOINT_H
#include <stdint.h>
@ -33,14 +33,14 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_client.h"
#include "src/core/ext/xds/xds_client_stats.h"
#include "src/core/ext/xds/xds_resource_type.h"
#include "src/core/ext/xds/xds_resource_type_impl.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/resolver/endpoint_addresses.h"
#include "src/core/xds/xds_client/xds_client.h"
#include "src/core/xds/xds_client/xds_client_stats.h"
#include "src/core/xds/xds_client/xds_resource_type.h"
#include "src/core/xds/xds_client/xds_resource_type_impl.h"
namespace grpc_core {
@ -147,4 +147,4 @@ class XdsEndpointResourceType final
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_ENDPOINT_H
#endif // GRPC_SRC_CORE_XDS_GRPC_XDS_ENDPOINT_H

2
src/core/ext/xds/xds_health_status.cc → src/core/xds/grpc/xds_health_status.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License.
//
#include "src/core/ext/xds/xds_health_status.h"
#include "src/core/xds/grpc/xds_health_status.h"
#include <string>

6
src/core/ext/xds/xds_health_status.h → src/core/xds/grpc/xds_health_status.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HEALTH_STATUS_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_HEALTH_STATUS_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_HEALTH_STATUS_H
#define GRPC_SRC_CORE_XDS_GRPC_XDS_HEALTH_STATUS_H
#include <stdint.h>
@ -88,4 +88,4 @@ class XdsHealthStatusSet final {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_HEALTH_STATUS_H
#endif // GRPC_SRC_CORE_XDS_GRPC_XDS_HEALTH_STATUS_H

6
src/core/ext/xds/xds_http_fault_filter.cc → src/core/xds/grpc/xds_http_fault_filter.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License.
//
#include "src/core/ext/xds/xds_http_fault_filter.h"
#include "src/core/xds/grpc/xds_http_fault_filter.h"
#include <stdint.h>
@ -37,8 +37,6 @@
#include "src/core/ext/filters/fault_injection/fault_injection_filter.h"
#include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h"
#include "src/core/ext/xds/xds_common_types.h"
#include "src/core/ext/xds/xds_http_filters.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/status_util.h"
#include "src/core/lib/gprpp/time.h"
@ -46,6 +44,8 @@
#include "src/core/lib/json/json.h"
#include "src/core/lib/json/json_writer.h"
#include "src/core/lib/transport/status_conversion.h"
#include "src/core/xds/grpc/xds_common_types.h"
#include "src/core/xds/grpc/xds_http_filters.h"
namespace grpc_core {

12
src/core/ext/xds/xds_http_fault_filter.h → src/core/xds/grpc/xds_http_fault_filter.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FAULT_FILTER_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FAULT_FILTER_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_FAULT_FILTER_H
#define GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_FAULT_FILTER_H
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
@ -24,12 +24,12 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_common_types.h"
#include "src/core/ext/xds/xds_http_filters.h"
#include "src/core/ext/xds/xds_resource_type.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/channel_fwd.h"
#include "src/core/lib/gprpp/validation_errors.h"
#include "src/core/xds/grpc/xds_common_types.h"
#include "src/core/xds/grpc/xds_http_filters.h"
#include "src/core/xds/xds_client/xds_resource_type.h"
namespace grpc_core {
@ -55,4 +55,4 @@ class XdsHttpFaultFilter final : public XdsHttpFilterImpl {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FAULT_FILTER_H
#endif // GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_FAULT_FILTER_H

8
src/core/ext/xds/xds_http_filters.cc → src/core/xds/grpc/xds_http_filters.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License.
//
#include "src/core/ext/xds/xds_http_filters.h"
#include "src/core/xds/grpc/xds_http_filters.h"
#include <map>
#include <utility>
@ -28,9 +28,9 @@
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_http_fault_filter.h"
#include "src/core/ext/xds/xds_http_rbac_filter.h"
#include "src/core/ext/xds/xds_http_stateful_session_filter.h"
#include "src/core/xds/grpc/xds_http_fault_filter.h"
#include "src/core/xds/grpc/xds_http_rbac_filter.h"
#include "src/core/xds/grpc/xds_http_stateful_session_filter.h"
namespace grpc_core {

10
src/core/ext/xds/xds_http_filters.h → src/core/xds/grpc/xds_http_filters.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FILTERS_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FILTERS_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_FILTERS_H
#define GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_FILTERS_H
#include <map>
#include <memory>
@ -32,13 +32,13 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_common_types.h"
#include "src/core/ext/xds/xds_resource_type.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/channel_fwd.h"
#include "src/core/lib/gprpp/validation_errors.h"
#include "src/core/lib/json/json.h"
#include "src/core/lib/json/json_writer.h"
#include "src/core/xds/grpc/xds_common_types.h"
#include "src/core/xds/xds_client/xds_resource_type.h"
namespace grpc_core {
@ -179,4 +179,4 @@ class XdsHttpFilterRegistry final {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FILTERS_H
#endif // GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_FILTERS_H

10
src/core/ext/xds/xds_http_rbac_filter.cc → src/core/xds/grpc/xds_http_rbac_filter.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License.
//
#include "src/core/ext/xds/xds_http_rbac_filter.h"
#include "src/core/xds/grpc/xds_http_rbac_filter.h"
#include <stddef.h>
#include <stdint.h>
@ -45,15 +45,15 @@
#include "src/core/ext/filters/rbac/rbac_filter.h"
#include "src/core/ext/filters/rbac/rbac_service_config_parser.h"
#include "src/core/ext/xds/upb_utils.h"
#include "src/core/ext/xds/xds_audit_logger_registry.h"
#include "src/core/ext/xds/xds_bootstrap_grpc.h"
#include "src/core/ext/xds/xds_client.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/gpr/string.h"
#include "src/core/lib/gprpp/env.h"
#include "src/core/lib/json/json.h"
#include "src/core/lib/json/json_writer.h"
#include "src/core/xds/grpc/upb_utils.h"
#include "src/core/xds/grpc/xds_audit_logger_registry.h"
#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
#include "src/core/xds/xds_client/xds_client.h"
namespace grpc_core {

12
src/core/ext/xds/xds_http_rbac_filter.h → src/core/xds/grpc/xds_http_rbac_filter.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_RBAC_FILTER_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_RBAC_FILTER_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_RBAC_FILTER_H
#define GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_RBAC_FILTER_H
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
@ -24,12 +24,12 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_common_types.h"
#include "src/core/ext/xds/xds_http_filters.h"
#include "src/core/ext/xds/xds_resource_type.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/channel_fwd.h"
#include "src/core/lib/gprpp/validation_errors.h"
#include "src/core/xds/grpc/xds_common_types.h"
#include "src/core/xds/grpc/xds_http_filters.h"
#include "src/core/xds/xds_client/xds_resource_type.h"
namespace grpc_core {
@ -55,4 +55,4 @@ class XdsHttpRbacFilter final : public XdsHttpFilterImpl {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_RBAC_FILTER_H
#endif // GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_RBAC_FILTER_H

8
src/core/ext/xds/xds_http_stateful_session_filter.cc → src/core/xds/grpc/xds_http_stateful_session_filter.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License.
//
#include "src/core/ext/xds/xds_http_stateful_session_filter.h"
#include "src/core/xds/grpc/xds_http_stateful_session_filter.h"
#include <string>
#include <utility>
@ -34,14 +34,14 @@
#include "src/core/ext/filters/stateful_session/stateful_session_filter.h"
#include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h"
#include "src/core/ext/xds/upb_utils.h"
#include "src/core/ext/xds/xds_common_types.h"
#include "src/core/ext/xds/xds_http_filters.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/gprpp/validation_errors.h"
#include "src/core/lib/json/json.h"
#include "src/core/lib/json/json_writer.h"
#include "src/core/xds/grpc/upb_utils.h"
#include "src/core/xds/grpc/xds_common_types.h"
#include "src/core/xds/grpc/xds_http_filters.h"
namespace grpc_core {

12
src/core/ext/xds/xds_http_stateful_session_filter.h → src/core/xds/grpc/xds_http_stateful_session_filter.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_STATEFUL_SESSION_FILTER_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_STATEFUL_SESSION_FILTER_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_STATEFUL_SESSION_FILTER_H
#define GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_STATEFUL_SESSION_FILTER_H
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
@ -24,12 +24,12 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_common_types.h"
#include "src/core/ext/xds/xds_http_filters.h"
#include "src/core/ext/xds/xds_resource_type.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/channel_fwd.h"
#include "src/core/lib/gprpp/validation_errors.h"
#include "src/core/xds/grpc/xds_common_types.h"
#include "src/core/xds/grpc/xds_http_filters.h"
#include "src/core/xds/xds_client/xds_resource_type.h"
namespace grpc_core {
@ -55,4 +55,4 @@ class XdsHttpStatefulSessionFilter final : public XdsHttpFilterImpl {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_STATEFUL_SESSION_FILTER_H
#endif // GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_STATEFUL_SESSION_FILTER_H

4
src/core/ext/xds/xds_lb_policy_registry.cc → src/core/xds/grpc/xds_lb_policy_registry.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License.
//
#include "src/core/ext/xds/xds_lb_policy_registry.h"
#include "src/core/xds/grpc/xds_lb_policy_registry.h"
#include <stddef.h>
#include <stdint.h>
@ -35,11 +35,11 @@
#include <grpc/support/json.h>
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_common_types.h"
#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/gprpp/validation_errors.h"
#include "src/core/load_balancing/lb_policy_registry.h"
#include "src/core/xds/grpc/xds_common_types.h"
namespace grpc_core {

8
src/core/ext/xds/xds_lb_policy_registry.h → src/core/xds/grpc/xds_lb_policy_registry.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_LB_POLICY_REGISTRY_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_LB_POLICY_REGISTRY_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_LB_POLICY_REGISTRY_H
#define GRPC_SRC_CORE_XDS_GRPC_XDS_LB_POLICY_REGISTRY_H
#include <map>
#include <memory>
@ -25,9 +25,9 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_resource_type.h"
#include "src/core/lib/gprpp/validation_errors.h"
#include "src/core/lib/json/json.h"
#include "src/core/xds/xds_client/xds_resource_type.h"
namespace grpc_core {
@ -68,4 +68,4 @@ class XdsLbPolicyRegistry final {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_LB_POLICY_REGISTRY_H
#endif // GRPC_SRC_CORE_XDS_GRPC_XDS_LB_POLICY_REGISTRY_H

8
src/core/ext/xds/xds_listener.cc → src/core/xds/grpc/xds_listener.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License.
//
#include "src/core/ext/xds/xds_listener.h"
#include "src/core/xds/grpc/xds_listener.h"
#include <stdint.h>
@ -47,9 +47,6 @@
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/upb_utils.h"
#include "src/core/ext/xds/xds_common_types.h"
#include "src/core/ext/xds/xds_resource_type.h"
#include "src/core/lib/address_utils/parse_address.h"
#include "src/core/lib/address_utils/sockaddr_utils.h"
#include "src/core/lib/debug/trace.h"
@ -58,6 +55,9 @@
#include "src/core/lib/gprpp/validation_errors.h"
#include "src/core/lib/iomgr/sockaddr.h"
#include "src/core/lib/matchers/matchers.h"
#include "src/core/xds/grpc/upb_utils.h"
#include "src/core/xds/grpc/xds_common_types.h"
#include "src/core/xds/xds_client/xds_resource_type.h"
namespace grpc_core {

20
src/core/ext/xds/xds_listener.h → src/core/xds/grpc/xds_listener.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_LISTENER_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_LISTENER_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_LISTENER_H
#define GRPC_SRC_CORE_XDS_GRPC_XDS_LISTENER_H
#include <stdint.h>
#include <string.h>
@ -36,15 +36,15 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_bootstrap_grpc.h"
#include "src/core/ext/xds/xds_client.h"
#include "src/core/ext/xds/xds_common_types.h"
#include "src/core/ext/xds/xds_http_filters.h"
#include "src/core/ext/xds/xds_resource_type.h"
#include "src/core/ext/xds/xds_resource_type_impl.h"
#include "src/core/ext/xds/xds_route_config.h"
#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/iomgr/resolved_address.h"
#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
#include "src/core/xds/grpc/xds_common_types.h"
#include "src/core/xds/grpc/xds_http_filters.h"
#include "src/core/xds/grpc/xds_route_config.h"
#include "src/core/xds/xds_client/xds_client.h"
#include "src/core/xds/xds_client/xds_resource_type.h"
#include "src/core/xds/xds_client/xds_resource_type_impl.h"
namespace grpc_core {
@ -233,4 +233,4 @@ class XdsListenerResourceType final
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_LISTENER_H
#endif // GRPC_SRC_CORE_XDS_GRPC_XDS_LISTENER_H

14
src/core/ext/xds/xds_route_config.cc → src/core/xds/grpc/xds_route_config.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License.
//
#include "src/core/ext/xds/xds_route_config.h"
#include "src/core/xds/grpc/xds_route_config.h"
#include <stddef.h>
#include <stdint.h>
@ -58,12 +58,6 @@
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/upb_utils.h"
#include "src/core/ext/xds/xds_cluster_specifier_plugin.h"
#include "src/core/ext/xds/xds_common_types.h"
#include "src/core/ext/xds/xds_http_filters.h"
#include "src/core/ext/xds/xds_resource_type.h"
#include "src/core/ext/xds/xds_routing.h"
#include "src/core/lib/channel/status_util.h"
#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/debug/trace.h"
@ -76,6 +70,12 @@
#include "src/core/lib/json/json_writer.h"
#include "src/core/lib/matchers/matchers.h"
#include "src/core/load_balancing/lb_policy_registry.h"
#include "src/core/xds/grpc/upb_utils.h"
#include "src/core/xds/grpc/xds_cluster_specifier_plugin.h"
#include "src/core/xds/grpc/xds_common_types.h"
#include "src/core/xds/grpc/xds_http_filters.h"
#include "src/core/xds/grpc/xds_routing.h"
#include "src/core/xds/xds_client/xds_resource_type.h"
namespace grpc_core {

18
src/core/ext/xds/xds_route_config.h → src/core/xds/grpc/xds_route_config.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_ROUTE_CONFIG_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_ROUTE_CONFIG_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTE_CONFIG_H
#define GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTE_CONFIG_H
#include <stdint.h>
@ -35,16 +35,16 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_bootstrap_grpc.h"
#include "src/core/ext/xds/xds_client.h"
#include "src/core/ext/xds/xds_cluster_specifier_plugin.h"
#include "src/core/ext/xds/xds_http_filters.h"
#include "src/core/ext/xds/xds_resource_type.h"
#include "src/core/ext/xds/xds_resource_type_impl.h"
#include "src/core/lib/channel/status_util.h"
#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/gprpp/validation_errors.h"
#include "src/core/lib/matchers/matchers.h"
#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
#include "src/core/xds/grpc/xds_cluster_specifier_plugin.h"
#include "src/core/xds/grpc/xds_http_filters.h"
#include "src/core/xds/xds_client/xds_client.h"
#include "src/core/xds/xds_client/xds_resource_type.h"
#include "src/core/xds/xds_client/xds_resource_type_impl.h"
namespace grpc_core {
@ -250,4 +250,4 @@ class XdsRouteConfigResourceType final
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_ROUTE_CONFIG_H
#endif // GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTE_CONFIG_H

4
src/core/ext/xds/xds_routing.cc → src/core/xds/grpc/xds_routing.cc
Unescape View File

@ -16,7 +16,7 @@
//
//
#include "src/core/ext/xds/xds_routing.h"
#include "src/core/xds/grpc/xds_routing.h"
#include <stdint.h>
#include <stdlib.h>
@ -34,9 +34,9 @@
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_http_filters.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/matchers/matchers.h"
#include "src/core/xds/grpc/xds_http_filters.h"
namespace grpc_core {

12
src/core/ext/xds/xds_routing.h → src/core/xds/grpc/xds_routing.h
Unescape View File

@ -16,8 +16,8 @@
//
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_ROUTING_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_ROUTING_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTING_H
#define GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTING_H
#include <stddef.h>
@ -31,11 +31,11 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_http_filters.h"
#include "src/core/ext/xds/xds_listener.h"
#include "src/core/ext/xds/xds_route_config.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/transport/metadata_batch.h"
#include "src/core/xds/grpc/xds_http_filters.h"
#include "src/core/xds/grpc/xds_listener.h"
#include "src/core/xds/grpc/xds_route_config.h"
namespace grpc_core {
@ -103,4 +103,4 @@ class XdsRouting final {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_ROUTING_H
#endif // GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTING_H

6
src/core/ext/xds/xds_transport_grpc.cc → src/core/xds/grpc/xds_transport_grpc.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License.
//
#include "src/core/ext/xds/xds_transport_grpc.h"
#include "src/core/xds/grpc/xds_transport_grpc.h"
#include <string.h>
@ -38,8 +38,6 @@
#include <grpc/support/port_platform.h>
#include "src/core/client_channel/client_channel_filter.h"
#include "src/core/ext/xds/xds_bootstrap.h"
#include "src/core/ext/xds/xds_bootstrap_grpc.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/channel_fwd.h"
#include "src/core/lib/channel/channel_stack.h"
@ -61,6 +59,8 @@
#include "src/core/lib/surface/init_internally.h"
#include "src/core/lib/surface/lame_client.h"
#include "src/core/lib/transport/connectivity_state.h"
#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
#include "src/core/xds/xds_client/xds_bootstrap.h"
namespace grpc_core {

10
src/core/ext/xds/xds_transport_grpc.h → src/core/xds/grpc/xds_transport_grpc.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_GRPC_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_GRPC_H
#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_TRANSPORT_GRPC_H
#define GRPC_SRC_CORE_XDS_GRPC_XDS_TRANSPORT_GRPC_H
#include <functional>
#include <memory>
@ -28,8 +28,6 @@
#include <grpc/status.h>
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_bootstrap.h"
#include "src/core/ext/xds/xds_transport.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/gprpp/orphanable.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
@ -37,6 +35,8 @@
#include "src/core/lib/iomgr/error.h"
#include "src/core/lib/iomgr/iomgr_fwd.h"
#include "src/core/lib/surface/channel.h"
#include "src/core/xds/xds_client/xds_bootstrap.h"
#include "src/core/xds/xds_client/xds_transport.h"
namespace grpc_core {
@ -135,4 +135,4 @@ class GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall final
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_GRPC_H
#endif // GRPC_SRC_CORE_XDS_GRPC_XDS_TRANSPORT_GRPC_H

6
src/core/ext/xds/xds_api.cc → src/core/xds/xds_client/xds_api.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License.
//
#include "src/core/ext/xds/xds_api.h"
#include "src/core/xds/xds_client/xds_api.h"
#include <stdint.h>
#include <stdlib.h>
@ -47,9 +47,9 @@
#include <grpc/support/port_platform.h>
#include <grpc/support/time.h>
#include "src/core/ext/xds/upb_utils.h"
#include "src/core/ext/xds/xds_client.h"
#include "src/core/lib/json/json.h"
#include "src/core/xds/grpc/upb_utils.h"
#include "src/core/xds/xds_client/xds_client.h"
// IWYU pragma: no_include "upb/msg_internal.h"

10
src/core/ext/xds/xds_api.h → src/core/xds/xds_client/xds_api.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_API_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_API_H
#ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_API_H
#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_API_H
#include <stddef.h>
@ -34,11 +34,11 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_bootstrap.h"
#include "src/core/ext/xds/xds_client_stats.h"
#include "src/core/lib/debug/trace.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/time.h"
#include "src/core/xds/xds_client/xds_bootstrap.h"
#include "src/core/xds/xds_client/xds_client_stats.h"
namespace grpc_core {
@ -186,4 +186,4 @@ class XdsApi final {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_API_H
#endif // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_API_H

2
src/core/ext/xds/xds_bootstrap.cc → src/core/xds/xds_client/xds_bootstrap.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License.
//
#include "src/core/ext/xds/xds_bootstrap.h"
#include "src/core/xds/xds_client/xds_bootstrap.h"
#include "absl/types/optional.h"

6
src/core/ext/xds/xds_bootstrap.h → src/core/xds/xds_client/xds_bootstrap.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_BOOTSTRAP_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_BOOTSTRAP_H
#ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_BOOTSTRAP_H
#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_BOOTSTRAP_H
#include <string>
@ -85,4 +85,4 @@ class XdsBootstrap {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_BOOTSTRAP_H
#endif // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_BOOTSTRAP_H

6
src/core/ext/xds/xds_channel_args.h → src/core/xds/xds_client/xds_channel_args.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CHANNEL_ARGS_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_CHANNEL_ARGS_H
#ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CHANNEL_ARGS_H
#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CHANNEL_ARGS_H
// Specifies channel args for the xDS client.
// Used only when GRPC_ARG_TEST_ONLY_DO_NOT_USE_IN_PROD_XDS_BOOTSTRAP_CONFIG
@ -29,4 +29,4 @@
#define GRPC_ARG_XDS_RESOURCE_DOES_NOT_EXIST_TIMEOUT_MS \
"grpc.xds_resource_does_not_exist_timeout_ms"
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_CHANNEL_ARGS_H
#endif // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CHANNEL_ARGS_H

10
src/core/ext/xds/xds_client.cc → src/core/xds/xds_client/xds_client.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License.
//
#include "src/core/ext/xds/xds_client.h"
#include "src/core/xds/xds_client/xds_client.h"
#include <inttypes.h>
#include <string.h>
@ -46,10 +46,6 @@
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/upb_utils.h"
#include "src/core/ext/xds/xds_api.h"
#include "src/core/ext/xds/xds_bootstrap.h"
#include "src/core/ext/xds/xds_client_stats.h"
#include "src/core/lib/backoff/backoff.h"
#include "src/core/lib/gprpp/debug_location.h"
#include "src/core/lib/gprpp/orphanable.h"
@ -57,6 +53,10 @@
#include "src/core/lib/gprpp/sync.h"
#include "src/core/lib/iomgr/exec_ctx.h"
#include "src/core/lib/uri/uri_parser.h"
#include "src/core/xds/grpc/upb_utils.h"
#include "src/core/xds/xds_client/xds_api.h"
#include "src/core/xds/xds_client/xds_bootstrap.h"
#include "src/core/xds/xds_client/xds_client_stats.h"
#define GRPC_XDS_INITIAL_CONNECT_BACKOFF_SECONDS 1
#define GRPC_XDS_RECONNECT_BACKOFF_MULTIPLIER 1.6

18
src/core/ext/xds/xds_client.h → src/core/xds/xds_client/xds_client.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_H
#ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_H
#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_H
#include <map>
#include <memory>
@ -33,12 +33,6 @@
#include <grpc/event_engine/event_engine.h>
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_api.h"
#include "src/core/ext/xds/xds_bootstrap.h"
#include "src/core/ext/xds/xds_client_stats.h"
#include "src/core/ext/xds/xds_metrics.h"
#include "src/core/ext/xds/xds_resource_type.h"
#include "src/core/ext/xds/xds_transport.h"
#include "src/core/lib/debug/trace.h"
#include "src/core/lib/gprpp/dual_ref_counted.h"
#include "src/core/lib/gprpp/orphanable.h"
@ -48,6 +42,12 @@
#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/gprpp/work_serializer.h"
#include "src/core/lib/uri/uri_parser.h"
#include "src/core/xds/xds_client/xds_api.h"
#include "src/core/xds/xds_client/xds_bootstrap.h"
#include "src/core/xds/xds_client/xds_client_stats.h"
#include "src/core/xds/xds_client/xds_metrics.h"
#include "src/core/xds/xds_client/xds_resource_type.h"
#include "src/core/xds/xds_client/xds_transport.h"
namespace grpc_core {
@ -387,4 +387,4 @@ class XdsClient : public DualRefCounted<XdsClient> {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_H
#endif // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_H

4
src/core/ext/xds/xds_client_stats.cc → src/core/xds/xds_client/xds_client_stats.cc
Unescape View File

@ -16,14 +16,14 @@
//
//
#include "src/core/ext/xds/xds_client_stats.h"
#include "src/core/xds/xds_client/xds_client_stats.h"
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_client.h"
#include "src/core/lib/debug/trace.h"
#include "src/core/lib/gprpp/debug_location.h"
#include "src/core/xds/xds_client/xds_client.h"
namespace grpc_core {

8
src/core/ext/xds/xds_client_stats.h → src/core/xds/xds_client/xds_client_stats.h
Unescape View File

@ -16,8 +16,8 @@
//
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_STATS_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_STATS_H
#ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_STATS_H
#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_STATS_H
#include <atomic>
#include <cstdint>
@ -31,7 +31,6 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_bootstrap.h"
#include "src/core/lib/channel/call_tracer.h"
#include "src/core/lib/gpr/useful.h"
#include "src/core/lib/gprpp/per_cpu.h"
@ -39,6 +38,7 @@
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/sync.h"
#include "src/core/resolver/endpoint_addresses.h"
#include "src/core/xds/xds_client/xds_bootstrap.h"
namespace grpc_core {
@ -255,4 +255,4 @@ class XdsClusterLocalityStats final
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_STATS_H
#endif // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_STATS_H

6
src/core/ext/xds/xds_metrics.h → src/core/xds/xds_client/xds_metrics.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_METRICS_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_METRICS_H
#ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_METRICS_H
#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_METRICS_H
#include "absl/strings/string_view.h"
@ -38,4 +38,4 @@ class XdsMetricsReporter {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_METRICS_H
#endif // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_METRICS_H

8
src/core/ext/xds/xds_resource_type.h → src/core/xds/xds_client/xds_resource_type.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_H
#ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_H
#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_H
#include <memory>
#include <string>
@ -27,8 +27,8 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_bootstrap.h"
#include "src/core/lib/debug/trace.h"
#include "src/core/xds/xds_client/xds_bootstrap.h"
namespace grpc_core {
@ -95,4 +95,4 @@ class XdsResourceType {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_H
#endif // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_H

10
src/core/ext/xds/xds_resource_type_impl.h → src/core/xds/xds_client/xds_resource_type_impl.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_IMPL_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_IMPL_H
#ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_IMPL_H
#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_IMPL_H
#include <memory>
#include <utility>
@ -23,9 +23,9 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_client.h"
#include "src/core/ext/xds/xds_resource_type.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/xds/xds_client/xds_client.h"
#include "src/core/xds/xds_client/xds_resource_type.h"
namespace grpc_core {
@ -85,4 +85,4 @@ class XdsResourceTypeImpl : public XdsResourceType {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_IMPL_H
#endif // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_IMPL_H

8
src/core/ext/xds/xds_transport.h → src/core/xds/xds_client/xds_transport.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_H
#define GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_H
#ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_TRANSPORT_H
#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_TRANSPORT_H
#include <functional>
#include <memory>
@ -26,8 +26,8 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/xds_bootstrap.h"
#include "src/core/lib/gprpp/orphanable.h"
#include "src/core/xds/xds_client/xds_bootstrap.h"
namespace grpc_core {
@ -86,4 +86,4 @@ class XdsTransportFactory : public InternallyRefCounted<XdsTransportFactory> {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_H
#endif // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_TRANSPORT_H

2
src/cpp/ext/csm/csm_observability.cc
Unescape View File

@ -34,9 +34,9 @@
#include <grpc/support/port_platform.h>
#include <grpcpp/ext/csm_observability.h>
#include "src/core/ext/xds/xds_enabled_server.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/uri/uri_parser.h"
#include "src/core/xds/grpc/xds_enabled_server.h"
#include "src/cpp/ext/csm/metadata_exchange.h"
#include "src/cpp/ext/otel/otel_plugin.h"

2
src/cpp/server/xds_server_builder.cc
Unescape View File

@ -22,7 +22,7 @@
#include <grpcpp/support/channel_arguments.h>
#include <grpcpp/xds_server_builder.h>
#include "src/core/ext/xds/xds_enabled_server.h"
#include "src/core/xds/grpc/xds_enabled_server.h"
namespace grpc {

2
src/csharp/build/dependencies.props
Unescape View File

@ -1,7 +1,7 @@
<!-- This file is generated -->
<Project>
<PropertyGroup>
<GrpcCsharpVersion>2.64.0-dev</GrpcCsharpVersion>
<GrpcCsharpVersion>2.65.0-dev</GrpcCsharpVersion>
<GoogleProtobufVersion>3.26.1</GoogleProtobufVersion>
</PropertyGroup>
</Project>

2
src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
Unescape View File

@ -42,7 +42,7 @@ Pod::Spec.new do |s|
# exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
# before them.
s.name = '!ProtoCompiler-gRPCCppPlugin'
v = '1.64.0-dev'
v = '1.65.0-dev'
s.version = v
s.summary = 'The gRPC ProtoC plugin generates C++ files from .proto services.'
s.description = <<-DESC

2
src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
Unescape View File

@ -42,7 +42,7 @@ Pod::Spec.new do |s|
# exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
# before them.
s.name = '!ProtoCompiler-gRPCPlugin'
v = '1.64.0-dev'
v = '1.65.0-dev'
s.version = v
s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
s.description = <<-DESC

2
src/objective-c/GRPCClient/version.h
Unescape View File

@ -22,4 +22,4 @@
// instead. This file can be regenerated from the template by running
// `tools/buildgen/generate_projects.sh`.
#define GRPC_OBJC_VERSION_STRING @"1.64.0-dev"
#define GRPC_OBJC_VERSION_STRING @"1.65.0-dev"

2
src/objective-c/tests/version.h
Unescape View File

@ -22,5 +22,5 @@
// instead. This file can be regenerated from the template by running
// `tools/buildgen/generate_projects.sh`.
#define GRPC_OBJC_VERSION_STRING @"1.64.0-dev"
#define GRPC_OBJC_VERSION_STRING @"1.65.0-dev"
#define GRPC_C_VERSION_STRING @"41.0.0"

2
src/php/composer.json
Unescape View File

@ -2,7 +2,7 @@
"name": "grpc/grpc-dev",
"description": "gRPC library for PHP - for Development use only",
"license": "Apache-2.0",
"version": "1.64.0",
"version": "1.65.0",
"require": {
"php": ">=7.0.0",
"google/protobuf": "^v3.3.0"

2
src/php/ext/grpc/version.h
Unescape View File

@ -20,6 +20,6 @@
#ifndef VERSION_H
#define VERSION_H
#define PHP_GRPC_VERSION "1.64.0dev"
#define PHP_GRPC_VERSION "1.65.0dev"
#endif /* VERSION_H */

2
src/python/grpcio/grpc/_grpcio_metadata.py
Unescape View File

@ -14,4 +14,4 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc/_grpcio_metadata.py.template`!!!
__version__ = """1.64.0.dev0"""
__version__ = """1.65.0.dev0"""

48
src/python/grpcio/grpc_core_dependencies.py generated
Unescape View File

@ -403,30 +403,6 @@ CORE_SOURCE_FILES = [
'src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c',
'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c',
'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c',
'src/core/ext/xds/certificate_provider_store.cc',
'src/core/ext/xds/file_watcher_certificate_provider_factory.cc',
'src/core/ext/xds/xds_api.cc',
'src/core/ext/xds/xds_audit_logger_registry.cc',
'src/core/ext/xds/xds_bootstrap.cc',
'src/core/ext/xds/xds_bootstrap_grpc.cc',
'src/core/ext/xds/xds_certificate_provider.cc',
'src/core/ext/xds/xds_client.cc',
'src/core/ext/xds/xds_client_grpc.cc',
'src/core/ext/xds/xds_client_stats.cc',
'src/core/ext/xds/xds_cluster.cc',
'src/core/ext/xds/xds_cluster_specifier_plugin.cc',
'src/core/ext/xds/xds_common_types.cc',
'src/core/ext/xds/xds_endpoint.cc',
'src/core/ext/xds/xds_health_status.cc',
'src/core/ext/xds/xds_http_fault_filter.cc',
'src/core/ext/xds/xds_http_filters.cc',
'src/core/ext/xds/xds_http_rbac_filter.cc',
'src/core/ext/xds/xds_http_stateful_session_filter.cc',
'src/core/ext/xds/xds_lb_policy_registry.cc',
'src/core/ext/xds/xds_listener.cc',
'src/core/ext/xds/xds_route_config.cc',
'src/core/ext/xds/xds_routing.cc',
'src/core/ext/xds/xds_transport_grpc.cc',
'src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc',
'src/core/handshaker/handshaker.cc',
'src/core/handshaker/handshaker_registry.cc',
@ -858,6 +834,30 @@ CORE_SOURCE_FILES = [
'src/core/tsi/ssl_transport_security_utils.cc',
'src/core/tsi/transport_security.cc',
'src/core/tsi/transport_security_grpc.cc',
'src/core/xds/grpc/certificate_provider_store.cc',
'src/core/xds/grpc/file_watcher_certificate_provider_factory.cc',
'src/core/xds/grpc/xds_audit_logger_registry.cc',
'src/core/xds/grpc/xds_bootstrap_grpc.cc',
'src/core/xds/grpc/xds_certificate_provider.cc',
'src/core/xds/grpc/xds_client_grpc.cc',
'src/core/xds/grpc/xds_cluster.cc',
'src/core/xds/grpc/xds_cluster_specifier_plugin.cc',
'src/core/xds/grpc/xds_common_types.cc',
'src/core/xds/grpc/xds_endpoint.cc',
'src/core/xds/grpc/xds_health_status.cc',
'src/core/xds/grpc/xds_http_fault_filter.cc',
'src/core/xds/grpc/xds_http_filters.cc',
'src/core/xds/grpc/xds_http_rbac_filter.cc',
'src/core/xds/grpc/xds_http_stateful_session_filter.cc',
'src/core/xds/grpc/xds_lb_policy_registry.cc',
'src/core/xds/grpc/xds_listener.cc',
'src/core/xds/grpc/xds_route_config.cc',
'src/core/xds/grpc/xds_routing.cc',
'src/core/xds/grpc/xds_transport_grpc.cc',
'src/core/xds/xds_client/xds_api.cc',
'src/core/xds/xds_client/xds_bootstrap.cc',
'src/core/xds/xds_client/xds_client.cc',
'src/core/xds/xds_client/xds_client_stats.cc',
'third_party/abseil-cpp/absl/base/internal/cycleclock.cc',
'third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc',
'third_party/abseil-cpp/absl/base/internal/raw_logging.cc',

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save