From 6e981d7460af561230d455c3623774e76e18cbfe Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Tue, 30 Apr 2024 12:39:22 -0700 Subject: [PATCH] [reorg] move handshaker code to src/core/handshaker (#36375) Closes #36375 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36375 from markdroth:reorg_handshaker d1ed49f4df9e9901aa1bd2ef5eff337b352da59e PiperOrigin-RevId: 629497065 --- BUILD | 20 +-- CMakeLists.txt | 58 ++++---- Makefile | 20 +-- Package.swift | 44 +++--- build_autogenerated.yaml | 132 +++++++++--------- config.m4 | 26 ++-- config.w32 | 26 ++-- gRPC-C++.podspec | 48 +++---- gRPC-Core.podspec | 68 ++++----- grpc.gemspec | 44 +++--- package.xml | 44 +++--- setup.py | 10 -- src/core/BUILD | 24 ++-- .../client_channel/client_channel_filter.cc | 2 +- src/core/client_channel/subchannel.cc | 2 +- .../client/chaotic_good_connector.cc | 2 +- .../client/chaotic_good_connector.h | 2 +- .../server/chaotic_good_server.cc | 2 +- .../chaotic_good/server/chaotic_good_server.h | 2 +- .../chttp2/client/chttp2_connector.cc | 6 +- .../chttp2/client/chttp2_connector.h | 2 +- .../transport/chttp2/server/chttp2_server.cc | 4 +- .../endpoint_info_handshaker.cc | 8 +- .../endpoint_info}/endpoint_info_handshaker.h | 6 +- .../transport => handshaker}/handshaker.cc | 2 +- .../transport => handshaker}/handshaker.h | 6 +- .../handshaker_factory.h | 6 +- .../handshaker_registry.cc | 2 +- .../handshaker_registry.h | 8 +- .../http_connect}/http_connect_handshaker.cc | 8 +- .../http_connect}/http_connect_handshaker.h | 6 +- .../http_connect}/http_proxy_mapper.cc | 7 +- .../http_connect}/http_proxy_mapper.h | 12 +- src/core/{lib => }/handshaker/proxy_mapper.h | 6 +- .../handshaker/proxy_mapper_registry.cc | 2 +- .../handshaker/proxy_mapper_registry.h | 8 +- .../security}/secure_endpoint.cc | 4 +- .../security}/secure_endpoint.h | 6 +- .../security}/security_handshaker.cc | 12 +- .../security}/security_handshaker.h | 8 +- .../security}/tsi_error.cc | 2 +- .../security}/tsi_error.h | 6 +- .../tcp_connect}/tcp_connect_handshaker.cc | 8 +- .../tcp_connect}/tcp_connect_handshaker.h | 6 +- src/core/lib/config/core_configuration.h | 4 +- src/core/lib/http/httpcli.cc | 4 +- src/core/lib/http/httpcli.h | 2 +- .../lib/http/httpcli_security_connector.cc | 4 +- .../security/authorization/evaluate_args.cc | 2 +- .../alts/alts_security_connector.cc | 4 +- .../fake/fake_security_connector.cc | 4 +- .../insecure/insecure_security_connector.cc | 2 +- .../insecure/insecure_security_connector.h | 2 +- .../local/local_security_connector.cc | 4 +- .../security_connector/security_connector.h | 2 +- .../ssl/ssl_security_connector.cc | 4 +- .../tls/tls_security_connector.cc | 2 +- .../tls/tls_security_connector.h | 2 +- .../plugin_registry/grpc_plugin_registry.cc | 6 +- src/python/grpcio/grpc_core_dependencies.py | 20 +-- test/core/handshake/http_proxy_mapper_test.cc | 4 +- .../readahead_handshaker_server_ssl.cc | 6 +- test/core/security/secure_endpoint_test.cc | 2 +- test/core/test_util/evaluate_args_test_util.h | 2 +- test/core/tsi/transport_security_test_lib.cc | 2 +- tools/doxygen/Doxyfile.c++.internal | 44 +++--- tools/doxygen/Doxyfile.core.internal | 44 +++--- 67 files changed, 448 insertions(+), 451 deletions(-) rename src/core/{lib/transport => handshaker/endpoint_info}/endpoint_info_handshaker.cc (92%) rename src/core/{lib/transport => handshaker/endpoint_info}/endpoint_info_handshaker.h (84%) rename src/core/{lib/transport => handshaker}/handshaker.cc (99%) rename src/core/{lib/transport => handshaker}/handshaker.h (97%) rename src/core/{lib/transport => handshaker}/handshaker_factory.h (95%) rename src/core/{lib/transport => handshaker}/handshaker_registry.cc (97%) rename src/core/{lib/transport => handshaker}/handshaker_registry.h (88%) rename src/core/{lib/transport => handshaker/http_connect}/http_connect_handshaker.cc (98%) rename src/core/{lib/transport => handshaker/http_connect}/http_connect_handshaker.h (85%) rename src/core/{client_channel => handshaker/http_connect}/http_proxy_mapper.cc (98%) rename src/core/{client_channel => handshaker/http_connect}/http_proxy_mapper.h (86%) rename src/core/{lib => }/handshaker/proxy_mapper.h (90%) rename src/core/{lib => }/handshaker/proxy_mapper_registry.cc (97%) rename src/core/{lib => }/handshaker/proxy_mapper_registry.h (89%) rename src/core/{lib/security/transport => handshaker/security}/secure_endpoint.cc (99%) rename src/core/{lib/security/transport => handshaker/security}/secure_endpoint.h (87%) rename src/core/{lib/security/transport => handshaker/security}/security_handshaker.cc (98%) rename src/core/{lib/security/transport => handshaker/security}/security_handshaker.h (84%) rename src/core/{lib/security/transport => handshaker/security}/tsi_error.cc (94%) rename src/core/{lib/security/transport => handshaker/security}/tsi_error.h (83%) rename src/core/{lib/transport => handshaker/tcp_connect}/tcp_connect_handshaker.cc (97%) rename src/core/{lib/transport => handshaker/tcp_connect}/tcp_connect_handshaker.h (85%) diff --git a/BUILD b/BUILD index ac6fdddbe11..186560fd1a8 100644 --- a/BUILD +++ b/BUILD @@ -2231,6 +2231,9 @@ grpc_cc_library( grpc_cc_library( name = "grpc_security_base", srcs = [ + "//src/core:handshaker/security/secure_endpoint.cc", + "//src/core:handshaker/security/security_handshaker.cc", + "//src/core:handshaker/security/tsi_error.cc", "//src/core:lib/security/context/security_context.cc", "//src/core:lib/security/credentials/call_creds_util.cc", "//src/core:lib/security/credentials/composite/composite_credentials.cc", @@ -2238,12 +2241,12 @@ grpc_cc_library( "//src/core:lib/security/credentials/plugin/plugin_credentials.cc", "//src/core:lib/security/security_connector/security_connector.cc", "//src/core:lib/security/transport/client_auth_filter.cc", - "//src/core:lib/security/transport/secure_endpoint.cc", - "//src/core:lib/security/transport/security_handshaker.cc", "//src/core:lib/security/transport/server_auth_filter.cc", - "//src/core:lib/security/transport/tsi_error.cc", ], hdrs = [ + "//src/core:handshaker/security/secure_endpoint.h", + "//src/core:handshaker/security/security_handshaker.h", + "//src/core:handshaker/security/tsi_error.h", "//src/core:lib/security/context/security_context.h", "//src/core:lib/security/credentials/call_creds_util.h", "//src/core:lib/security/credentials/composite/composite_credentials.h", @@ -2251,9 +2254,6 @@ grpc_cc_library( "//src/core:lib/security/credentials/plugin/plugin_credentials.h", "//src/core:lib/security/security_connector/security_connector.h", "//src/core:lib/security/transport/auth_filters.h", - "//src/core:lib/security/transport/secure_endpoint.h", - "//src/core:lib/security/transport/security_handshaker.h", - "//src/core:lib/security/transport/tsi_error.h", ], external_deps = [ "absl/base:core_headers", @@ -3089,7 +3089,7 @@ grpc_cc_library( grpc_cc_library( name = "handshaker", srcs = [ - "//src/core:lib/transport/handshaker.cc", + "//src/core:handshaker/handshaker.cc", ], external_deps = [ "absl/base:core_headers", @@ -3099,7 +3099,7 @@ grpc_cc_library( ], language = "c++", public_hdrs = [ - "//src/core:lib/transport/handshaker.h", + "//src/core:handshaker/handshaker.h", ], visibility = ["@grpc:alt_grpc_base_legacy"], deps = [ @@ -3126,7 +3126,7 @@ grpc_cc_library( grpc_cc_library( name = "http_connect_handshaker", srcs = [ - "//src/core:lib/transport/http_connect_handshaker.cc", + "//src/core:handshaker/http_connect/http_connect_handshaker.cc", ], external_deps = [ "absl/base:core_headers", @@ -3136,7 +3136,7 @@ grpc_cc_library( ], language = "c++", public_hdrs = [ - "//src/core:lib/transport/http_connect_handshaker.h", + "//src/core:handshaker/http_connect/http_connect_handshaker.h", ], visibility = ["@grpc:alt_grpc_base_legacy"], deps = [ diff --git a/CMakeLists.txt b/CMakeLists.txt index ba84f779a5e..952d08a5db3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1834,7 +1834,6 @@ add_library(grpc src/core/client_channel/config_selector.cc src/core/client_channel/dynamic_filters.cc src/core/client_channel/global_subchannel_pool.cc - src/core/client_channel/http_proxy_mapper.cc src/core/client_channel/local_subchannel_pool.cc src/core/client_channel/retry_filter.cc src/core/client_channel/retry_filter_legacy_call_data.cc @@ -2240,6 +2239,16 @@ add_library(grpc src/core/ext/xds/xds_routing.cc src/core/ext/xds/xds_server_config_fetcher.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 + src/core/handshaker/http_connect/http_connect_handshaker.cc + src/core/handshaker/http_connect/http_proxy_mapper.cc + src/core/handshaker/proxy_mapper_registry.cc + src/core/handshaker/security/secure_endpoint.cc + src/core/handshaker/security/security_handshaker.cc + src/core/handshaker/security/tsi_error.cc + src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc src/core/lib/address_utils/parse_address.cc src/core/lib/address_utils/sockaddr_utils.cc src/core/lib/backoff/backoff.cc @@ -2325,7 +2334,6 @@ add_library(grpc src/core/lib/gprpp/validation_errors.cc src/core/lib/gprpp/windows/directory_reader.cc src/core/lib/gprpp/work_serializer.cc - src/core/lib/handshaker/proxy_mapper_registry.cc src/core/lib/http/format_request.cc src/core/lib/http/httpcli.cc src/core/lib/http/httpcli_security_connector.cc @@ -2484,10 +2492,7 @@ add_library(grpc src/core/lib/security/security_connector/ssl_utils.cc src/core/lib/security/security_connector/tls/tls_security_connector.cc src/core/lib/security/transport/client_auth_filter.cc - src/core/lib/security/transport/secure_endpoint.cc - src/core/lib/security/transport/security_handshaker.cc src/core/lib/security/transport/server_auth_filter.cc - src/core/lib/security/transport/tsi_error.cc src/core/lib/security/util/json_util.cc src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc @@ -2523,18 +2528,13 @@ add_library(grpc src/core/lib/transport/call_final_info.cc src/core/lib/transport/call_spine.cc src/core/lib/transport/connectivity_state.cc - src/core/lib/transport/endpoint_info_handshaker.cc src/core/lib/transport/error_utils.cc - src/core/lib/transport/handshaker.cc - src/core/lib/transport/handshaker_registry.cc - src/core/lib/transport/http_connect_handshaker.cc src/core/lib/transport/message.cc src/core/lib/transport/metadata.cc src/core/lib/transport/metadata_batch.cc src/core/lib/transport/metadata_info.cc src/core/lib/transport/parsed_metadata.cc src/core/lib/transport/status_conversion.cc - src/core/lib/transport/tcp_connect_handshaker.cc src/core/lib/transport/timeout_encoding.cc src/core/lib/transport/transport.cc src/core/lib/transport/transport_op_string.cc @@ -2931,7 +2931,6 @@ add_library(grpc_unsecure src/core/client_channel/config_selector.cc src/core/client_channel/dynamic_filters.cc src/core/client_channel/global_subchannel_pool.cc - src/core/client_channel/http_proxy_mapper.cc src/core/client_channel/local_subchannel_pool.cc src/core/client_channel/retry_filter.cc src/core/client_channel/retry_filter_legacy_call_data.cc @@ -3006,6 +3005,16 @@ add_library(grpc_unsecure src/core/ext/upb-gen/validate/validate.upb_minitable.c src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c + src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc + src/core/handshaker/handshaker.cc + src/core/handshaker/handshaker_registry.cc + src/core/handshaker/http_connect/http_connect_handshaker.cc + src/core/handshaker/http_connect/http_proxy_mapper.cc + src/core/handshaker/proxy_mapper_registry.cc + src/core/handshaker/security/secure_endpoint.cc + src/core/handshaker/security/security_handshaker.cc + src/core/handshaker/security/tsi_error.cc + src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc src/core/lib/address_utils/parse_address.cc src/core/lib/address_utils/sockaddr_utils.cc src/core/lib/backoff/backoff.cc @@ -3089,7 +3098,6 @@ add_library(grpc_unsecure src/core/lib/gprpp/uuid_v4.cc src/core/lib/gprpp/validation_errors.cc src/core/lib/gprpp/work_serializer.cc - src/core/lib/handshaker/proxy_mapper_registry.cc src/core/lib/http/format_request.cc src/core/lib/http/httpcli.cc src/core/lib/http/parser.cc @@ -3211,10 +3219,7 @@ add_library(grpc_unsecure src/core/lib/security/security_connector/load_system_roots_windows.cc src/core/lib/security/security_connector/security_connector.cc src/core/lib/security/transport/client_auth_filter.cc - src/core/lib/security/transport/secure_endpoint.cc - src/core/lib/security/transport/security_handshaker.cc src/core/lib/security/transport/server_auth_filter.cc - src/core/lib/security/transport/tsi_error.cc src/core/lib/security/util/json_util.cc src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc @@ -3250,18 +3255,13 @@ add_library(grpc_unsecure src/core/lib/transport/call_final_info.cc src/core/lib/transport/call_spine.cc src/core/lib/transport/connectivity_state.cc - src/core/lib/transport/endpoint_info_handshaker.cc src/core/lib/transport/error_utils.cc - src/core/lib/transport/handshaker.cc - src/core/lib/transport/handshaker_registry.cc - src/core/lib/transport/http_connect_handshaker.cc src/core/lib/transport/message.cc src/core/lib/transport/metadata.cc src/core/lib/transport/metadata_batch.cc src/core/lib/transport/metadata_info.cc src/core/lib/transport/parsed_metadata.cc src/core/lib/transport/status_conversion.cc - src/core/lib/transport/tcp_connect_handshaker.cc src/core/lib/transport/timeout_encoding.cc src/core/lib/transport/transport.cc src/core/lib/transport/transport_op_string.cc @@ -5124,6 +5124,13 @@ add_library(grpc_authorization_provider src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c + src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc + src/core/handshaker/handshaker.cc + src/core/handshaker/handshaker_registry.cc + src/core/handshaker/proxy_mapper_registry.cc + src/core/handshaker/security/secure_endpoint.cc + src/core/handshaker/security/security_handshaker.cc + src/core/handshaker/security/tsi_error.cc src/core/lib/address_utils/parse_address.cc src/core/lib/address_utils/sockaddr_utils.cc src/core/lib/backoff/backoff.cc @@ -5204,7 +5211,6 @@ add_library(grpc_authorization_provider src/core/lib/gprpp/time_averaged_stats.cc src/core/lib/gprpp/validation_errors.cc src/core/lib/gprpp/work_serializer.cc - src/core/lib/handshaker/proxy_mapper_registry.cc src/core/lib/iomgr/buffer_list.cc src/core/lib/iomgr/call_combiner.cc src/core/lib/iomgr/cfstream_handle.cc @@ -5325,10 +5331,7 @@ add_library(grpc_authorization_provider src/core/lib/security/security_connector/load_system_roots_windows.cc src/core/lib/security/security_connector/security_connector.cc src/core/lib/security/transport/client_auth_filter.cc - src/core/lib/security/transport/secure_endpoint.cc - src/core/lib/security/transport/security_handshaker.cc src/core/lib/security/transport/server_auth_filter.cc - src/core/lib/security/transport/tsi_error.cc src/core/lib/security/util/json_util.cc src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc @@ -5359,10 +5362,7 @@ add_library(grpc_authorization_provider src/core/lib/transport/call_final_info.cc src/core/lib/transport/call_spine.cc src/core/lib/transport/connectivity_state.cc - src/core/lib/transport/endpoint_info_handshaker.cc src/core/lib/transport/error_utils.cc - src/core/lib/transport/handshaker.cc - src/core/lib/transport/handshaker_registry.cc src/core/lib/transport/message.cc src/core/lib/transport/metadata.cc src/core/lib/transport/metadata_batch.cc @@ -17729,6 +17729,8 @@ add_executable(interception_chain_test src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c + src/core/handshaker/handshaker_registry.cc + src/core/handshaker/proxy_mapper_registry.cc src/core/lib/address_utils/parse_address.cc src/core/lib/address_utils/sockaddr_utils.cc src/core/lib/backoff/backoff.cc @@ -17809,7 +17811,6 @@ add_executable(interception_chain_test src/core/lib/gprpp/time_averaged_stats.cc src/core/lib/gprpp/validation_errors.cc src/core/lib/gprpp/work_serializer.cc - src/core/lib/handshaker/proxy_mapper_registry.cc src/core/lib/iomgr/buffer_list.cc src/core/lib/iomgr/call_combiner.cc src/core/lib/iomgr/cfstream_handle.cc @@ -17937,7 +17938,6 @@ add_executable(interception_chain_test src/core/lib/transport/call_spine.cc src/core/lib/transport/connectivity_state.cc src/core/lib/transport/error_utils.cc - src/core/lib/transport/handshaker_registry.cc src/core/lib/transport/interception_chain.cc src/core/lib/transport/message.cc src/core/lib/transport/metadata.cc diff --git a/Makefile b/Makefile index a1dfe162949..b0dde77bc5b 100644 --- a/Makefile +++ b/Makefile @@ -677,7 +677,6 @@ LIBGRPC_SRC = \ src/core/client_channel/config_selector.cc \ src/core/client_channel/dynamic_filters.cc \ src/core/client_channel/global_subchannel_pool.cc \ - src/core/client_channel/http_proxy_mapper.cc \ src/core/client_channel/local_subchannel_pool.cc \ src/core/client_channel/retry_filter.cc \ src/core/client_channel/retry_filter_legacy_call_data.cc \ @@ -1083,6 +1082,16 @@ LIBGRPC_SRC = \ src/core/ext/xds/xds_routing.cc \ src/core/ext/xds/xds_server_config_fetcher.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 \ + src/core/handshaker/http_connect/http_connect_handshaker.cc \ + src/core/handshaker/http_connect/http_proxy_mapper.cc \ + src/core/handshaker/proxy_mapper_registry.cc \ + src/core/handshaker/security/secure_endpoint.cc \ + src/core/handshaker/security/security_handshaker.cc \ + src/core/handshaker/security/tsi_error.cc \ + src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc \ src/core/lib/address_utils/parse_address.cc \ src/core/lib/address_utils/sockaddr_utils.cc \ src/core/lib/backoff/backoff.cc \ @@ -1213,7 +1222,6 @@ LIBGRPC_SRC = \ src/core/lib/gprpp/windows/stat.cc \ src/core/lib/gprpp/windows/thd.cc \ src/core/lib/gprpp/work_serializer.cc \ - src/core/lib/handshaker/proxy_mapper_registry.cc \ src/core/lib/http/format_request.cc \ src/core/lib/http/httpcli.cc \ src/core/lib/http/httpcli_security_connector.cc \ @@ -1372,10 +1380,7 @@ LIBGRPC_SRC = \ src/core/lib/security/security_connector/ssl_utils.cc \ src/core/lib/security/security_connector/tls/tls_security_connector.cc \ src/core/lib/security/transport/client_auth_filter.cc \ - src/core/lib/security/transport/secure_endpoint.cc \ - src/core/lib/security/transport/security_handshaker.cc \ src/core/lib/security/transport/server_auth_filter.cc \ - src/core/lib/security/transport/tsi_error.cc \ src/core/lib/security/util/json_util.cc \ src/core/lib/slice/percent_encoding.cc \ src/core/lib/slice/slice.cc \ @@ -1411,18 +1416,13 @@ LIBGRPC_SRC = \ src/core/lib/transport/call_final_info.cc \ src/core/lib/transport/call_spine.cc \ src/core/lib/transport/connectivity_state.cc \ - src/core/lib/transport/endpoint_info_handshaker.cc \ src/core/lib/transport/error_utils.cc \ - src/core/lib/transport/handshaker.cc \ - src/core/lib/transport/handshaker_registry.cc \ - src/core/lib/transport/http_connect_handshaker.cc \ src/core/lib/transport/message.cc \ src/core/lib/transport/metadata.cc \ src/core/lib/transport/metadata_batch.cc \ src/core/lib/transport/metadata_info.cc \ src/core/lib/transport/parsed_metadata.cc \ src/core/lib/transport/status_conversion.cc \ - src/core/lib/transport/tcp_connect_handshaker.cc \ src/core/lib/transport/timeout_encoding.cc \ src/core/lib/transport/transport.cc \ src/core/lib/transport/transport_op_string.cc \ diff --git a/Package.swift b/Package.swift index 7fab159ad58..9b5a71cabf2 100644 --- a/Package.swift +++ b/Package.swift @@ -140,8 +140,6 @@ let package = Package( "src/core/client_channel/dynamic_filters.h", "src/core/client_channel/global_subchannel_pool.cc", "src/core/client_channel/global_subchannel_pool.h", - "src/core/client_channel/http_proxy_mapper.cc", - "src/core/client_channel/http_proxy_mapper.h", "src/core/client_channel/local_subchannel_pool.cc", "src/core/client_channel/local_subchannel_pool.h", "src/core/client_channel/retry_filter.cc", @@ -1123,6 +1121,28 @@ let package = Package( "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", + "src/core/handshaker/handshaker.h", + "src/core/handshaker/handshaker_factory.h", + "src/core/handshaker/handshaker_registry.cc", + "src/core/handshaker/handshaker_registry.h", + "src/core/handshaker/http_connect/http_connect_handshaker.cc", + "src/core/handshaker/http_connect/http_connect_handshaker.h", + "src/core/handshaker/http_connect/http_proxy_mapper.cc", + "src/core/handshaker/http_connect/http_proxy_mapper.h", + "src/core/handshaker/proxy_mapper.h", + "src/core/handshaker/proxy_mapper_registry.cc", + "src/core/handshaker/proxy_mapper_registry.h", + "src/core/handshaker/security/secure_endpoint.cc", + "src/core/handshaker/security/secure_endpoint.h", + "src/core/handshaker/security/security_handshaker.cc", + "src/core/handshaker/security/security_handshaker.h", + "src/core/handshaker/security/tsi_error.cc", + "src/core/handshaker/security/tsi_error.h", + "src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc", + "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h", "src/core/lib/address_utils/parse_address.cc", "src/core/lib/address_utils/parse_address.h", "src/core/lib/address_utils/sockaddr_utils.cc", @@ -1404,9 +1424,6 @@ let package = Package( "src/core/lib/gprpp/work_serializer.cc", "src/core/lib/gprpp/work_serializer.h", "src/core/lib/gprpp/xxhash_inline.h", - "src/core/lib/handshaker/proxy_mapper.h", - "src/core/lib/handshaker/proxy_mapper_registry.cc", - "src/core/lib/handshaker/proxy_mapper_registry.h", "src/core/lib/http/format_request.cc", "src/core/lib/http/format_request.h", "src/core/lib/http/httpcli.cc", @@ -1738,13 +1755,7 @@ let package = Package( "src/core/lib/security/security_connector/tls/tls_security_connector.h", "src/core/lib/security/transport/auth_filters.h", "src/core/lib/security/transport/client_auth_filter.cc", - "src/core/lib/security/transport/secure_endpoint.cc", - "src/core/lib/security/transport/secure_endpoint.h", - "src/core/lib/security/transport/security_handshaker.cc", - "src/core/lib/security/transport/security_handshaker.h", "src/core/lib/security/transport/server_auth_filter.cc", - "src/core/lib/security/transport/tsi_error.cc", - "src/core/lib/security/transport/tsi_error.h", "src/core/lib/security/util/json_util.cc", "src/core/lib/security/util/json_util.h", "src/core/lib/slice/percent_encoding.cc", @@ -1814,18 +1825,9 @@ let package = Package( "src/core/lib/transport/connectivity_state.cc", "src/core/lib/transport/connectivity_state.h", "src/core/lib/transport/custom_metadata.h", - "src/core/lib/transport/endpoint_info_handshaker.cc", - "src/core/lib/transport/endpoint_info_handshaker.h", "src/core/lib/transport/error_utils.cc", "src/core/lib/transport/error_utils.h", - "src/core/lib/transport/handshaker.cc", - "src/core/lib/transport/handshaker.h", - "src/core/lib/transport/handshaker_factory.h", - "src/core/lib/transport/handshaker_registry.cc", - "src/core/lib/transport/handshaker_registry.h", "src/core/lib/transport/http2_errors.h", - "src/core/lib/transport/http_connect_handshaker.cc", - "src/core/lib/transport/http_connect_handshaker.h", "src/core/lib/transport/message.cc", "src/core/lib/transport/message.h", "src/core/lib/transport/metadata.cc", @@ -1840,8 +1842,6 @@ let package = Package( "src/core/lib/transport/simple_slice_based_metadata.h", "src/core/lib/transport/status_conversion.cc", "src/core/lib/transport/status_conversion.h", - "src/core/lib/transport/tcp_connect_handshaker.cc", - "src/core/lib/transport/tcp_connect_handshaker.h", "src/core/lib/transport/timeout_encoding.cc", "src/core/lib/transport/timeout_encoding.h", "src/core/lib/transport/transport.cc", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index e80fe8207be..ea77336413c 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -233,7 +233,6 @@ libs: - src/core/client_channel/connector.h - src/core/client_channel/dynamic_filters.h - src/core/client_channel/global_subchannel_pool.h - - src/core/client_channel/http_proxy_mapper.h - src/core/client_channel/local_subchannel_pool.h - src/core/client_channel/retry_filter.h - src/core/client_channel/retry_filter_legacy_call_data.h @@ -810,6 +809,18 @@ libs: - 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 + - src/core/handshaker/handshaker_registry.h + - src/core/handshaker/http_connect/http_connect_handshaker.h + - src/core/handshaker/http_connect/http_proxy_mapper.h + - src/core/handshaker/proxy_mapper.h + - src/core/handshaker/proxy_mapper_registry.h + - src/core/handshaker/security/secure_endpoint.h + - src/core/handshaker/security/security_handshaker.h + - src/core/handshaker/security/tsi_error.h + - src/core/handshaker/tcp_connect/tcp_connect_handshaker.h - src/core/lib/address_utils/parse_address.h - src/core/lib/address_utils/sockaddr_utils.h - src/core/lib/avl/avl.h @@ -936,8 +947,6 @@ libs: - src/core/lib/gprpp/validation_errors.h - src/core/lib/gprpp/work_serializer.h - src/core/lib/gprpp/xxhash_inline.h - - src/core/lib/handshaker/proxy_mapper.h - - src/core/lib/handshaker/proxy_mapper_registry.h - src/core/lib/http/format_request.h - src/core/lib/http/httpcli.h - src/core/lib/http/httpcli_ssl_credentials.h @@ -1107,9 +1116,6 @@ libs: - src/core/lib/security/security_connector/ssl_utils.h - src/core/lib/security/security_connector/tls/tls_security_connector.h - src/core/lib/security/transport/auth_filters.h - - src/core/lib/security/transport/secure_endpoint.h - - src/core/lib/security/transport/security_handshaker.h - - src/core/lib/security/transport/tsi_error.h - src/core/lib/security/util/json_util.h - src/core/lib/slice/percent_encoding.h - src/core/lib/slice/slice.h @@ -1144,13 +1150,8 @@ libs: - src/core/lib/transport/call_spine.h - src/core/lib/transport/connectivity_state.h - src/core/lib/transport/custom_metadata.h - - src/core/lib/transport/endpoint_info_handshaker.h - src/core/lib/transport/error_utils.h - - src/core/lib/transport/handshaker.h - - src/core/lib/transport/handshaker_factory.h - - src/core/lib/transport/handshaker_registry.h - src/core/lib/transport/http2_errors.h - - src/core/lib/transport/http_connect_handshaker.h - src/core/lib/transport/message.h - src/core/lib/transport/metadata.h - src/core/lib/transport/metadata_batch.h @@ -1159,7 +1160,6 @@ libs: - src/core/lib/transport/parsed_metadata.h - src/core/lib/transport/simple_slice_based_metadata.h - src/core/lib/transport/status_conversion.h - - src/core/lib/transport/tcp_connect_handshaker.h - src/core/lib/transport/timeout_encoding.h - src/core/lib/transport/transport.h - src/core/lib/transport/transport_fwd.h @@ -1255,7 +1255,6 @@ libs: - src/core/client_channel/config_selector.cc - src/core/client_channel/dynamic_filters.cc - src/core/client_channel/global_subchannel_pool.cc - - src/core/client_channel/http_proxy_mapper.cc - src/core/client_channel/local_subchannel_pool.cc - src/core/client_channel/retry_filter.cc - src/core/client_channel/retry_filter_legacy_call_data.cc @@ -1661,6 +1660,16 @@ libs: - src/core/ext/xds/xds_routing.cc - src/core/ext/xds/xds_server_config_fetcher.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 + - src/core/handshaker/http_connect/http_connect_handshaker.cc + - src/core/handshaker/http_connect/http_proxy_mapper.cc + - src/core/handshaker/proxy_mapper_registry.cc + - src/core/handshaker/security/secure_endpoint.cc + - src/core/handshaker/security/security_handshaker.cc + - src/core/handshaker/security/tsi_error.cc + - src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc - src/core/lib/address_utils/parse_address.cc - src/core/lib/address_utils/sockaddr_utils.cc - src/core/lib/backoff/backoff.cc @@ -1746,7 +1755,6 @@ libs: - src/core/lib/gprpp/validation_errors.cc - src/core/lib/gprpp/windows/directory_reader.cc - src/core/lib/gprpp/work_serializer.cc - - src/core/lib/handshaker/proxy_mapper_registry.cc - src/core/lib/http/format_request.cc - src/core/lib/http/httpcli.cc - src/core/lib/http/httpcli_security_connector.cc @@ -1905,10 +1913,7 @@ libs: - src/core/lib/security/security_connector/ssl_utils.cc - src/core/lib/security/security_connector/tls/tls_security_connector.cc - src/core/lib/security/transport/client_auth_filter.cc - - src/core/lib/security/transport/secure_endpoint.cc - - src/core/lib/security/transport/security_handshaker.cc - src/core/lib/security/transport/server_auth_filter.cc - - src/core/lib/security/transport/tsi_error.cc - src/core/lib/security/util/json_util.cc - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc @@ -1944,18 +1949,13 @@ libs: - src/core/lib/transport/call_final_info.cc - src/core/lib/transport/call_spine.cc - src/core/lib/transport/connectivity_state.cc - - src/core/lib/transport/endpoint_info_handshaker.cc - src/core/lib/transport/error_utils.cc - - src/core/lib/transport/handshaker.cc - - src/core/lib/transport/handshaker_registry.cc - - src/core/lib/transport/http_connect_handshaker.cc - src/core/lib/transport/message.cc - src/core/lib/transport/metadata.cc - src/core/lib/transport/metadata_batch.cc - src/core/lib/transport/metadata_info.cc - src/core/lib/transport/parsed_metadata.cc - src/core/lib/transport/status_conversion.cc - - src/core/lib/transport/tcp_connect_handshaker.cc - src/core/lib/transport/timeout_encoding.cc - src/core/lib/transport/transport.cc - src/core/lib/transport/transport_op_string.cc @@ -2220,7 +2220,6 @@ libs: - src/core/client_channel/connector.h - src/core/client_channel/dynamic_filters.h - src/core/client_channel/global_subchannel_pool.h - - src/core/client_channel/http_proxy_mapper.h - src/core/client_channel/local_subchannel_pool.h - src/core/client_channel/retry_filter.h - src/core/client_channel/retry_filter_legacy_call_data.h @@ -2314,6 +2313,18 @@ libs: - src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.h - src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h - src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h + - src/core/handshaker/endpoint_info/endpoint_info_handshaker.h + - src/core/handshaker/handshaker.h + - src/core/handshaker/handshaker_factory.h + - src/core/handshaker/handshaker_registry.h + - src/core/handshaker/http_connect/http_connect_handshaker.h + - src/core/handshaker/http_connect/http_proxy_mapper.h + - src/core/handshaker/proxy_mapper.h + - src/core/handshaker/proxy_mapper_registry.h + - src/core/handshaker/security/secure_endpoint.h + - src/core/handshaker/security/security_handshaker.h + - src/core/handshaker/security/tsi_error.h + - src/core/handshaker/tcp_connect/tcp_connect_handshaker.h - src/core/lib/address_utils/parse_address.h - src/core/lib/address_utils/sockaddr_utils.h - src/core/lib/avl/avl.h @@ -2438,8 +2449,6 @@ libs: - src/core/lib/gprpp/uuid_v4.h - src/core/lib/gprpp/validation_errors.h - src/core/lib/gprpp/work_serializer.h - - src/core/lib/handshaker/proxy_mapper.h - - src/core/lib/handshaker/proxy_mapper_registry.h - src/core/lib/http/format_request.h - src/core/lib/http/httpcli.h - src/core/lib/http/parser.h @@ -2575,9 +2584,6 @@ libs: - src/core/lib/security/security_connector/load_system_roots_supported.h - src/core/lib/security/security_connector/security_connector.h - src/core/lib/security/transport/auth_filters.h - - src/core/lib/security/transport/secure_endpoint.h - - src/core/lib/security/transport/security_handshaker.h - - src/core/lib/security/transport/tsi_error.h - src/core/lib/security/util/json_util.h - src/core/lib/slice/percent_encoding.h - src/core/lib/slice/slice.h @@ -2612,13 +2618,8 @@ libs: - src/core/lib/transport/call_spine.h - src/core/lib/transport/connectivity_state.h - src/core/lib/transport/custom_metadata.h - - src/core/lib/transport/endpoint_info_handshaker.h - src/core/lib/transport/error_utils.h - - src/core/lib/transport/handshaker.h - - src/core/lib/transport/handshaker_factory.h - - src/core/lib/transport/handshaker_registry.h - src/core/lib/transport/http2_errors.h - - src/core/lib/transport/http_connect_handshaker.h - src/core/lib/transport/message.h - src/core/lib/transport/metadata.h - src/core/lib/transport/metadata_batch.h @@ -2627,7 +2628,6 @@ libs: - src/core/lib/transport/parsed_metadata.h - src/core/lib/transport/simple_slice_based_metadata.h - src/core/lib/transport/status_conversion.h - - src/core/lib/transport/tcp_connect_handshaker.h - src/core/lib/transport/timeout_encoding.h - src/core/lib/transport/transport.h - src/core/lib/transport/transport_fwd.h @@ -2711,7 +2711,6 @@ libs: - src/core/client_channel/config_selector.cc - src/core/client_channel/dynamic_filters.cc - src/core/client_channel/global_subchannel_pool.cc - - src/core/client_channel/http_proxy_mapper.cc - src/core/client_channel/local_subchannel_pool.cc - src/core/client_channel/retry_filter.cc - src/core/client_channel/retry_filter_legacy_call_data.cc @@ -2786,6 +2785,16 @@ libs: - src/core/ext/upb-gen/validate/validate.upb_minitable.c - src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c - src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c + - src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc + - src/core/handshaker/handshaker.cc + - src/core/handshaker/handshaker_registry.cc + - src/core/handshaker/http_connect/http_connect_handshaker.cc + - src/core/handshaker/http_connect/http_proxy_mapper.cc + - src/core/handshaker/proxy_mapper_registry.cc + - src/core/handshaker/security/secure_endpoint.cc + - src/core/handshaker/security/security_handshaker.cc + - src/core/handshaker/security/tsi_error.cc + - src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc - src/core/lib/address_utils/parse_address.cc - src/core/lib/address_utils/sockaddr_utils.cc - src/core/lib/backoff/backoff.cc @@ -2869,7 +2878,6 @@ libs: - src/core/lib/gprpp/uuid_v4.cc - src/core/lib/gprpp/validation_errors.cc - src/core/lib/gprpp/work_serializer.cc - - src/core/lib/handshaker/proxy_mapper_registry.cc - src/core/lib/http/format_request.cc - src/core/lib/http/httpcli.cc - src/core/lib/http/parser.cc @@ -2991,10 +2999,7 @@ libs: - src/core/lib/security/security_connector/load_system_roots_windows.cc - src/core/lib/security/security_connector/security_connector.cc - src/core/lib/security/transport/client_auth_filter.cc - - src/core/lib/security/transport/secure_endpoint.cc - - src/core/lib/security/transport/security_handshaker.cc - src/core/lib/security/transport/server_auth_filter.cc - - src/core/lib/security/transport/tsi_error.cc - src/core/lib/security/util/json_util.cc - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc @@ -3030,18 +3035,13 @@ libs: - src/core/lib/transport/call_final_info.cc - src/core/lib/transport/call_spine.cc - src/core/lib/transport/connectivity_state.cc - - src/core/lib/transport/endpoint_info_handshaker.cc - src/core/lib/transport/error_utils.cc - - src/core/lib/transport/handshaker.cc - - src/core/lib/transport/handshaker_registry.cc - - src/core/lib/transport/http_connect_handshaker.cc - src/core/lib/transport/message.cc - src/core/lib/transport/metadata.cc - src/core/lib/transport/metadata_batch.cc - src/core/lib/transport/metadata_info.cc - src/core/lib/transport/parsed_metadata.cc - src/core/lib/transport/status_conversion.cc - - src/core/lib/transport/tcp_connect_handshaker.cc - src/core/lib/transport/timeout_encoding.cc - src/core/lib/transport/transport.cc - src/core/lib/transport/transport_op_string.cc @@ -4405,6 +4405,15 @@ libs: - src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h - src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h - src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h + - src/core/handshaker/endpoint_info/endpoint_info_handshaker.h + - src/core/handshaker/handshaker.h + - src/core/handshaker/handshaker_factory.h + - src/core/handshaker/handshaker_registry.h + - src/core/handshaker/proxy_mapper.h + - src/core/handshaker/proxy_mapper_registry.h + - src/core/handshaker/security/secure_endpoint.h + - src/core/handshaker/security/security_handshaker.h + - src/core/handshaker/security/tsi_error.h - src/core/lib/address_utils/parse_address.h - src/core/lib/address_utils/sockaddr_utils.h - src/core/lib/avl/avl.h @@ -4525,8 +4534,6 @@ libs: - src/core/lib/gprpp/unique_type_name.h - src/core/lib/gprpp/validation_errors.h - src/core/lib/gprpp/work_serializer.h - - src/core/lib/handshaker/proxy_mapper.h - - src/core/lib/handshaker/proxy_mapper_registry.h - src/core/lib/iomgr/block_annotate.h - src/core/lib/iomgr/buffer_list.h - src/core/lib/iomgr/call_combiner.h @@ -4657,9 +4664,6 @@ libs: - src/core/lib/security/security_connector/load_system_roots_supported.h - src/core/lib/security/security_connector/security_connector.h - src/core/lib/security/transport/auth_filters.h - - src/core/lib/security/transport/secure_endpoint.h - - src/core/lib/security/transport/security_handshaker.h - - src/core/lib/security/transport/tsi_error.h - src/core/lib/security/util/json_util.h - src/core/lib/slice/percent_encoding.h - src/core/lib/slice/slice.h @@ -4690,11 +4694,7 @@ libs: - src/core/lib/transport/call_spine.h - src/core/lib/transport/connectivity_state.h - src/core/lib/transport/custom_metadata.h - - src/core/lib/transport/endpoint_info_handshaker.h - src/core/lib/transport/error_utils.h - - src/core/lib/transport/handshaker.h - - src/core/lib/transport/handshaker_factory.h - - src/core/lib/transport/handshaker_registry.h - src/core/lib/transport/http2_errors.h - src/core/lib/transport/message.h - src/core/lib/transport/metadata.h @@ -4752,6 +4752,13 @@ libs: - src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c - src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c - src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c + - src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc + - src/core/handshaker/handshaker.cc + - src/core/handshaker/handshaker_registry.cc + - src/core/handshaker/proxy_mapper_registry.cc + - src/core/handshaker/security/secure_endpoint.cc + - src/core/handshaker/security/security_handshaker.cc + - src/core/handshaker/security/tsi_error.cc - src/core/lib/address_utils/parse_address.cc - src/core/lib/address_utils/sockaddr_utils.cc - src/core/lib/backoff/backoff.cc @@ -4832,7 +4839,6 @@ libs: - src/core/lib/gprpp/time_averaged_stats.cc - src/core/lib/gprpp/validation_errors.cc - src/core/lib/gprpp/work_serializer.cc - - src/core/lib/handshaker/proxy_mapper_registry.cc - src/core/lib/iomgr/buffer_list.cc - src/core/lib/iomgr/call_combiner.cc - src/core/lib/iomgr/cfstream_handle.cc @@ -4953,10 +4959,7 @@ libs: - src/core/lib/security/security_connector/load_system_roots_windows.cc - src/core/lib/security/security_connector/security_connector.cc - src/core/lib/security/transport/client_auth_filter.cc - - src/core/lib/security/transport/secure_endpoint.cc - - src/core/lib/security/transport/security_handshaker.cc - src/core/lib/security/transport/server_auth_filter.cc - - src/core/lib/security/transport/tsi_error.cc - src/core/lib/security/util/json_util.cc - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc @@ -4987,10 +4990,7 @@ libs: - src/core/lib/transport/call_final_info.cc - src/core/lib/transport/call_spine.cc - src/core/lib/transport/connectivity_state.cc - - src/core/lib/transport/endpoint_info_handshaker.cc - src/core/lib/transport/error_utils.cc - - src/core/lib/transport/handshaker.cc - - src/core/lib/transport/handshaker_registry.cc - src/core/lib/transport/message.cc - src/core/lib/transport/metadata.cc - src/core/lib/transport/metadata_batch.cc @@ -11597,6 +11597,10 @@ targets: - src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h - src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h - src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h + - src/core/handshaker/handshaker_factory.h + - src/core/handshaker/handshaker_registry.h + - src/core/handshaker/proxy_mapper.h + - src/core/handshaker/proxy_mapper_registry.h - src/core/lib/address_utils/parse_address.h - src/core/lib/address_utils/sockaddr_utils.h - src/core/lib/avl/avl.h @@ -11717,8 +11721,6 @@ targets: - src/core/lib/gprpp/unique_type_name.h - src/core/lib/gprpp/validation_errors.h - src/core/lib/gprpp/work_serializer.h - - src/core/lib/handshaker/proxy_mapper.h - - src/core/lib/handshaker/proxy_mapper_registry.h - src/core/lib/iomgr/block_annotate.h - src/core/lib/iomgr/buffer_list.h - src/core/lib/iomgr/call_combiner.h @@ -11857,8 +11859,6 @@ targets: - src/core/lib/transport/connectivity_state.h - src/core/lib/transport/custom_metadata.h - src/core/lib/transport/error_utils.h - - src/core/lib/transport/handshaker_factory.h - - src/core/lib/transport/handshaker_registry.h - src/core/lib/transport/http2_errors.h - src/core/lib/transport/interception_chain.h - src/core/lib/transport/message.h @@ -11915,6 +11915,8 @@ targets: - src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c - src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c - src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c + - src/core/handshaker/handshaker_registry.cc + - src/core/handshaker/proxy_mapper_registry.cc - src/core/lib/address_utils/parse_address.cc - src/core/lib/address_utils/sockaddr_utils.cc - src/core/lib/backoff/backoff.cc @@ -11995,7 +11997,6 @@ targets: - src/core/lib/gprpp/time_averaged_stats.cc - src/core/lib/gprpp/validation_errors.cc - src/core/lib/gprpp/work_serializer.cc - - src/core/lib/handshaker/proxy_mapper_registry.cc - src/core/lib/iomgr/buffer_list.cc - src/core/lib/iomgr/call_combiner.cc - src/core/lib/iomgr/cfstream_handle.cc @@ -12123,7 +12124,6 @@ targets: - src/core/lib/transport/call_spine.cc - src/core/lib/transport/connectivity_state.cc - src/core/lib/transport/error_utils.cc - - src/core/lib/transport/handshaker_registry.cc - src/core/lib/transport/interception_chain.cc - src/core/lib/transport/message.cc - src/core/lib/transport/metadata.cc diff --git a/config.m4 b/config.m4 index b5497fa8888..565cd35e55e 100644 --- a/config.m4 +++ b/config.m4 @@ -52,7 +52,6 @@ if test "$PHP_GRPC" != "no"; then src/core/client_channel/config_selector.cc \ src/core/client_channel/dynamic_filters.cc \ src/core/client_channel/global_subchannel_pool.cc \ - src/core/client_channel/http_proxy_mapper.cc \ src/core/client_channel/local_subchannel_pool.cc \ src/core/client_channel/retry_filter.cc \ src/core/client_channel/retry_filter_legacy_call_data.cc \ @@ -458,6 +457,16 @@ if test "$PHP_GRPC" != "no"; then src/core/ext/xds/xds_routing.cc \ src/core/ext/xds/xds_server_config_fetcher.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 \ + src/core/handshaker/http_connect/http_connect_handshaker.cc \ + src/core/handshaker/http_connect/http_proxy_mapper.cc \ + src/core/handshaker/proxy_mapper_registry.cc \ + src/core/handshaker/security/secure_endpoint.cc \ + src/core/handshaker/security/security_handshaker.cc \ + src/core/handshaker/security/tsi_error.cc \ + src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc \ src/core/lib/address_utils/parse_address.cc \ src/core/lib/address_utils/sockaddr_utils.cc \ src/core/lib/backoff/backoff.cc \ @@ -588,7 +597,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/gprpp/windows/stat.cc \ src/core/lib/gprpp/windows/thd.cc \ src/core/lib/gprpp/work_serializer.cc \ - src/core/lib/handshaker/proxy_mapper_registry.cc \ src/core/lib/http/format_request.cc \ src/core/lib/http/httpcli.cc \ src/core/lib/http/httpcli_security_connector.cc \ @@ -747,10 +755,7 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/security/security_connector/ssl_utils.cc \ src/core/lib/security/security_connector/tls/tls_security_connector.cc \ src/core/lib/security/transport/client_auth_filter.cc \ - src/core/lib/security/transport/secure_endpoint.cc \ - src/core/lib/security/transport/security_handshaker.cc \ src/core/lib/security/transport/server_auth_filter.cc \ - src/core/lib/security/transport/tsi_error.cc \ src/core/lib/security/util/json_util.cc \ src/core/lib/slice/percent_encoding.cc \ src/core/lib/slice/slice.cc \ @@ -786,18 +791,13 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/transport/call_final_info.cc \ src/core/lib/transport/call_spine.cc \ src/core/lib/transport/connectivity_state.cc \ - src/core/lib/transport/endpoint_info_handshaker.cc \ src/core/lib/transport/error_utils.cc \ - src/core/lib/transport/handshaker.cc \ - src/core/lib/transport/handshaker_registry.cc \ - src/core/lib/transport/http_connect_handshaker.cc \ src/core/lib/transport/message.cc \ src/core/lib/transport/metadata.cc \ src/core/lib/transport/metadata_batch.cc \ src/core/lib/transport/metadata_info.cc \ src/core/lib/transport/parsed_metadata.cc \ src/core/lib/transport/status_conversion.cc \ - src/core/lib/transport/tcp_connect_handshaker.cc \ src/core/lib/transport/timeout_encoding.cc \ src/core/lib/transport/transport.cc \ src/core/lib/transport/transport_op_string.cc \ @@ -1507,6 +1507,11 @@ if test "$PHP_GRPC" != "no"; then 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) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/security) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/tcp_connect) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/address_utils) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/backoff) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/channel) @@ -1532,7 +1537,6 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp/linux) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp/posix) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp/windows) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/handshaker) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/http) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr/event_engine_shims) diff --git a/config.w32 b/config.w32 index 01c6eff22aa..bc9c4296f2d 100644 --- a/config.w32 +++ b/config.w32 @@ -17,7 +17,6 @@ if (PHP_GRPC != "no") { "src\\core\\client_channel\\config_selector.cc " + "src\\core\\client_channel\\dynamic_filters.cc " + "src\\core\\client_channel\\global_subchannel_pool.cc " + - "src\\core\\client_channel\\http_proxy_mapper.cc " + "src\\core\\client_channel\\local_subchannel_pool.cc " + "src\\core\\client_channel\\retry_filter.cc " + "src\\core\\client_channel\\retry_filter_legacy_call_data.cc " + @@ -423,6 +422,16 @@ if (PHP_GRPC != "no") { "src\\core\\ext\\xds\\xds_routing.cc " + "src\\core\\ext\\xds\\xds_server_config_fetcher.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 " + + "src\\core\\handshaker\\http_connect\\http_connect_handshaker.cc " + + "src\\core\\handshaker\\http_connect\\http_proxy_mapper.cc " + + "src\\core\\handshaker\\proxy_mapper_registry.cc " + + "src\\core\\handshaker\\security\\secure_endpoint.cc " + + "src\\core\\handshaker\\security\\security_handshaker.cc " + + "src\\core\\handshaker\\security\\tsi_error.cc " + + "src\\core\\handshaker\\tcp_connect\\tcp_connect_handshaker.cc " + "src\\core\\lib\\address_utils\\parse_address.cc " + "src\\core\\lib\\address_utils\\sockaddr_utils.cc " + "src\\core\\lib\\backoff\\backoff.cc " + @@ -553,7 +562,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\gprpp\\windows\\stat.cc " + "src\\core\\lib\\gprpp\\windows\\thd.cc " + "src\\core\\lib\\gprpp\\work_serializer.cc " + - "src\\core\\lib\\handshaker\\proxy_mapper_registry.cc " + "src\\core\\lib\\http\\format_request.cc " + "src\\core\\lib\\http\\httpcli.cc " + "src\\core\\lib\\http\\httpcli_security_connector.cc " + @@ -712,10 +720,7 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\security\\security_connector\\ssl_utils.cc " + "src\\core\\lib\\security\\security_connector\\tls\\tls_security_connector.cc " + "src\\core\\lib\\security\\transport\\client_auth_filter.cc " + - "src\\core\\lib\\security\\transport\\secure_endpoint.cc " + - "src\\core\\lib\\security\\transport\\security_handshaker.cc " + "src\\core\\lib\\security\\transport\\server_auth_filter.cc " + - "src\\core\\lib\\security\\transport\\tsi_error.cc " + "src\\core\\lib\\security\\util\\json_util.cc " + "src\\core\\lib\\slice\\percent_encoding.cc " + "src\\core\\lib\\slice\\slice.cc " + @@ -751,18 +756,13 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\transport\\call_final_info.cc " + "src\\core\\lib\\transport\\call_spine.cc " + "src\\core\\lib\\transport\\connectivity_state.cc " + - "src\\core\\lib\\transport\\endpoint_info_handshaker.cc " + "src\\core\\lib\\transport\\error_utils.cc " + - "src\\core\\lib\\transport\\handshaker.cc " + - "src\\core\\lib\\transport\\handshaker_registry.cc " + - "src\\core\\lib\\transport\\http_connect_handshaker.cc " + "src\\core\\lib\\transport\\message.cc " + "src\\core\\lib\\transport\\metadata.cc " + "src\\core\\lib\\transport\\metadata_batch.cc " + "src\\core\\lib\\transport\\metadata_info.cc " + "src\\core\\lib\\transport\\parsed_metadata.cc " + "src\\core\\lib\\transport\\status_conversion.cc " + - "src\\core\\lib\\transport\\tcp_connect_handshaker.cc " + "src\\core\\lib\\transport\\timeout_encoding.cc " + "src\\core\\lib\\transport\\transport.cc " + "src\\core\\lib\\transport\\transport_op_string.cc " + @@ -1643,6 +1643,11 @@ if (PHP_GRPC != "no") { 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"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker\\security"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker\\tcp_connect"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\address_utils"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\backoff"); @@ -1669,7 +1674,6 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp\\linux"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp\\posix"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp\\windows"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\handshaker"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\http"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\iomgr"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\iomgr\\event_engine_shims"); diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 0f4908c8e2b..23c1b6baba2 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -273,7 +273,6 @@ Pod::Spec.new do |s| 'src/core/client_channel/connector.h', 'src/core/client_channel/dynamic_filters.h', 'src/core/client_channel/global_subchannel_pool.h', - 'src/core/client_channel/http_proxy_mapper.h', 'src/core/client_channel/local_subchannel_pool.h', 'src/core/client_channel/retry_filter.h', 'src/core/client_channel/retry_filter_legacy_call_data.h', @@ -889,6 +888,18 @@ Pod::Spec.new do |s| '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', + 'src/core/handshaker/handshaker_registry.h', + 'src/core/handshaker/http_connect/http_connect_handshaker.h', + 'src/core/handshaker/http_connect/http_proxy_mapper.h', + 'src/core/handshaker/proxy_mapper.h', + 'src/core/handshaker/proxy_mapper_registry.h', + 'src/core/handshaker/security/secure_endpoint.h', + 'src/core/handshaker/security/security_handshaker.h', + 'src/core/handshaker/security/tsi_error.h', + 'src/core/handshaker/tcp_connect/tcp_connect_handshaker.h', 'src/core/lib/address_utils/parse_address.h', 'src/core/lib/address_utils/sockaddr_utils.h', 'src/core/lib/avl/avl.h', @@ -1040,8 +1051,6 @@ Pod::Spec.new do |s| 'src/core/lib/gprpp/validation_errors.h', 'src/core/lib/gprpp/work_serializer.h', 'src/core/lib/gprpp/xxhash_inline.h', - 'src/core/lib/handshaker/proxy_mapper.h', - 'src/core/lib/handshaker/proxy_mapper_registry.h', 'src/core/lib/http/format_request.h', 'src/core/lib/http/httpcli.h', 'src/core/lib/http/httpcli_ssl_credentials.h', @@ -1211,9 +1220,6 @@ Pod::Spec.new do |s| 'src/core/lib/security/security_connector/ssl_utils.h', 'src/core/lib/security/security_connector/tls/tls_security_connector.h', 'src/core/lib/security/transport/auth_filters.h', - 'src/core/lib/security/transport/secure_endpoint.h', - 'src/core/lib/security/transport/security_handshaker.h', - 'src/core/lib/security/transport/tsi_error.h', 'src/core/lib/security/util/json_util.h', 'src/core/lib/slice/percent_encoding.h', 'src/core/lib/slice/slice.h', @@ -1248,13 +1254,8 @@ Pod::Spec.new do |s| 'src/core/lib/transport/call_spine.h', 'src/core/lib/transport/connectivity_state.h', 'src/core/lib/transport/custom_metadata.h', - 'src/core/lib/transport/endpoint_info_handshaker.h', 'src/core/lib/transport/error_utils.h', - 'src/core/lib/transport/handshaker.h', - 'src/core/lib/transport/handshaker_factory.h', - 'src/core/lib/transport/handshaker_registry.h', 'src/core/lib/transport/http2_errors.h', - 'src/core/lib/transport/http_connect_handshaker.h', 'src/core/lib/transport/message.h', 'src/core/lib/transport/metadata.h', 'src/core/lib/transport/metadata_batch.h', @@ -1263,7 +1264,6 @@ Pod::Spec.new do |s| 'src/core/lib/transport/parsed_metadata.h', 'src/core/lib/transport/simple_slice_based_metadata.h', 'src/core/lib/transport/status_conversion.h', - 'src/core/lib/transport/tcp_connect_handshaker.h', 'src/core/lib/transport/timeout_encoding.h', 'src/core/lib/transport/transport.h', 'src/core/lib/transport/transport_fwd.h', @@ -1562,7 +1562,6 @@ Pod::Spec.new do |s| 'src/core/client_channel/connector.h', 'src/core/client_channel/dynamic_filters.h', 'src/core/client_channel/global_subchannel_pool.h', - 'src/core/client_channel/http_proxy_mapper.h', 'src/core/client_channel/local_subchannel_pool.h', 'src/core/client_channel/retry_filter.h', 'src/core/client_channel/retry_filter_legacy_call_data.h', @@ -2160,6 +2159,18 @@ Pod::Spec.new do |s| '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', + 'src/core/handshaker/handshaker_registry.h', + 'src/core/handshaker/http_connect/http_connect_handshaker.h', + 'src/core/handshaker/http_connect/http_proxy_mapper.h', + 'src/core/handshaker/proxy_mapper.h', + 'src/core/handshaker/proxy_mapper_registry.h', + 'src/core/handshaker/security/secure_endpoint.h', + 'src/core/handshaker/security/security_handshaker.h', + 'src/core/handshaker/security/tsi_error.h', + 'src/core/handshaker/tcp_connect/tcp_connect_handshaker.h', 'src/core/lib/address_utils/parse_address.h', 'src/core/lib/address_utils/sockaddr_utils.h', 'src/core/lib/avl/avl.h', @@ -2311,8 +2322,6 @@ Pod::Spec.new do |s| 'src/core/lib/gprpp/validation_errors.h', 'src/core/lib/gprpp/work_serializer.h', 'src/core/lib/gprpp/xxhash_inline.h', - 'src/core/lib/handshaker/proxy_mapper.h', - 'src/core/lib/handshaker/proxy_mapper_registry.h', 'src/core/lib/http/format_request.h', 'src/core/lib/http/httpcli.h', 'src/core/lib/http/httpcli_ssl_credentials.h', @@ -2482,9 +2491,6 @@ Pod::Spec.new do |s| 'src/core/lib/security/security_connector/ssl_utils.h', 'src/core/lib/security/security_connector/tls/tls_security_connector.h', 'src/core/lib/security/transport/auth_filters.h', - 'src/core/lib/security/transport/secure_endpoint.h', - 'src/core/lib/security/transport/security_handshaker.h', - 'src/core/lib/security/transport/tsi_error.h', 'src/core/lib/security/util/json_util.h', 'src/core/lib/slice/percent_encoding.h', 'src/core/lib/slice/slice.h', @@ -2519,13 +2525,8 @@ Pod::Spec.new do |s| 'src/core/lib/transport/call_spine.h', 'src/core/lib/transport/connectivity_state.h', 'src/core/lib/transport/custom_metadata.h', - 'src/core/lib/transport/endpoint_info_handshaker.h', 'src/core/lib/transport/error_utils.h', - 'src/core/lib/transport/handshaker.h', - 'src/core/lib/transport/handshaker_factory.h', - 'src/core/lib/transport/handshaker_registry.h', 'src/core/lib/transport/http2_errors.h', - 'src/core/lib/transport/http_connect_handshaker.h', 'src/core/lib/transport/message.h', 'src/core/lib/transport/metadata.h', 'src/core/lib/transport/metadata_batch.h', @@ -2534,7 +2535,6 @@ Pod::Spec.new do |s| 'src/core/lib/transport/parsed_metadata.h', 'src/core/lib/transport/simple_slice_based_metadata.h', 'src/core/lib/transport/status_conversion.h', - 'src/core/lib/transport/tcp_connect_handshaker.h', 'src/core/lib/transport/timeout_encoding.h', 'src/core/lib/transport/transport.h', 'src/core/lib/transport/transport_fwd.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 84bfefe4a79..7ba5826a901 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -257,8 +257,6 @@ Pod::Spec.new do |s| 'src/core/client_channel/dynamic_filters.h', 'src/core/client_channel/global_subchannel_pool.cc', 'src/core/client_channel/global_subchannel_pool.h', - 'src/core/client_channel/http_proxy_mapper.cc', - 'src/core/client_channel/http_proxy_mapper.h', 'src/core/client_channel/local_subchannel_pool.cc', 'src/core/client_channel/local_subchannel_pool.h', 'src/core/client_channel/retry_filter.cc', @@ -1240,6 +1238,28 @@ Pod::Spec.new do |s| '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', + 'src/core/handshaker/handshaker.h', + 'src/core/handshaker/handshaker_factory.h', + 'src/core/handshaker/handshaker_registry.cc', + 'src/core/handshaker/handshaker_registry.h', + 'src/core/handshaker/http_connect/http_connect_handshaker.cc', + 'src/core/handshaker/http_connect/http_connect_handshaker.h', + 'src/core/handshaker/http_connect/http_proxy_mapper.cc', + 'src/core/handshaker/http_connect/http_proxy_mapper.h', + 'src/core/handshaker/proxy_mapper.h', + 'src/core/handshaker/proxy_mapper_registry.cc', + 'src/core/handshaker/proxy_mapper_registry.h', + 'src/core/handshaker/security/secure_endpoint.cc', + 'src/core/handshaker/security/secure_endpoint.h', + 'src/core/handshaker/security/security_handshaker.cc', + 'src/core/handshaker/security/security_handshaker.h', + 'src/core/handshaker/security/tsi_error.cc', + 'src/core/handshaker/security/tsi_error.h', + 'src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc', + 'src/core/handshaker/tcp_connect/tcp_connect_handshaker.h', 'src/core/lib/address_utils/parse_address.cc', 'src/core/lib/address_utils/parse_address.h', 'src/core/lib/address_utils/sockaddr_utils.cc', @@ -1521,9 +1541,6 @@ Pod::Spec.new do |s| 'src/core/lib/gprpp/work_serializer.cc', 'src/core/lib/gprpp/work_serializer.h', 'src/core/lib/gprpp/xxhash_inline.h', - 'src/core/lib/handshaker/proxy_mapper.h', - 'src/core/lib/handshaker/proxy_mapper_registry.cc', - 'src/core/lib/handshaker/proxy_mapper_registry.h', 'src/core/lib/http/format_request.cc', 'src/core/lib/http/format_request.h', 'src/core/lib/http/httpcli.cc', @@ -1851,13 +1868,7 @@ Pod::Spec.new do |s| 'src/core/lib/security/security_connector/tls/tls_security_connector.h', 'src/core/lib/security/transport/auth_filters.h', 'src/core/lib/security/transport/client_auth_filter.cc', - 'src/core/lib/security/transport/secure_endpoint.cc', - 'src/core/lib/security/transport/secure_endpoint.h', - 'src/core/lib/security/transport/security_handshaker.cc', - 'src/core/lib/security/transport/security_handshaker.h', 'src/core/lib/security/transport/server_auth_filter.cc', - 'src/core/lib/security/transport/tsi_error.cc', - 'src/core/lib/security/transport/tsi_error.h', 'src/core/lib/security/util/json_util.cc', 'src/core/lib/security/util/json_util.h', 'src/core/lib/slice/percent_encoding.cc', @@ -1927,18 +1938,9 @@ Pod::Spec.new do |s| 'src/core/lib/transport/connectivity_state.cc', 'src/core/lib/transport/connectivity_state.h', 'src/core/lib/transport/custom_metadata.h', - 'src/core/lib/transport/endpoint_info_handshaker.cc', - 'src/core/lib/transport/endpoint_info_handshaker.h', 'src/core/lib/transport/error_utils.cc', 'src/core/lib/transport/error_utils.h', - 'src/core/lib/transport/handshaker.cc', - 'src/core/lib/transport/handshaker.h', - 'src/core/lib/transport/handshaker_factory.h', - 'src/core/lib/transport/handshaker_registry.cc', - 'src/core/lib/transport/handshaker_registry.h', 'src/core/lib/transport/http2_errors.h', - 'src/core/lib/transport/http_connect_handshaker.cc', - 'src/core/lib/transport/http_connect_handshaker.h', 'src/core/lib/transport/message.cc', 'src/core/lib/transport/message.h', 'src/core/lib/transport/metadata.cc', @@ -1953,8 +1955,6 @@ Pod::Spec.new do |s| 'src/core/lib/transport/simple_slice_based_metadata.h', 'src/core/lib/transport/status_conversion.cc', 'src/core/lib/transport/status_conversion.h', - 'src/core/lib/transport/tcp_connect_handshaker.cc', - 'src/core/lib/transport/tcp_connect_handshaker.h', 'src/core/lib/transport/timeout_encoding.cc', 'src/core/lib/transport/timeout_encoding.h', 'src/core/lib/transport/transport.cc', @@ -2362,7 +2362,6 @@ Pod::Spec.new do |s| 'src/core/client_channel/connector.h', 'src/core/client_channel/dynamic_filters.h', 'src/core/client_channel/global_subchannel_pool.h', - 'src/core/client_channel/http_proxy_mapper.h', 'src/core/client_channel/local_subchannel_pool.h', 'src/core/client_channel/retry_filter.h', 'src/core/client_channel/retry_filter_legacy_call_data.h', @@ -2939,6 +2938,18 @@ Pod::Spec.new do |s| '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', + 'src/core/handshaker/handshaker_registry.h', + 'src/core/handshaker/http_connect/http_connect_handshaker.h', + 'src/core/handshaker/http_connect/http_proxy_mapper.h', + 'src/core/handshaker/proxy_mapper.h', + 'src/core/handshaker/proxy_mapper_registry.h', + 'src/core/handshaker/security/secure_endpoint.h', + 'src/core/handshaker/security/security_handshaker.h', + 'src/core/handshaker/security/tsi_error.h', + 'src/core/handshaker/tcp_connect/tcp_connect_handshaker.h', 'src/core/lib/address_utils/parse_address.h', 'src/core/lib/address_utils/sockaddr_utils.h', 'src/core/lib/avl/avl.h', @@ -3090,8 +3101,6 @@ Pod::Spec.new do |s| 'src/core/lib/gprpp/validation_errors.h', 'src/core/lib/gprpp/work_serializer.h', 'src/core/lib/gprpp/xxhash_inline.h', - 'src/core/lib/handshaker/proxy_mapper.h', - 'src/core/lib/handshaker/proxy_mapper_registry.h', 'src/core/lib/http/format_request.h', 'src/core/lib/http/httpcli.h', 'src/core/lib/http/httpcli_ssl_credentials.h', @@ -3261,9 +3270,6 @@ Pod::Spec.new do |s| 'src/core/lib/security/security_connector/ssl_utils.h', 'src/core/lib/security/security_connector/tls/tls_security_connector.h', 'src/core/lib/security/transport/auth_filters.h', - 'src/core/lib/security/transport/secure_endpoint.h', - 'src/core/lib/security/transport/security_handshaker.h', - 'src/core/lib/security/transport/tsi_error.h', 'src/core/lib/security/util/json_util.h', 'src/core/lib/slice/percent_encoding.h', 'src/core/lib/slice/slice.h', @@ -3298,13 +3304,8 @@ Pod::Spec.new do |s| 'src/core/lib/transport/call_spine.h', 'src/core/lib/transport/connectivity_state.h', 'src/core/lib/transport/custom_metadata.h', - 'src/core/lib/transport/endpoint_info_handshaker.h', 'src/core/lib/transport/error_utils.h', - 'src/core/lib/transport/handshaker.h', - 'src/core/lib/transport/handshaker_factory.h', - 'src/core/lib/transport/handshaker_registry.h', 'src/core/lib/transport/http2_errors.h', - 'src/core/lib/transport/http_connect_handshaker.h', 'src/core/lib/transport/message.h', 'src/core/lib/transport/metadata.h', 'src/core/lib/transport/metadata_batch.h', @@ -3313,7 +3314,6 @@ Pod::Spec.new do |s| 'src/core/lib/transport/parsed_metadata.h', 'src/core/lib/transport/simple_slice_based_metadata.h', 'src/core/lib/transport/status_conversion.h', - 'src/core/lib/transport/tcp_connect_handshaker.h', 'src/core/lib/transport/timeout_encoding.h', 'src/core/lib/transport/transport.h', 'src/core/lib/transport/transport_fwd.h', diff --git a/grpc.gemspec b/grpc.gemspec index 768a916089d..b2dd04417c3 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -146,8 +146,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/client_channel/dynamic_filters.h ) s.files += %w( src/core/client_channel/global_subchannel_pool.cc ) s.files += %w( src/core/client_channel/global_subchannel_pool.h ) - s.files += %w( src/core/client_channel/http_proxy_mapper.cc ) - s.files += %w( src/core/client_channel/http_proxy_mapper.h ) s.files += %w( src/core/client_channel/local_subchannel_pool.cc ) s.files += %w( src/core/client_channel/local_subchannel_pool.h ) s.files += %w( src/core/client_channel/retry_filter.cc ) @@ -1129,6 +1127,28 @@ Gem::Specification.new do |s| 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 ) + s.files += %w( src/core/handshaker/handshaker.h ) + s.files += %w( src/core/handshaker/handshaker_factory.h ) + s.files += %w( src/core/handshaker/handshaker_registry.cc ) + s.files += %w( src/core/handshaker/handshaker_registry.h ) + s.files += %w( src/core/handshaker/http_connect/http_connect_handshaker.cc ) + s.files += %w( src/core/handshaker/http_connect/http_connect_handshaker.h ) + s.files += %w( src/core/handshaker/http_connect/http_proxy_mapper.cc ) + s.files += %w( src/core/handshaker/http_connect/http_proxy_mapper.h ) + s.files += %w( src/core/handshaker/proxy_mapper.h ) + s.files += %w( src/core/handshaker/proxy_mapper_registry.cc ) + s.files += %w( src/core/handshaker/proxy_mapper_registry.h ) + s.files += %w( src/core/handshaker/security/secure_endpoint.cc ) + s.files += %w( src/core/handshaker/security/secure_endpoint.h ) + s.files += %w( src/core/handshaker/security/security_handshaker.cc ) + s.files += %w( src/core/handshaker/security/security_handshaker.h ) + s.files += %w( src/core/handshaker/security/tsi_error.cc ) + s.files += %w( src/core/handshaker/security/tsi_error.h ) + s.files += %w( src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc ) + s.files += %w( src/core/handshaker/tcp_connect/tcp_connect_handshaker.h ) s.files += %w( src/core/lib/address_utils/parse_address.cc ) s.files += %w( src/core/lib/address_utils/parse_address.h ) s.files += %w( src/core/lib/address_utils/sockaddr_utils.cc ) @@ -1410,9 +1430,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/gprpp/work_serializer.cc ) s.files += %w( src/core/lib/gprpp/work_serializer.h ) s.files += %w( src/core/lib/gprpp/xxhash_inline.h ) - s.files += %w( src/core/lib/handshaker/proxy_mapper.h ) - s.files += %w( src/core/lib/handshaker/proxy_mapper_registry.cc ) - s.files += %w( src/core/lib/handshaker/proxy_mapper_registry.h ) s.files += %w( src/core/lib/http/format_request.cc ) s.files += %w( src/core/lib/http/format_request.h ) s.files += %w( src/core/lib/http/httpcli.cc ) @@ -1740,13 +1757,7 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/security/security_connector/tls/tls_security_connector.h ) s.files += %w( src/core/lib/security/transport/auth_filters.h ) s.files += %w( src/core/lib/security/transport/client_auth_filter.cc ) - s.files += %w( src/core/lib/security/transport/secure_endpoint.cc ) - s.files += %w( src/core/lib/security/transport/secure_endpoint.h ) - s.files += %w( src/core/lib/security/transport/security_handshaker.cc ) - s.files += %w( src/core/lib/security/transport/security_handshaker.h ) s.files += %w( src/core/lib/security/transport/server_auth_filter.cc ) - s.files += %w( src/core/lib/security/transport/tsi_error.cc ) - s.files += %w( src/core/lib/security/transport/tsi_error.h ) s.files += %w( src/core/lib/security/util/json_util.cc ) s.files += %w( src/core/lib/security/util/json_util.h ) s.files += %w( src/core/lib/slice/percent_encoding.cc ) @@ -1816,18 +1827,9 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/transport/connectivity_state.cc ) s.files += %w( src/core/lib/transport/connectivity_state.h ) s.files += %w( src/core/lib/transport/custom_metadata.h ) - s.files += %w( src/core/lib/transport/endpoint_info_handshaker.cc ) - s.files += %w( src/core/lib/transport/endpoint_info_handshaker.h ) s.files += %w( src/core/lib/transport/error_utils.cc ) s.files += %w( src/core/lib/transport/error_utils.h ) - s.files += %w( src/core/lib/transport/handshaker.cc ) - s.files += %w( src/core/lib/transport/handshaker.h ) - s.files += %w( src/core/lib/transport/handshaker_factory.h ) - s.files += %w( src/core/lib/transport/handshaker_registry.cc ) - s.files += %w( src/core/lib/transport/handshaker_registry.h ) s.files += %w( src/core/lib/transport/http2_errors.h ) - s.files += %w( src/core/lib/transport/http_connect_handshaker.cc ) - s.files += %w( src/core/lib/transport/http_connect_handshaker.h ) s.files += %w( src/core/lib/transport/message.cc ) s.files += %w( src/core/lib/transport/message.h ) s.files += %w( src/core/lib/transport/metadata.cc ) @@ -1842,8 +1844,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/transport/simple_slice_based_metadata.h ) s.files += %w( src/core/lib/transport/status_conversion.cc ) s.files += %w( src/core/lib/transport/status_conversion.h ) - s.files += %w( src/core/lib/transport/tcp_connect_handshaker.cc ) - s.files += %w( src/core/lib/transport/tcp_connect_handshaker.h ) s.files += %w( src/core/lib/transport/timeout_encoding.cc ) s.files += %w( src/core/lib/transport/timeout_encoding.h ) s.files += %w( src/core/lib/transport/transport.cc ) diff --git a/package.xml b/package.xml index cb3907b360b..3c55a9ccc9a 100644 --- a/package.xml +++ b/package.xml @@ -128,8 +128,6 @@ - - @@ -1111,6 +1109,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -1392,9 +1412,6 @@ - - - @@ -1722,13 +1739,7 @@ - - - - - - @@ -1798,18 +1809,9 @@ - - - - - - - - - @@ -1824,8 +1826,6 @@ - - diff --git a/setup.py b/setup.py index 71403f6d452..d25e924d594 100644 --- a/setup.py +++ b/setup.py @@ -166,11 +166,6 @@ BUILD_WITH_SYSTEM_RE2 = _env_bool_value("GRPC_PYTHON_BUILD_SYSTEM_RE2", "False") # runtime, the shared library must be installed BUILD_WITH_SYSTEM_ABSL = os.environ.get("GRPC_PYTHON_BUILD_SYSTEM_ABSL", False) -# Export this variable to enable socket activation functions of systemd -# You need to have the header files installed -# and during runtime, the shared library must be installed -BUILD_WITH_SYSTEMD = os.environ.get("GRPC_PYTHON_BUILD_WITH_SYSTEMD", False) - # Export this variable to force building the python extension with a statically linked libstdc++. # At least on linux, this is normally not needed as we can build manylinux-compatible wheels on linux just fine # without statically linking libstdc++ (which leads to a slight increase in the wheel size). @@ -283,11 +278,6 @@ if EXTRA_ENV_LINK_ARGS is None: if "darwin" in sys.platform: EXTRA_ENV_LINK_ARGS += " -framework CoreFoundation" -# Building with systemd socket activation requires defines and libraries. -if BUILD_WITH_SYSTEMD: - EXTRA_ENV_COMPILE_ARGS += " -DHAVE_LIBSYSTEMD" - EXTRA_ENV_LINK_ARGS += " -lsystemd" - EXTRA_COMPILE_ARGS = shlex.split(EXTRA_ENV_COMPILE_ARGS) EXTRA_LINK_ARGS = shlex.split(EXTRA_ENV_LINK_ARGS) diff --git a/src/core/BUILD b/src/core/BUILD index 119f61ddfe6..f3343501ede 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -1208,7 +1208,7 @@ grpc_cc_library( name = "handshaker_factory", language = "c++", public_hdrs = [ - "lib/transport/handshaker_factory.h", + "handshaker/handshaker_factory.h", ], visibility = ["@grpc:alt_grpc_base_legacy"], deps = [ @@ -1221,11 +1221,11 @@ grpc_cc_library( grpc_cc_library( name = "handshaker_registry", srcs = [ - "lib/transport/handshaker_registry.cc", + "handshaker/handshaker_registry.cc", ], language = "c++", public_hdrs = [ - "lib/transport/handshaker_registry.h", + "handshaker/handshaker_registry.h", ], visibility = ["@grpc:alt_grpc_base_legacy"], deps = [ @@ -1239,7 +1239,7 @@ grpc_cc_library( grpc_cc_library( name = "tcp_connect_handshaker", srcs = [ - "lib/transport/tcp_connect_handshaker.cc", + "handshaker/tcp_connect/tcp_connect_handshaker.cc", ], external_deps = [ "absl/base:core_headers", @@ -1249,7 +1249,7 @@ grpc_cc_library( ], language = "c++", public_hdrs = [ - "lib/transport/tcp_connect_handshaker.h", + "handshaker/tcp_connect/tcp_connect_handshaker.h", ], deps = [ "channel_args", @@ -1278,10 +1278,10 @@ grpc_cc_library( grpc_cc_library( name = "endpoint_info_handshaker", srcs = [ - "lib/transport/endpoint_info_handshaker.cc", + "handshaker/endpoint_info/endpoint_info_handshaker.cc", ], hdrs = [ - "lib/transport/endpoint_info_handshaker.h", + "handshaker/endpoint_info/endpoint_info_handshaker.h", ], external_deps = [ "absl/status", @@ -3507,7 +3507,7 @@ grpc_cc_library( grpc_cc_library( name = "proxy_mapper", - hdrs = ["lib/handshaker/proxy_mapper.h"], + hdrs = ["handshaker/proxy_mapper.h"], external_deps = [ "absl/strings", "absl/types:optional", @@ -3521,8 +3521,8 @@ grpc_cc_library( grpc_cc_library( name = "proxy_mapper_registry", - srcs = ["lib/handshaker/proxy_mapper_registry.cc"], - hdrs = ["lib/handshaker/proxy_mapper_registry.h"], + srcs = ["handshaker/proxy_mapper_registry.cc"], + hdrs = ["handshaker/proxy_mapper_registry.h"], external_deps = [ "absl/strings", "absl/types:optional", @@ -3538,10 +3538,10 @@ grpc_cc_library( grpc_cc_library( name = "http_proxy_mapper", srcs = [ - "client_channel/http_proxy_mapper.cc", + "handshaker/http_connect/http_proxy_mapper.cc", ], hdrs = [ - "client_channel/http_proxy_mapper.h", + "handshaker/http_connect/http_proxy_mapper.h", ], external_deps = [ "absl/log:check", diff --git a/src/core/client_channel/client_channel_filter.cc b/src/core/client_channel/client_channel_filter.cc index 7427d498b6f..c11f5293bfa 100644 --- a/src/core/client_channel/client_channel_filter.cc +++ b/src/core/client_channel/client_channel_filter.cc @@ -62,6 +62,7 @@ #include "src/core/client_channel/subchannel.h" #include "src/core/client_channel/subchannel_interface_internal.h" #include "src/core/ext/filters/deadline/deadline_filter.h" +#include "src/core/handshaker/proxy_mapper_registry.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/status_util.h" @@ -76,7 +77,6 @@ #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/gprpp/work_serializer.h" -#include "src/core/lib/handshaker/proxy_mapper_registry.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/iomgr/pollset_set.h" diff --git a/src/core/client_channel/subchannel.cc b/src/core/client_channel/subchannel.cc index 497530385e4..e8ef1f5e861 100644 --- a/src/core/client_channel/subchannel.cc +++ b/src/core/client_channel/subchannel.cc @@ -41,6 +41,7 @@ #include "src/core/channelz/channel_trace.h" #include "src/core/channelz/channelz.h" #include "src/core/client_channel/subchannel_pool_interface.h" +#include "src/core/handshaker/proxy_mapper_registry.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" @@ -56,7 +57,6 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/handshaker/proxy_mapper_registry.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/promise/cancel_callback.h" diff --git a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc index 95caa424eeb..a7407791d00 100644 --- a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc +++ b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc @@ -31,6 +31,7 @@ #include "src/core/ext/transport/chaotic_good/frame.h" #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chaotic_good/settings_metadata.h" +#include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" @@ -61,7 +62,6 @@ #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/channel_create.h" #include "src/core/lib/transport/error_utils.h" -#include "src/core/lib/transport/handshaker.h" #include "src/core/lib/transport/promise_endpoint.h" namespace grpc_core { diff --git a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h index 826b6365e6f..90b4abff267 100644 --- a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h +++ b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h @@ -28,6 +28,7 @@ #include "src/core/client_channel/connector.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" +#include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/gprpp/notification.h" @@ -43,7 +44,6 @@ #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" -#include "src/core/lib/transport/handshaker.h" #include "src/core/lib/transport/promise_endpoint.h" namespace grpc_core { diff --git a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc index c1022e95c43..7449a52d2ed 100644 --- a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc +++ b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc @@ -35,6 +35,7 @@ #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chaotic_good/server_transport.h" #include "src/core/ext/transport/chaotic_good/settings_metadata.h" +#include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/event_engine_context.h" @@ -63,7 +64,6 @@ #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/surface/server.h" #include "src/core/lib/transport/error_utils.h" -#include "src/core/lib/transport/handshaker.h" #include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/promise_endpoint.h" diff --git a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h index 64083d2cd76..0d547f1f634 100644 --- a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h +++ b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h @@ -32,6 +32,7 @@ #include "src/core/channelz/channelz.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" +#include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/gprpp/time.h" @@ -44,7 +45,6 @@ #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/surface/server.h" -#include "src/core/lib/transport/handshaker.h" #include "src/core/lib/transport/promise_endpoint.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.cc b/src/core/ext/transport/chttp2/client/chttp2_connector.cc index c3796209c84..95d6ce55d9c 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.cc +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.cc @@ -44,6 +44,9 @@ #include "src/core/client_channel/connector.h" #include "src/core/client_channel/subchannel.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" +#include "src/core/handshaker/handshaker.h" +#include "src/core/handshaker/handshaker_registry.h" +#include "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" @@ -66,9 +69,6 @@ #include "src/core/lib/surface/channel_create.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/error_utils.h" -#include "src/core/lib/transport/handshaker.h" -#include "src/core/lib/transport/handshaker_registry.h" -#include "src/core/lib/transport/tcp_connect_handshaker.h" #include "src/core/lib/transport/transport.h" #include "src/core/resolver/resolver_registry.h" diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.h b/src/core/ext/transport/chttp2/client/chttp2_connector.h index f12090b01bc..ffc90228655 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.h +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.h @@ -26,12 +26,12 @@ #include #include "src/core/client_channel/connector.h" +#include "src/core/handshaker/handshaker.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" -#include "src/core/lib/transport/handshaker.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index 180dc9836d7..af853c75977 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -50,6 +50,8 @@ #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" +#include "src/core/handshaker/handshaker.h" +#include "src/core/handshaker/handshaker_registry.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" @@ -80,8 +82,6 @@ #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/server.h" #include "src/core/lib/transport/error_utils.h" -#include "src/core/lib/transport/handshaker.h" -#include "src/core/lib/transport/handshaker_registry.h" #include "src/core/lib/transport/transport.h" #include "src/core/lib/uri/uri_parser.h" diff --git a/src/core/lib/transport/endpoint_info_handshaker.cc b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc similarity index 92% rename from src/core/lib/transport/endpoint_info_handshaker.cc rename to src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc index ce02279ca56..7db1842d5d8 100644 --- a/src/core/lib/transport/endpoint_info_handshaker.cc +++ b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc @@ -14,7 +14,7 @@ // limitations under the License. // -#include "src/core/lib/transport/endpoint_info_handshaker.h" +#include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h" #include @@ -22,15 +22,15 @@ #include +#include "src/core/handshaker/handshaker.h" +#include "src/core/handshaker/handshaker_factory.h" +#include "src/core/handshaker/handshaker_registry.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/transport/handshaker.h" -#include "src/core/lib/transport/handshaker_factory.h" -#include "src/core/lib/transport/handshaker_registry.h" namespace grpc_core { diff --git a/src/core/lib/transport/endpoint_info_handshaker.h b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.h similarity index 84% rename from src/core/lib/transport/endpoint_info_handshaker.h rename to src/core/handshaker/endpoint_info/endpoint_info_handshaker.h index 22efb96004d..a45105a62b6 100644 --- a/src/core/lib/transport/endpoint_info_handshaker.h +++ b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_ENDPOINT_INFO_HANDSHAKER_H -#define GRPC_SRC_CORE_LIB_TRANSPORT_ENDPOINT_INFO_HANDSHAKER_H +#ifndef GRPC_SRC_CORE_HANDSHAKER_ENDPOINT_INFO_ENDPOINT_INFO_HANDSHAKER_H +#define GRPC_SRC_CORE_HANDSHAKER_ENDPOINT_INFO_ENDPOINT_INFO_HANDSHAKER_H #include @@ -34,4 +34,4 @@ void RegisterEndpointInfoHandshaker(CoreConfiguration::Builder* builder); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_TRANSPORT_ENDPOINT_INFO_HANDSHAKER_H +#endif // GRPC_SRC_CORE_HANDSHAKER_ENDPOINT_INFO_ENDPOINT_INFO_HANDSHAKER_H diff --git a/src/core/lib/transport/handshaker.cc b/src/core/handshaker/handshaker.cc similarity index 99% rename from src/core/lib/transport/handshaker.cc rename to src/core/handshaker/handshaker.cc index f6f1a0db93d..efd73de2de0 100644 --- a/src/core/lib/transport/handshaker.cc +++ b/src/core/handshaker/handshaker.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/transport/handshaker.h" +#include "src/core/handshaker/handshaker.h" #include diff --git a/src/core/lib/transport/handshaker.h b/src/core/handshaker/handshaker.h similarity index 97% rename from src/core/lib/transport/handshaker.h rename to src/core/handshaker/handshaker.h index 759cfb6798e..f5df3824081 100644 --- a/src/core/lib/transport/handshaker.h +++ b/src/core/handshaker/handshaker.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_H -#define GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_H +#ifndef GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_H +#define GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_H #include @@ -161,4 +161,4 @@ class HandshakeManager : public RefCounted { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_H +#endif // GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_H diff --git a/src/core/lib/transport/handshaker_factory.h b/src/core/handshaker/handshaker_factory.h similarity index 95% rename from src/core/lib/transport/handshaker_factory.h rename to src/core/handshaker/handshaker_factory.h index 79c4b005f4e..5a6fd9703e8 100644 --- a/src/core/lib/transport/handshaker_factory.h +++ b/src/core/handshaker/handshaker_factory.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_FACTORY_H -#define GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_FACTORY_H +#ifndef GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_FACTORY_H +#define GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_FACTORY_H #include @@ -86,4 +86,4 @@ class HandshakerFactory { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_FACTORY_H +#endif // GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_FACTORY_H diff --git a/src/core/lib/transport/handshaker_registry.cc b/src/core/handshaker/handshaker_registry.cc similarity index 97% rename from src/core/lib/transport/handshaker_registry.cc rename to src/core/handshaker/handshaker_registry.cc index 1f49d3bda42..750fdabfdc0 100644 --- a/src/core/lib/transport/handshaker_registry.cc +++ b/src/core/handshaker/handshaker_registry.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/transport/handshaker_registry.h" +#include "src/core/handshaker/handshaker_registry.h" #include diff --git a/src/core/lib/transport/handshaker_registry.h b/src/core/handshaker/handshaker_registry.h similarity index 88% rename from src/core/lib/transport/handshaker_registry.h rename to src/core/handshaker/handshaker_registry.h index 22354603a43..1357686c6fb 100644 --- a/src/core/lib/transport/handshaker_registry.h +++ b/src/core/handshaker/handshaker_registry.h @@ -16,17 +16,17 @@ // // -#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_REGISTRY_H -#define GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_REGISTRY_H +#ifndef GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_REGISTRY_H +#define GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_REGISTRY_H #include #include #include +#include "src/core/handshaker/handshaker_factory.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/iomgr_fwd.h" -#include "src/core/lib/transport/handshaker_factory.h" namespace grpc_core { @@ -66,4 +66,4 @@ class HandshakerRegistry { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_REGISTRY_H +#endif // GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_REGISTRY_H diff --git a/src/core/lib/transport/http_connect_handshaker.cc b/src/core/handshaker/http_connect/http_connect_handshaker.cc similarity index 98% rename from src/core/lib/transport/http_connect_handshaker.cc rename to src/core/handshaker/http_connect/http_connect_handshaker.cc index d401423d11a..f8494e6cde1 100644 --- a/src/core/lib/transport/http_connect_handshaker.cc +++ b/src/core/handshaker/http_connect/http_connect_handshaker.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/transport/http_connect_handshaker.h" +#include "src/core/handshaker/http_connect/http_connect_handshaker.h" #include #include @@ -36,6 +36,9 @@ #include #include +#include "src/core/handshaker/handshaker.h" +#include "src/core/handshaker/handshaker_factory.h" +#include "src/core/handshaker/handshaker_registry.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/gpr/string.h" @@ -50,9 +53,6 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/tcp_server.h" -#include "src/core/lib/transport/handshaker.h" -#include "src/core/lib/transport/handshaker_factory.h" -#include "src/core/lib/transport/handshaker_registry.h" namespace grpc_core { diff --git a/src/core/lib/transport/http_connect_handshaker.h b/src/core/handshaker/http_connect/http_connect_handshaker.h similarity index 85% rename from src/core/lib/transport/http_connect_handshaker.h rename to src/core/handshaker/http_connect/http_connect_handshaker.h index b392248fc2f..6d2fc0aed63 100644 --- a/src/core/lib/transport/http_connect_handshaker.h +++ b/src/core/handshaker/http_connect/http_connect_handshaker.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_HTTP_CONNECT_HANDSHAKER_H -#define GRPC_SRC_CORE_LIB_TRANSPORT_HTTP_CONNECT_HANDSHAKER_H +#ifndef GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_HTTP_CONNECT_HANDSHAKER_H +#define GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_HTTP_CONNECT_HANDSHAKER_H #include @@ -39,4 +39,4 @@ void RegisterHttpConnectHandshaker(CoreConfiguration::Builder* builder); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_TRANSPORT_HTTP_CONNECT_HANDSHAKER_H +#endif // GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_HTTP_CONNECT_HANDSHAKER_H diff --git a/src/core/client_channel/http_proxy_mapper.cc b/src/core/handshaker/http_connect/http_proxy_mapper.cc similarity index 98% rename from src/core/client_channel/http_proxy_mapper.cc rename to src/core/handshaker/http_connect/http_proxy_mapper.cc index f4195456649..5b150619e59 100644 --- a/src/core/client_channel/http_proxy_mapper.cc +++ b/src/core/handshaker/http_connect/http_proxy_mapper.cc @@ -16,9 +16,7 @@ // // -#include - -#include "src/core/client_channel/http_proxy_mapper.h" +#include "src/core/handshaker/http_connect/http_proxy_mapper.h" #include #include @@ -43,7 +41,9 @@ #include #include #include +#include +#include "src/core/handshaker/http_connect/http_connect_handshaker.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" @@ -52,7 +52,6 @@ #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/resolve_address.h" -#include "src/core/lib/transport/http_connect_handshaker.h" #include "src/core/lib/uri/uri_parser.h" namespace grpc_core { diff --git a/src/core/client_channel/http_proxy_mapper.h b/src/core/handshaker/http_connect/http_proxy_mapper.h similarity index 86% rename from src/core/client_channel/http_proxy_mapper.h rename to src/core/handshaker/http_connect/http_proxy_mapper.h index 4ff58d73728..2a283833bd4 100644 --- a/src/core/client_channel/http_proxy_mapper.h +++ b/src/core/handshaker/http_connect/http_proxy_mapper.h @@ -16,19 +16,19 @@ // // -#ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_HTTP_PROXY_MAPPER_H -#define GRPC_SRC_CORE_CLIENT_CHANNEL_HTTP_PROXY_MAPPER_H - -#include +#ifndef GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_HTTP_PROXY_MAPPER_H +#define GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_HTTP_PROXY_MAPPER_H #include #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include + +#include "src/core/handshaker/proxy_mapper.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/handshaker/proxy_mapper.h" #include "src/core/lib/iomgr/resolved_address.h" namespace grpc_core { @@ -50,4 +50,4 @@ void RegisterHttpProxyMapper(CoreConfiguration::Builder* builder); } // namespace grpc_core -#endif // GRPC_SRC_CORE_CLIENT_CHANNEL_HTTP_PROXY_MAPPER_H +#endif // GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_HTTP_PROXY_MAPPER_H diff --git a/src/core/lib/handshaker/proxy_mapper.h b/src/core/handshaker/proxy_mapper.h similarity index 90% rename from src/core/lib/handshaker/proxy_mapper.h rename to src/core/handshaker/proxy_mapper.h index e2d63290925..8ba3f740394 100644 --- a/src/core/lib/handshaker/proxy_mapper.h +++ b/src/core/handshaker/proxy_mapper.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_HANDSHAKER_PROXY_MAPPER_H -#define GRPC_SRC_CORE_LIB_HANDSHAKER_PROXY_MAPPER_H +#ifndef GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_H +#define GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_H #include @@ -50,4 +50,4 @@ class ProxyMapperInterface { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_HANDSHAKER_PROXY_MAPPER_H +#endif // GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_H diff --git a/src/core/lib/handshaker/proxy_mapper_registry.cc b/src/core/handshaker/proxy_mapper_registry.cc similarity index 97% rename from src/core/lib/handshaker/proxy_mapper_registry.cc rename to src/core/handshaker/proxy_mapper_registry.cc index f696db235b1..f13e07cc334 100644 --- a/src/core/lib/handshaker/proxy_mapper_registry.cc +++ b/src/core/handshaker/proxy_mapper_registry.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/handshaker/proxy_mapper_registry.h" +#include "src/core/handshaker/proxy_mapper_registry.h" #include #include diff --git a/src/core/lib/handshaker/proxy_mapper_registry.h b/src/core/handshaker/proxy_mapper_registry.h similarity index 89% rename from src/core/lib/handshaker/proxy_mapper_registry.h rename to src/core/handshaker/proxy_mapper_registry.h index 2ebbca0d806..fbc09f6152d 100644 --- a/src/core/lib/handshaker/proxy_mapper_registry.h +++ b/src/core/handshaker/proxy_mapper_registry.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_HANDSHAKER_PROXY_MAPPER_REGISTRY_H -#define GRPC_SRC_CORE_LIB_HANDSHAKER_PROXY_MAPPER_REGISTRY_H +#ifndef GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_REGISTRY_H +#define GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_REGISTRY_H #include #include @@ -29,8 +29,8 @@ #include +#include "src/core/handshaker/proxy_mapper.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/handshaker/proxy_mapper.h" #include "src/core/lib/iomgr/resolved_address.h" namespace grpc_core { @@ -72,4 +72,4 @@ class ProxyMapperRegistry { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_HANDSHAKER_PROXY_MAPPER_REGISTRY_H +#endif // GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_REGISTRY_H diff --git a/src/core/lib/security/transport/secure_endpoint.cc b/src/core/handshaker/security/secure_endpoint.cc similarity index 99% rename from src/core/lib/security/transport/secure_endpoint.cc rename to src/core/handshaker/security/secure_endpoint.cc index b8323983a0e..17d40af4905 100644 --- a/src/core/lib/security/transport/secure_endpoint.cc +++ b/src/core/handshaker/security/secure_endpoint.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/security/transport/secure_endpoint.h" +#include "src/core/handshaker/security/secure_endpoint.h" #include @@ -39,6 +39,7 @@ #include #include +#include "src/core/handshaker/security/tsi_error.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/debug_location.h" @@ -52,7 +53,6 @@ #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/resource_quota/trace.h" -#include "src/core/lib/security/transport/tsi_error.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/tsi/transport_security_grpc.h" diff --git a/src/core/lib/security/transport/secure_endpoint.h b/src/core/handshaker/security/secure_endpoint.h similarity index 87% rename from src/core/lib/security/transport/secure_endpoint.h rename to src/core/handshaker/security/secure_endpoint.h index bc987787b5b..c185c060e11 100644 --- a/src/core/lib/security/transport/secure_endpoint.h +++ b/src/core/handshaker/security/secure_endpoint.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_SECURE_ENDPOINT_H -#define GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_SECURE_ENDPOINT_H +#ifndef GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURE_ENDPOINT_H +#define GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURE_ENDPOINT_H #include @@ -39,4 +39,4 @@ grpc_endpoint* grpc_secure_endpoint_create( grpc_endpoint* to_wrap, grpc_slice* leftover_slices, const grpc_channel_args* channel_args, size_t leftover_nslices); -#endif // GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_SECURE_ENDPOINT_H +#endif // GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURE_ENDPOINT_H diff --git a/src/core/lib/security/transport/security_handshaker.cc b/src/core/handshaker/security/security_handshaker.cc similarity index 98% rename from src/core/lib/security/transport/security_handshaker.cc rename to src/core/handshaker/security/security_handshaker.cc index 4c3fcd53f81..6b142085c11 100644 --- a/src/core/lib/security/transport/security_handshaker.cc +++ b/src/core/handshaker/security/security_handshaker.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/security/transport/security_handshaker.h" +#include "src/core/handshaker/security/security_handshaker.h" #include #include @@ -43,6 +43,11 @@ #include #include "src/core/channelz/channelz.h" +#include "src/core/handshaker/handshaker.h" +#include "src/core/handshaker/handshaker_factory.h" +#include "src/core/handshaker/handshaker_registry.h" +#include "src/core/handshaker/security/secure_endpoint.h" +#include "src/core/handshaker/security/tsi_error.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/stats.h" @@ -58,13 +63,8 @@ #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/security/context/security_context.h" -#include "src/core/lib/security/transport/secure_endpoint.h" -#include "src/core/lib/security/transport/tsi_error.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" -#include "src/core/lib/transport/handshaker.h" -#include "src/core/lib/transport/handshaker_factory.h" -#include "src/core/lib/transport/handshaker_registry.h" #include "src/core/tsi/transport_security_grpc.h" #define GRPC_INITIAL_HANDSHAKE_BUFFER_SIZE 256 diff --git a/src/core/lib/security/transport/security_handshaker.h b/src/core/handshaker/security/security_handshaker.h similarity index 84% rename from src/core/lib/security/transport/security_handshaker.h rename to src/core/handshaker/security/security_handshaker.h index 02b826c7429..9aa3bcfabc0 100644 --- a/src/core/lib/security/transport/security_handshaker.h +++ b/src/core/handshaker/security/security_handshaker.h @@ -16,19 +16,19 @@ // // -#ifndef GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_SECURITY_HANDSHAKER_H -#define GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_SECURITY_HANDSHAKER_H +#ifndef GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURITY_HANDSHAKER_H +#define GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURITY_HANDSHAKER_H #include "absl/status/statusor.h" #include #include +#include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" -#include "src/core/lib/transport/handshaker.h" #include "src/core/tsi/transport_security_interface.h" namespace grpc_core { @@ -43,4 +43,4 @@ void SecurityRegisterHandshakerFactories(CoreConfiguration::Builder*); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_SECURITY_HANDSHAKER_H +#endif // GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURITY_HANDSHAKER_H diff --git a/src/core/lib/security/transport/tsi_error.cc b/src/core/handshaker/security/tsi_error.cc similarity index 94% rename from src/core/lib/security/transport/tsi_error.cc rename to src/core/handshaker/security/tsi_error.cc index fbfd9825b4a..06b816df6ee 100644 --- a/src/core/lib/security/transport/tsi_error.cc +++ b/src/core/handshaker/security/tsi_error.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/security/transport/tsi_error.h" +#include "src/core/handshaker/security/tsi_error.h" #include diff --git a/src/core/lib/security/transport/tsi_error.h b/src/core/handshaker/security/tsi_error.h similarity index 83% rename from src/core/lib/security/transport/tsi_error.h rename to src/core/handshaker/security/tsi_error.h index 6921aa2af3b..f1a57dc78ab 100644 --- a/src/core/lib/security/transport/tsi_error.h +++ b/src/core/handshaker/security/tsi_error.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_TSI_ERROR_H -#define GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_TSI_ERROR_H +#ifndef GRPC_SRC_CORE_HANDSHAKER_SECURITY_TSI_ERROR_H +#define GRPC_SRC_CORE_HANDSHAKER_SECURITY_TSI_ERROR_H #include @@ -27,4 +27,4 @@ grpc_error_handle grpc_set_tsi_error_result(grpc_error_handle error, tsi_result result); -#endif // GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_TSI_ERROR_H +#endif // GRPC_SRC_CORE_HANDSHAKER_SECURITY_TSI_ERROR_H diff --git a/src/core/lib/transport/tcp_connect_handshaker.cc b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc similarity index 97% rename from src/core/lib/transport/tcp_connect_handshaker.cc rename to src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc index 6f5ee5017f9..9db2cb81bd8 100644 --- a/src/core/lib/transport/tcp_connect_handshaker.cc +++ b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/transport/tcp_connect_handshaker.h" +#include "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h" #include @@ -31,6 +31,9 @@ #include #include +#include "src/core/handshaker/handshaker.h" +#include "src/core/handshaker/handshaker_factory.h" +#include "src/core/handshaker/handshaker_registry.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" @@ -48,9 +51,6 @@ #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_server.h" -#include "src/core/lib/transport/handshaker.h" -#include "src/core/lib/transport/handshaker_factory.h" -#include "src/core/lib/transport/handshaker_registry.h" #include "src/core/lib/uri/uri_parser.h" namespace grpc_core { diff --git a/src/core/lib/transport/tcp_connect_handshaker.h b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.h similarity index 85% rename from src/core/lib/transport/tcp_connect_handshaker.h rename to src/core/handshaker/tcp_connect/tcp_connect_handshaker.h index be0b4d6f19d..94e05bdc815 100644 --- a/src/core/lib/transport/tcp_connect_handshaker.h +++ b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_TCP_CONNECT_HANDSHAKER_H -#define GRPC_SRC_CORE_LIB_TRANSPORT_TCP_CONNECT_HANDSHAKER_H +#ifndef GRPC_SRC_CORE_HANDSHAKER_TCP_CONNECT_TCP_CONNECT_HANDSHAKER_H +#define GRPC_SRC_CORE_HANDSHAKER_TCP_CONNECT_TCP_CONNECT_HANDSHAKER_H #include @@ -36,4 +36,4 @@ void RegisterTCPConnectHandshaker(CoreConfiguration::Builder* builder); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_TRANSPORT_TCP_CONNECT_HANDSHAKER_H +#endif // GRPC_SRC_CORE_HANDSHAKER_TCP_CONNECT_TCP_CONNECT_HANDSHAKER_H diff --git a/src/core/lib/config/core_configuration.h b/src/core/lib/config/core_configuration.h index 56d73a21986..4549c87c01c 100644 --- a/src/core/lib/config/core_configuration.h +++ b/src/core/lib/config/core_configuration.h @@ -22,12 +22,12 @@ #include #include +#include "src/core/handshaker/handshaker_registry.h" +#include "src/core/handshaker/proxy_mapper_registry.h" #include "src/core/lib/channel/channel_args_preconditioning.h" -#include "src/core/lib/handshaker/proxy_mapper_registry.h" #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h" #include "src/core/lib/security/credentials/channel_creds_registry.h" #include "src/core/lib/surface/channel_init.h" -#include "src/core/lib/transport/handshaker_registry.h" #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/resolver/resolver_registry.h" #include "src/core/service_config/service_config_parser.h" diff --git a/src/core/lib/http/httpcli.cc b/src/core/lib/http/httpcli.cc index a88796000ff..68722e78f78 100644 --- a/src/core/lib/http/httpcli.cc +++ b/src/core/lib/http/httpcli.cc @@ -33,6 +33,8 @@ #include #include +#include "src/core/handshaker/handshaker_registry.h" +#include "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" @@ -49,8 +51,6 @@ #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/error_utils.h" -#include "src/core/lib/transport/handshaker_registry.h" -#include "src/core/lib/transport/tcp_connect_handshaker.h" namespace grpc_core { diff --git a/src/core/lib/http/httpcli.h b/src/core/lib/http/httpcli.h index 3215bce1aa3..960b46d16c3 100644 --- a/src/core/lib/http/httpcli.h +++ b/src/core/lib/http/httpcli.h @@ -34,6 +34,7 @@ #include #include +#include "src/core/handshaker/handshaker.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" @@ -50,7 +51,6 @@ #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/resource_quota/resource_quota.h" -#include "src/core/lib/transport/handshaker.h" #include "src/core/lib/uri/uri_parser.h" // User agent this library reports diff --git a/src/core/lib/http/httpcli_security_connector.cc b/src/core/lib/http/httpcli_security_connector.cc index f5acf5bc3ba..36b8cd84857 100644 --- a/src/core/lib/http/httpcli_security_connector.cc +++ b/src/core/lib/http/httpcli_security_connector.cc @@ -34,6 +34,8 @@ #include #include +#include "src/core/handshaker/handshaker.h" +#include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" @@ -48,8 +50,6 @@ #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/security/security_connector/ssl_utils.h" -#include "src/core/lib/security/transport/security_handshaker.h" -#include "src/core/lib/transport/handshaker.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security_interface.h" diff --git a/src/core/lib/security/authorization/evaluate_args.cc b/src/core/lib/security/authorization/evaluate_args.cc index 5846cb6658c..ce4e8c2947a 100644 --- a/src/core/lib/security/authorization/evaluate_args.cc +++ b/src/core/lib/security/authorization/evaluate_args.cc @@ -25,11 +25,11 @@ #include #include +#include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/security/credentials/tls/tls_utils.h" #include "src/core/lib/slice/slice.h" -#include "src/core/lib/transport/endpoint_info_handshaker.h" #include "src/core/lib/uri/uri_parser.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/alts/alts_security_connector.cc b/src/core/lib/security/security_connector/alts/alts_security_connector.cc index afc6033bc6d..d3ab46d4c84 100644 --- a/src/core/lib/security/security_connector/alts/alts_security_connector.cc +++ b/src/core/lib/security/security_connector/alts/alts_security_connector.cc @@ -36,6 +36,8 @@ #include #include +#include "src/core/handshaker/handshaker.h" +#include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" @@ -49,9 +51,7 @@ #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/alts/alts_credentials.h" #include "src/core/lib/security/credentials/credentials.h" -#include "src/core/lib/security/transport/security_handshaker.h" #include "src/core/lib/slice/slice.h" -#include "src/core/lib/transport/handshaker.h" #include "src/core/lib/transport/transport.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" #include "src/core/tsi/transport_security.h" diff --git a/src/core/lib/security/security_connector/fake/fake_security_connector.cc b/src/core/lib/security/security_connector/fake/fake_security_connector.cc index 4ab4a60b02b..fcdf9f5567d 100644 --- a/src/core/lib/security/security_connector/fake/fake_security_connector.cc +++ b/src/core/lib/security/security_connector/fake/fake_security_connector.cc @@ -37,6 +37,8 @@ #include #include +#include "src/core/handshaker/handshaker.h" +#include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" @@ -54,8 +56,6 @@ #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" -#include "src/core/lib/security/transport/security_handshaker.h" -#include "src/core/lib/transport/handshaker.h" #include "src/core/load_balancing/grpclb/grpclb.h" #include "src/core/tsi/fake_transport_security.h" #include "src/core/tsi/transport_security_interface.h" diff --git a/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc b/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc index 123daedfad8..0a368c05287 100644 --- a/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc +++ b/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc @@ -24,13 +24,13 @@ #include #include +#include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/context/security_context.h" -#include "src/core/lib/security/transport/security_handshaker.h" #include "src/core/tsi/local_transport_security.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/insecure/insecure_security_connector.h b/src/core/lib/security/security_connector/insecure/insecure_security_connector.h index c2716de0939..151264f35ae 100644 --- a/src/core/lib/security/security_connector/insecure/insecure_security_connector.h +++ b/src/core/lib/security/security_connector/insecure/insecure_security_connector.h @@ -29,6 +29,7 @@ #include #include +#include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" @@ -38,7 +39,6 @@ #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" -#include "src/core/lib/transport/handshaker.h" #include "src/core/tsi/transport_security_interface.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/local/local_security_connector.cc b/src/core/lib/security/security_connector/local/local_security_connector.cc index 0e2ee655bca..22d4787ef0c 100644 --- a/src/core/lib/security/security_connector/local/local_security_connector.cc +++ b/src/core/lib/security/security_connector/local/local_security_connector.cc @@ -37,6 +37,8 @@ #include #include "src/core/client_channel/client_channel_filter.h" +#include "src/core/handshaker/handshaker.h" +#include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" @@ -56,8 +58,6 @@ #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/local/local_credentials.h" -#include "src/core/lib/security/transport/security_handshaker.h" -#include "src/core/lib/transport/handshaker.h" #include "src/core/lib/uri/uri_parser.h" #include "src/core/tsi/local_transport_security.h" #include "src/core/tsi/transport_security.h" diff --git a/src/core/lib/security/security_connector/security_connector.h b/src/core/lib/security/security_connector/security_connector.h index f4bf841d042..38b90956b7b 100644 --- a/src/core/lib/security/security_connector/security_connector.h +++ b/src/core/lib/security/security_connector/security_connector.h @@ -29,6 +29,7 @@ #include #include +#include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/ref_counted.h" @@ -39,7 +40,6 @@ #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/promise/arena_promise.h" -#include "src/core/lib/transport/handshaker.h" #include "src/core/tsi/transport_security_interface.h" extern grpc_core::DebugOnlyTraceFlag grpc_trace_security_connector_refcount; diff --git a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc index 90662be6e14..e27c406c83d 100644 --- a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc +++ b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc @@ -33,6 +33,8 @@ #include #include +#include "src/core/handshaker/handshaker.h" +#include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/host_port.h" @@ -49,8 +51,6 @@ #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/ssl/ssl_credentials.h" #include "src/core/lib/security/security_connector/ssl_utils.h" -#include "src/core/lib/security/transport/security_handshaker.h" -#include "src/core/lib/transport/handshaker.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" diff --git a/src/core/lib/security/security_connector/tls/tls_security_connector.cc b/src/core/lib/security/security_connector/tls/tls_security_connector.cc index 303a3b2701c..dbdb480d5c2 100644 --- a/src/core/lib/security/security_connector/tls/tls_security_connector.cc +++ b/src/core/lib/security/security_connector/tls/tls_security_connector.cc @@ -35,6 +35,7 @@ #include #include +#include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/host_port.h" @@ -46,7 +47,6 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h" #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" #include "src/core/lib/security/security_connector/ssl_utils.h" -#include "src/core/lib/security/transport/security_handshaker.h" #include "src/core/tsi/ssl_transport_security.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/tls/tls_security_connector.h b/src/core/lib/security/security_connector/tls/tls_security_connector.h index c9293b39943..0053a9d46d3 100644 --- a/src/core/lib/security/security_connector/tls/tls_security_connector.h +++ b/src/core/lib/security/security_connector/tls/tls_security_connector.h @@ -32,6 +32,7 @@ #include #include +#include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/sync.h" @@ -43,7 +44,6 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/security/security_connector/ssl_utils.h" -#include "src/core/lib/transport/handshaker.h" #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security_interface.h" diff --git a/src/core/plugin_registry/grpc_plugin_registry.cc b/src/core/plugin_registry/grpc_plugin_registry.cc index 44c2336a8f7..32e31ba6bf0 100644 --- a/src/core/plugin_registry/grpc_plugin_registry.cc +++ b/src/core/plugin_registry/grpc_plugin_registry.cc @@ -19,14 +19,14 @@ #include #include +#include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h" +#include "src/core/handshaker/http_connect/http_connect_handshaker.h" +#include "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h" #include "src/core/lib/channel/server_call_tracer_filter.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/surface/lame_client.h" #include "src/core/lib/surface/server.h" -#include "src/core/lib/transport/endpoint_info_handshaker.h" -#include "src/core/lib/transport/http_connect_handshaker.h" -#include "src/core/lib/transport/tcp_connect_handshaker.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index ee736e47020..e8d21a129b7 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -26,7 +26,6 @@ CORE_SOURCE_FILES = [ 'src/core/client_channel/config_selector.cc', 'src/core/client_channel/dynamic_filters.cc', 'src/core/client_channel/global_subchannel_pool.cc', - 'src/core/client_channel/http_proxy_mapper.cc', 'src/core/client_channel/local_subchannel_pool.cc', 'src/core/client_channel/retry_filter.cc', 'src/core/client_channel/retry_filter_legacy_call_data.cc', @@ -432,6 +431,16 @@ CORE_SOURCE_FILES = [ 'src/core/ext/xds/xds_routing.cc', 'src/core/ext/xds/xds_server_config_fetcher.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', + 'src/core/handshaker/http_connect/http_connect_handshaker.cc', + 'src/core/handshaker/http_connect/http_proxy_mapper.cc', + 'src/core/handshaker/proxy_mapper_registry.cc', + 'src/core/handshaker/security/secure_endpoint.cc', + 'src/core/handshaker/security/security_handshaker.cc', + 'src/core/handshaker/security/tsi_error.cc', + 'src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc', 'src/core/lib/address_utils/parse_address.cc', 'src/core/lib/address_utils/sockaddr_utils.cc', 'src/core/lib/backoff/backoff.cc', @@ -562,7 +571,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/gprpp/windows/stat.cc', 'src/core/lib/gprpp/windows/thd.cc', 'src/core/lib/gprpp/work_serializer.cc', - 'src/core/lib/handshaker/proxy_mapper_registry.cc', 'src/core/lib/http/format_request.cc', 'src/core/lib/http/httpcli.cc', 'src/core/lib/http/httpcli_security_connector.cc', @@ -721,10 +729,7 @@ CORE_SOURCE_FILES = [ 'src/core/lib/security/security_connector/ssl_utils.cc', 'src/core/lib/security/security_connector/tls/tls_security_connector.cc', 'src/core/lib/security/transport/client_auth_filter.cc', - 'src/core/lib/security/transport/secure_endpoint.cc', - 'src/core/lib/security/transport/security_handshaker.cc', 'src/core/lib/security/transport/server_auth_filter.cc', - 'src/core/lib/security/transport/tsi_error.cc', 'src/core/lib/security/util/json_util.cc', 'src/core/lib/slice/percent_encoding.cc', 'src/core/lib/slice/slice.cc', @@ -760,18 +765,13 @@ CORE_SOURCE_FILES = [ 'src/core/lib/transport/call_final_info.cc', 'src/core/lib/transport/call_spine.cc', 'src/core/lib/transport/connectivity_state.cc', - 'src/core/lib/transport/endpoint_info_handshaker.cc', 'src/core/lib/transport/error_utils.cc', - 'src/core/lib/transport/handshaker.cc', - 'src/core/lib/transport/handshaker_registry.cc', - 'src/core/lib/transport/http_connect_handshaker.cc', 'src/core/lib/transport/message.cc', 'src/core/lib/transport/metadata.cc', 'src/core/lib/transport/metadata_batch.cc', 'src/core/lib/transport/metadata_info.cc', 'src/core/lib/transport/parsed_metadata.cc', 'src/core/lib/transport/status_conversion.cc', - 'src/core/lib/transport/tcp_connect_handshaker.cc', 'src/core/lib/transport/timeout_encoding.cc', 'src/core/lib/transport/transport.cc', 'src/core/lib/transport/transport_op_string.cc', diff --git a/test/core/handshake/http_proxy_mapper_test.cc b/test/core/handshake/http_proxy_mapper_test.cc index 6af2b882cb5..1c7d40e022d 100644 --- a/test/core/handshake/http_proxy_mapper_test.cc +++ b/test/core/handshake/http_proxy_mapper_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/client_channel/http_proxy_mapper.h" +#include "src/core/handshaker/http_connect/http_proxy_mapper.h" #include "absl/status/status.h" #include "absl/status/statusor.h" @@ -27,10 +27,10 @@ #include +#include "src/core/handshaker/http_connect/http_connect_handshaker.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/transport/http_connect_handshaker.h" #include "test/core/test_util/scoped_env_var.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/handshake/readahead_handshaker_server_ssl.cc b/test/core/handshake/readahead_handshaker_server_ssl.cc index 88176014647..c5331e1abb4 100644 --- a/test/core/handshake/readahead_handshaker_server_ssl.cc +++ b/test/core/handshake/readahead_handshaker_server_ssl.cc @@ -22,6 +22,9 @@ #include +#include "src/core/handshaker/handshaker.h" +#include "src/core/handshaker/handshaker_factory.h" +#include "src/core/handshaker/handshaker_registry.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" @@ -30,9 +33,6 @@ #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/tcp_server.h" -#include "src/core/lib/transport/handshaker.h" -#include "src/core/lib/transport/handshaker_factory.h" -#include "src/core/lib/transport/handshaker_registry.h" #include "test/core/handshake/server_ssl_common.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/secure_endpoint_test.cc b/test/core/security/secure_endpoint_test.cc index cc872df8ae5..b05e6a63094 100644 --- a/test/core/security/secure_endpoint_test.cc +++ b/test/core/security/secure_endpoint_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/security/transport/secure_endpoint.h" +#include "src/core/handshaker/security/secure_endpoint.h" #include #include diff --git a/test/core/test_util/evaluate_args_test_util.h b/test/core/test_util/evaluate_args_test_util.h index 892e924005d..1bd6438f1aa 100644 --- a/test/core/test_util/evaluate_args_test_util.h +++ b/test/core/test_util/evaluate_args_test_util.h @@ -25,6 +25,7 @@ #include #include +#include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resource_quota/arena.h" @@ -33,7 +34,6 @@ #include "src/core/lib/security/authorization/evaluate_args.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/slice/slice.h" -#include "src/core/lib/transport/endpoint_info_handshaker.h" #include "src/core/lib/transport/metadata_batch.h" namespace grpc_core { diff --git a/test/core/tsi/transport_security_test_lib.cc b/test/core/tsi/transport_security_test_lib.cc index 27064d65724..946c09f6e2e 100644 --- a/test/core/tsi/transport_security_test_lib.cc +++ b/test/core/tsi/transport_security_test_lib.cc @@ -37,9 +37,9 @@ #include #include +#include "src/core/handshaker/security/tsi_error.h" #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/security/transport/tsi_error.h" static void notification_signal(tsi_test_fixture* fixture) { gpr_mu_lock(&fixture->mu); diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 3cc34f6b422..f79173cfd12 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -1106,8 +1106,6 @@ src/core/client_channel/dynamic_filters.cc \ src/core/client_channel/dynamic_filters.h \ src/core/client_channel/global_subchannel_pool.cc \ src/core/client_channel/global_subchannel_pool.h \ -src/core/client_channel/http_proxy_mapper.cc \ -src/core/client_channel/http_proxy_mapper.h \ src/core/client_channel/local_subchannel_pool.cc \ src/core/client_channel/local_subchannel_pool.h \ src/core/client_channel/retry_filter.cc \ @@ -2128,6 +2126,28 @@ src/core/ext/xds/xds_server_config_fetcher.cc \ 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 \ +src/core/handshaker/handshaker.h \ +src/core/handshaker/handshaker_factory.h \ +src/core/handshaker/handshaker_registry.cc \ +src/core/handshaker/handshaker_registry.h \ +src/core/handshaker/http_connect/http_connect_handshaker.cc \ +src/core/handshaker/http_connect/http_connect_handshaker.h \ +src/core/handshaker/http_connect/http_proxy_mapper.cc \ +src/core/handshaker/http_connect/http_proxy_mapper.h \ +src/core/handshaker/proxy_mapper.h \ +src/core/handshaker/proxy_mapper_registry.cc \ +src/core/handshaker/proxy_mapper_registry.h \ +src/core/handshaker/security/secure_endpoint.cc \ +src/core/handshaker/security/secure_endpoint.h \ +src/core/handshaker/security/security_handshaker.cc \ +src/core/handshaker/security/security_handshaker.h \ +src/core/handshaker/security/tsi_error.cc \ +src/core/handshaker/security/tsi_error.h \ +src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc \ +src/core/handshaker/tcp_connect/tcp_connect_handshaker.h \ src/core/lib/address_utils/parse_address.cc \ src/core/lib/address_utils/parse_address.h \ src/core/lib/address_utils/sockaddr_utils.cc \ @@ -2409,9 +2429,6 @@ src/core/lib/gprpp/windows/thd.cc \ src/core/lib/gprpp/work_serializer.cc \ src/core/lib/gprpp/work_serializer.h \ src/core/lib/gprpp/xxhash_inline.h \ -src/core/lib/handshaker/proxy_mapper.h \ -src/core/lib/handshaker/proxy_mapper_registry.cc \ -src/core/lib/handshaker/proxy_mapper_registry.h \ src/core/lib/http/format_request.cc \ src/core/lib/http/format_request.h \ src/core/lib/http/httpcli.cc \ @@ -2739,13 +2756,7 @@ src/core/lib/security/security_connector/tls/tls_security_connector.cc \ src/core/lib/security/security_connector/tls/tls_security_connector.h \ src/core/lib/security/transport/auth_filters.h \ src/core/lib/security/transport/client_auth_filter.cc \ -src/core/lib/security/transport/secure_endpoint.cc \ -src/core/lib/security/transport/secure_endpoint.h \ -src/core/lib/security/transport/security_handshaker.cc \ -src/core/lib/security/transport/security_handshaker.h \ src/core/lib/security/transport/server_auth_filter.cc \ -src/core/lib/security/transport/tsi_error.cc \ -src/core/lib/security/transport/tsi_error.h \ src/core/lib/security/util/json_util.cc \ src/core/lib/security/util/json_util.h \ src/core/lib/slice/percent_encoding.cc \ @@ -2815,18 +2826,9 @@ src/core/lib/transport/call_spine.h \ src/core/lib/transport/connectivity_state.cc \ src/core/lib/transport/connectivity_state.h \ src/core/lib/transport/custom_metadata.h \ -src/core/lib/transport/endpoint_info_handshaker.cc \ -src/core/lib/transport/endpoint_info_handshaker.h \ src/core/lib/transport/error_utils.cc \ src/core/lib/transport/error_utils.h \ -src/core/lib/transport/handshaker.cc \ -src/core/lib/transport/handshaker.h \ -src/core/lib/transport/handshaker_factory.h \ -src/core/lib/transport/handshaker_registry.cc \ -src/core/lib/transport/handshaker_registry.h \ src/core/lib/transport/http2_errors.h \ -src/core/lib/transport/http_connect_handshaker.cc \ -src/core/lib/transport/http_connect_handshaker.h \ src/core/lib/transport/message.cc \ src/core/lib/transport/message.h \ src/core/lib/transport/metadata.cc \ @@ -2841,8 +2843,6 @@ src/core/lib/transport/parsed_metadata.h \ src/core/lib/transport/simple_slice_based_metadata.h \ src/core/lib/transport/status_conversion.cc \ src/core/lib/transport/status_conversion.h \ -src/core/lib/transport/tcp_connect_handshaker.cc \ -src/core/lib/transport/tcp_connect_handshaker.h \ src/core/lib/transport/timeout_encoding.cc \ src/core/lib/transport/timeout_encoding.h \ src/core/lib/transport/transport.cc \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index ba38607ea8d..652ad4ddfeb 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -910,8 +910,6 @@ src/core/client_channel/dynamic_filters.cc \ src/core/client_channel/dynamic_filters.h \ src/core/client_channel/global_subchannel_pool.cc \ src/core/client_channel/global_subchannel_pool.h \ -src/core/client_channel/http_proxy_mapper.cc \ -src/core/client_channel/http_proxy_mapper.h \ src/core/client_channel/local_subchannel_pool.cc \ src/core/client_channel/local_subchannel_pool.h \ src/core/client_channel/retry_filter.cc \ @@ -1898,6 +1896,28 @@ src/core/ext/xds/xds_server_config_fetcher.cc \ 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 \ +src/core/handshaker/handshaker.h \ +src/core/handshaker/handshaker_factory.h \ +src/core/handshaker/handshaker_registry.cc \ +src/core/handshaker/handshaker_registry.h \ +src/core/handshaker/http_connect/http_connect_handshaker.cc \ +src/core/handshaker/http_connect/http_connect_handshaker.h \ +src/core/handshaker/http_connect/http_proxy_mapper.cc \ +src/core/handshaker/http_connect/http_proxy_mapper.h \ +src/core/handshaker/proxy_mapper.h \ +src/core/handshaker/proxy_mapper_registry.cc \ +src/core/handshaker/proxy_mapper_registry.h \ +src/core/handshaker/security/secure_endpoint.cc \ +src/core/handshaker/security/secure_endpoint.h \ +src/core/handshaker/security/security_handshaker.cc \ +src/core/handshaker/security/security_handshaker.h \ +src/core/handshaker/security/tsi_error.cc \ +src/core/handshaker/security/tsi_error.h \ +src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc \ +src/core/handshaker/tcp_connect/tcp_connect_handshaker.h \ src/core/lib/README.md \ src/core/lib/address_utils/parse_address.cc \ src/core/lib/address_utils/parse_address.h \ @@ -2183,9 +2203,6 @@ src/core/lib/gprpp/windows/thd.cc \ src/core/lib/gprpp/work_serializer.cc \ src/core/lib/gprpp/work_serializer.h \ src/core/lib/gprpp/xxhash_inline.h \ -src/core/lib/handshaker/proxy_mapper.h \ -src/core/lib/handshaker/proxy_mapper_registry.cc \ -src/core/lib/handshaker/proxy_mapper_registry.h \ src/core/lib/http/format_request.cc \ src/core/lib/http/format_request.h \ src/core/lib/http/httpcli.cc \ @@ -2514,13 +2531,7 @@ src/core/lib/security/security_connector/tls/tls_security_connector.cc \ src/core/lib/security/security_connector/tls/tls_security_connector.h \ src/core/lib/security/transport/auth_filters.h \ src/core/lib/security/transport/client_auth_filter.cc \ -src/core/lib/security/transport/secure_endpoint.cc \ -src/core/lib/security/transport/secure_endpoint.h \ -src/core/lib/security/transport/security_handshaker.cc \ -src/core/lib/security/transport/security_handshaker.h \ src/core/lib/security/transport/server_auth_filter.cc \ -src/core/lib/security/transport/tsi_error.cc \ -src/core/lib/security/transport/tsi_error.h \ src/core/lib/security/util/json_util.cc \ src/core/lib/security/util/json_util.h \ src/core/lib/slice/percent_encoding.cc \ @@ -2592,18 +2603,9 @@ src/core/lib/transport/call_spine.h \ src/core/lib/transport/connectivity_state.cc \ src/core/lib/transport/connectivity_state.h \ src/core/lib/transport/custom_metadata.h \ -src/core/lib/transport/endpoint_info_handshaker.cc \ -src/core/lib/transport/endpoint_info_handshaker.h \ src/core/lib/transport/error_utils.cc \ src/core/lib/transport/error_utils.h \ -src/core/lib/transport/handshaker.cc \ -src/core/lib/transport/handshaker.h \ -src/core/lib/transport/handshaker_factory.h \ -src/core/lib/transport/handshaker_registry.cc \ -src/core/lib/transport/handshaker_registry.h \ src/core/lib/transport/http2_errors.h \ -src/core/lib/transport/http_connect_handshaker.cc \ -src/core/lib/transport/http_connect_handshaker.h \ src/core/lib/transport/message.cc \ src/core/lib/transport/message.h \ src/core/lib/transport/metadata.cc \ @@ -2618,8 +2620,6 @@ src/core/lib/transport/parsed_metadata.h \ src/core/lib/transport/simple_slice_based_metadata.h \ src/core/lib/transport/status_conversion.cc \ src/core/lib/transport/status_conversion.h \ -src/core/lib/transport/tcp_connect_handshaker.cc \ -src/core/lib/transport/tcp_connect_handshaker.h \ src/core/lib/transport/timeout_encoding.cc \ src/core/lib/transport/timeout_encoding.h \ src/core/lib/transport/transport.cc \