diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-28 10:13:08 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-28 10:13:08 -0700 |
| commit | c7762a8c24e786be37e9e86a518a1d4fcb9d2133 (patch) | |
| tree | a81469bd9a38ddb9792539f2da1af7b9a7abb922 | |
| parent | 77c5dc6e72e06816428bc84fd4a1862571debecc (diff) | |
Move chttp2 related files under ext/
97 files changed, 1267 insertions, 1207 deletions
@@ -157,6 +157,27 @@ cc_library( cc_library( name = "grpc", srcs = [ + "src/core/ext/transport/chttp2/transport/alpn.h", + "src/core/ext/transport/chttp2/transport/bin_encoder.h", + "src/core/ext/transport/chttp2/transport/chttp2_transport.h", + "src/core/ext/transport/chttp2/transport/frame.h", + "src/core/ext/transport/chttp2/transport/frame_data.h", + "src/core/ext/transport/chttp2/transport/frame_goaway.h", + "src/core/ext/transport/chttp2/transport/frame_ping.h", + "src/core/ext/transport/chttp2/transport/frame_rst_stream.h", + "src/core/ext/transport/chttp2/transport/frame_settings.h", + "src/core/ext/transport/chttp2/transport/frame_window_update.h", + "src/core/ext/transport/chttp2/transport/hpack_encoder.h", + "src/core/ext/transport/chttp2/transport/hpack_parser.h", + "src/core/ext/transport/chttp2/transport/hpack_table.h", + "src/core/ext/transport/chttp2/transport/http2_errors.h", + "src/core/ext/transport/chttp2/transport/huffsyms.h", + "src/core/ext/transport/chttp2/transport/incoming_metadata.h", + "src/core/ext/transport/chttp2/transport/internal.h", + "src/core/ext/transport/chttp2/transport/status_conversion.h", + "src/core/ext/transport/chttp2/transport/stream_map.h", + "src/core/ext/transport/chttp2/transport/timeout_encoding.h", + "src/core/ext/transport/chttp2/transport/varint.h", "src/core/lib/census/grpc_filter.h", "src/core/lib/census/grpc_plugin.h", "src/core/lib/channel/channel_args.h", @@ -250,27 +271,6 @@ cc_library( "src/core/lib/surface/server.h", "src/core/lib/surface/surface_trace.h", "src/core/lib/transport/byte_stream.h", - "src/core/lib/transport/chttp2/alpn.h", - "src/core/lib/transport/chttp2/bin_encoder.h", - "src/core/lib/transport/chttp2/frame.h", - "src/core/lib/transport/chttp2/frame_data.h", - "src/core/lib/transport/chttp2/frame_goaway.h", - "src/core/lib/transport/chttp2/frame_ping.h", - "src/core/lib/transport/chttp2/frame_rst_stream.h", - "src/core/lib/transport/chttp2/frame_settings.h", - "src/core/lib/transport/chttp2/frame_window_update.h", - "src/core/lib/transport/chttp2/hpack_encoder.h", - "src/core/lib/transport/chttp2/hpack_parser.h", - "src/core/lib/transport/chttp2/hpack_table.h", - "src/core/lib/transport/chttp2/http2_errors.h", - "src/core/lib/transport/chttp2/huffsyms.h", - "src/core/lib/transport/chttp2/incoming_metadata.h", - "src/core/lib/transport/chttp2/internal.h", - "src/core/lib/transport/chttp2/status_conversion.h", - "src/core/lib/transport/chttp2/stream_map.h", - "src/core/lib/transport/chttp2/timeout_encoding.h", - "src/core/lib/transport/chttp2/varint.h", - "src/core/lib/transport/chttp2_transport.h", "src/core/lib/transport/connectivity_state.h", "src/core/lib/transport/metadata.h", "src/core/lib/transport/metadata_batch.h", @@ -298,6 +298,29 @@ cc_library( "third_party/nanopb/pb_common.h", "third_party/nanopb/pb_decode.h", "third_party/nanopb/pb_encode.h", + "src/core/ext/transport/chttp2/client/insecure/channel_create.c", + "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c", + "src/core/ext/transport/chttp2/transport/alpn.c", + "src/core/ext/transport/chttp2/transport/bin_encoder.c", + "src/core/ext/transport/chttp2/transport/chttp2_transport.c", + "src/core/ext/transport/chttp2/transport/frame_data.c", + "src/core/ext/transport/chttp2/transport/frame_goaway.c", + "src/core/ext/transport/chttp2/transport/frame_ping.c", + "src/core/ext/transport/chttp2/transport/frame_rst_stream.c", + "src/core/ext/transport/chttp2/transport/frame_settings.c", + "src/core/ext/transport/chttp2/transport/frame_window_update.c", + "src/core/ext/transport/chttp2/transport/hpack_encoder.c", + "src/core/ext/transport/chttp2/transport/hpack_parser.c", + "src/core/ext/transport/chttp2/transport/hpack_table.c", + "src/core/ext/transport/chttp2/transport/huffsyms.c", + "src/core/ext/transport/chttp2/transport/incoming_metadata.c", + "src/core/ext/transport/chttp2/transport/parsing.c", + "src/core/ext/transport/chttp2/transport/status_conversion.c", + "src/core/ext/transport/chttp2/transport/stream_lists.c", + "src/core/ext/transport/chttp2/transport/stream_map.c", + "src/core/ext/transport/chttp2/transport/timeout_encoding.c", + "src/core/ext/transport/chttp2/transport/varint.c", + "src/core/ext/transport/chttp2/transport/writing.c", "src/core/lib/census/grpc_context.c", "src/core/lib/census/grpc_filter.c", "src/core/lib/census/grpc_plugin.c", @@ -391,7 +414,6 @@ cc_library( "src/core/lib/surface/call_log_batch.c", "src/core/lib/surface/channel.c", "src/core/lib/surface/channel_connectivity.c", - "src/core/lib/surface/channel_create.c", "src/core/lib/surface/channel_init.c", "src/core/lib/surface/channel_ping.c", "src/core/lib/surface/channel_stack_type.c", @@ -401,37 +423,17 @@ cc_library( "src/core/lib/surface/lame_client.c", "src/core/lib/surface/metadata_array.c", "src/core/lib/surface/server.c", - "src/core/lib/surface/server_chttp2.c", "src/core/lib/surface/validate_metadata.c", "src/core/lib/surface/version.c", "src/core/lib/transport/byte_stream.c", - "src/core/lib/transport/chttp2/alpn.c", - "src/core/lib/transport/chttp2/bin_encoder.c", - "src/core/lib/transport/chttp2/frame_data.c", - "src/core/lib/transport/chttp2/frame_goaway.c", - "src/core/lib/transport/chttp2/frame_ping.c", - "src/core/lib/transport/chttp2/frame_rst_stream.c", - "src/core/lib/transport/chttp2/frame_settings.c", - "src/core/lib/transport/chttp2/frame_window_update.c", - "src/core/lib/transport/chttp2/hpack_encoder.c", - "src/core/lib/transport/chttp2/hpack_parser.c", - "src/core/lib/transport/chttp2/hpack_table.c", - "src/core/lib/transport/chttp2/huffsyms.c", - "src/core/lib/transport/chttp2/incoming_metadata.c", - "src/core/lib/transport/chttp2/parsing.c", - "src/core/lib/transport/chttp2/status_conversion.c", - "src/core/lib/transport/chttp2/stream_lists.c", - "src/core/lib/transport/chttp2/stream_map.c", - "src/core/lib/transport/chttp2/timeout_encoding.c", - "src/core/lib/transport/chttp2/varint.c", - "src/core/lib/transport/chttp2/writing.c", - "src/core/lib/transport/chttp2_transport.c", "src/core/lib/transport/connectivity_state.c", "src/core/lib/transport/metadata.c", "src/core/lib/transport/metadata_batch.c", "src/core/lib/transport/static_metadata.c", "src/core/lib/transport/transport.c", "src/core/lib/transport/transport_op_string.c", + "src/core/ext/transport/chttp2/client/secure/secure_channel_create.c", + "src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c", "src/core/lib/http/httpcli_security_connector.c", "src/core/lib/security/b64.c", "src/core/lib/security/client_auth_filter.c", @@ -447,9 +449,7 @@ cc_library( "src/core/lib/security/security_connector.c", "src/core/lib/security/security_context.c", "src/core/lib/security/server_auth_filter.c", - "src/core/lib/security/server_secure_chttp2.c", "src/core/lib/surface/init_secure.c", - "src/core/lib/surface/secure_channel_create.c", "src/core/lib/tsi/fake_transport_security.c", "src/core/lib/tsi/ssl_transport_security.c", "src/core/lib/tsi/transport_security.c", @@ -532,6 +532,27 @@ cc_library( cc_library( name = "grpc_unsecure", srcs = [ + "src/core/ext/transport/chttp2/transport/alpn.h", + "src/core/ext/transport/chttp2/transport/bin_encoder.h", + "src/core/ext/transport/chttp2/transport/chttp2_transport.h", + "src/core/ext/transport/chttp2/transport/frame.h", + "src/core/ext/transport/chttp2/transport/frame_data.h", + "src/core/ext/transport/chttp2/transport/frame_goaway.h", + "src/core/ext/transport/chttp2/transport/frame_ping.h", + "src/core/ext/transport/chttp2/transport/frame_rst_stream.h", + "src/core/ext/transport/chttp2/transport/frame_settings.h", + "src/core/ext/transport/chttp2/transport/frame_window_update.h", + "src/core/ext/transport/chttp2/transport/hpack_encoder.h", + "src/core/ext/transport/chttp2/transport/hpack_parser.h", + "src/core/ext/transport/chttp2/transport/hpack_table.h", + "src/core/ext/transport/chttp2/transport/http2_errors.h", + "src/core/ext/transport/chttp2/transport/huffsyms.h", + "src/core/ext/transport/chttp2/transport/incoming_metadata.h", + "src/core/ext/transport/chttp2/transport/internal.h", + "src/core/ext/transport/chttp2/transport/status_conversion.h", + "src/core/ext/transport/chttp2/transport/stream_map.h", + "src/core/ext/transport/chttp2/transport/timeout_encoding.h", + "src/core/ext/transport/chttp2/transport/varint.h", "src/core/lib/census/grpc_filter.h", "src/core/lib/census/grpc_plugin.h", "src/core/lib/channel/channel_args.h", @@ -625,27 +646,6 @@ cc_library( "src/core/lib/surface/server.h", "src/core/lib/surface/surface_trace.h", "src/core/lib/transport/byte_stream.h", - "src/core/lib/transport/chttp2/alpn.h", - "src/core/lib/transport/chttp2/bin_encoder.h", - "src/core/lib/transport/chttp2/frame.h", - "src/core/lib/transport/chttp2/frame_data.h", - "src/core/lib/transport/chttp2/frame_goaway.h", - "src/core/lib/transport/chttp2/frame_ping.h", - "src/core/lib/transport/chttp2/frame_rst_stream.h", - "src/core/lib/transport/chttp2/frame_settings.h", - "src/core/lib/transport/chttp2/frame_window_update.h", - "src/core/lib/transport/chttp2/hpack_encoder.h", - "src/core/lib/transport/chttp2/hpack_parser.h", - "src/core/lib/transport/chttp2/hpack_table.h", - "src/core/lib/transport/chttp2/http2_errors.h", - "src/core/lib/transport/chttp2/huffsyms.h", - "src/core/lib/transport/chttp2/incoming_metadata.h", - "src/core/lib/transport/chttp2/internal.h", - "src/core/lib/transport/chttp2/status_conversion.h", - "src/core/lib/transport/chttp2/stream_map.h", - "src/core/lib/transport/chttp2/timeout_encoding.h", - "src/core/lib/transport/chttp2/varint.h", - "src/core/lib/transport/chttp2_transport.h", "src/core/lib/transport/connectivity_state.h", "src/core/lib/transport/metadata.h", "src/core/lib/transport/metadata_batch.h", @@ -660,6 +660,29 @@ cc_library( "third_party/nanopb/pb_decode.h", "third_party/nanopb/pb_encode.h", "src/core/lib/surface/init_unsecure.c", + "src/core/ext/transport/chttp2/client/insecure/channel_create.c", + "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c", + "src/core/ext/transport/chttp2/transport/alpn.c", + "src/core/ext/transport/chttp2/transport/bin_encoder.c", + "src/core/ext/transport/chttp2/transport/chttp2_transport.c", + "src/core/ext/transport/chttp2/transport/frame_data.c", + "src/core/ext/transport/chttp2/transport/frame_goaway.c", + "src/core/ext/transport/chttp2/transport/frame_ping.c", + "src/core/ext/transport/chttp2/transport/frame_rst_stream.c", + "src/core/ext/transport/chttp2/transport/frame_settings.c", + "src/core/ext/transport/chttp2/transport/frame_window_update.c", + "src/core/ext/transport/chttp2/transport/hpack_encoder.c", + "src/core/ext/transport/chttp2/transport/hpack_parser.c", + "src/core/ext/transport/chttp2/transport/hpack_table.c", + "src/core/ext/transport/chttp2/transport/huffsyms.c", + "src/core/ext/transport/chttp2/transport/incoming_metadata.c", + "src/core/ext/transport/chttp2/transport/parsing.c", + "src/core/ext/transport/chttp2/transport/status_conversion.c", + "src/core/ext/transport/chttp2/transport/stream_lists.c", + "src/core/ext/transport/chttp2/transport/stream_map.c", + "src/core/ext/transport/chttp2/transport/timeout_encoding.c", + "src/core/ext/transport/chttp2/transport/varint.c", + "src/core/ext/transport/chttp2/transport/writing.c", "src/core/lib/census/grpc_context.c", "src/core/lib/census/grpc_filter.c", "src/core/lib/census/grpc_plugin.c", @@ -753,7 +776,6 @@ cc_library( "src/core/lib/surface/call_log_batch.c", "src/core/lib/surface/channel.c", "src/core/lib/surface/channel_connectivity.c", - "src/core/lib/surface/channel_create.c", "src/core/lib/surface/channel_init.c", "src/core/lib/surface/channel_ping.c", "src/core/lib/surface/channel_stack_type.c", @@ -763,31 +785,9 @@ cc_library( "src/core/lib/surface/lame_client.c", "src/core/lib/surface/metadata_array.c", "src/core/lib/surface/server.c", - "src/core/lib/surface/server_chttp2.c", "src/core/lib/surface/validate_metadata.c", "src/core/lib/surface/version.c", "src/core/lib/transport/byte_stream.c", - "src/core/lib/transport/chttp2/alpn.c", - "src/core/lib/transport/chttp2/bin_encoder.c", - "src/core/lib/transport/chttp2/frame_data.c", - "src/core/lib/transport/chttp2/frame_goaway.c", - "src/core/lib/transport/chttp2/frame_ping.c", - "src/core/lib/transport/chttp2/frame_rst_stream.c", - "src/core/lib/transport/chttp2/frame_settings.c", - "src/core/lib/transport/chttp2/frame_window_update.c", - "src/core/lib/transport/chttp2/hpack_encoder.c", - "src/core/lib/transport/chttp2/hpack_parser.c", - "src/core/lib/transport/chttp2/hpack_table.c", - "src/core/lib/transport/chttp2/huffsyms.c", - "src/core/lib/transport/chttp2/incoming_metadata.c", - "src/core/lib/transport/chttp2/parsing.c", - "src/core/lib/transport/chttp2/status_conversion.c", - "src/core/lib/transport/chttp2/stream_lists.c", - "src/core/lib/transport/chttp2/stream_map.c", - "src/core/lib/transport/chttp2/timeout_encoding.c", - "src/core/lib/transport/chttp2/varint.c", - "src/core/lib/transport/chttp2/writing.c", - "src/core/lib/transport/chttp2_transport.c", "src/core/lib/transport/connectivity_state.c", "src/core/lib/transport/metadata.c", "src/core/lib/transport/metadata_batch.c", @@ -1361,6 +1361,29 @@ objc_library( objc_library( name = "grpc_objc", srcs = [ + "src/core/ext/transport/chttp2/client/insecure/channel_create.c", + "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c", + "src/core/ext/transport/chttp2/transport/alpn.c", + "src/core/ext/transport/chttp2/transport/bin_encoder.c", + "src/core/ext/transport/chttp2/transport/chttp2_transport.c", + "src/core/ext/transport/chttp2/transport/frame_data.c", + "src/core/ext/transport/chttp2/transport/frame_goaway.c", + "src/core/ext/transport/chttp2/transport/frame_ping.c", + "src/core/ext/transport/chttp2/transport/frame_rst_stream.c", + "src/core/ext/transport/chttp2/transport/frame_settings.c", + "src/core/ext/transport/chttp2/transport/frame_window_update.c", + "src/core/ext/transport/chttp2/transport/hpack_encoder.c", + "src/core/ext/transport/chttp2/transport/hpack_parser.c", + "src/core/ext/transport/chttp2/transport/hpack_table.c", + "src/core/ext/transport/chttp2/transport/huffsyms.c", + "src/core/ext/transport/chttp2/transport/incoming_metadata.c", + "src/core/ext/transport/chttp2/transport/parsing.c", + "src/core/ext/transport/chttp2/transport/status_conversion.c", + "src/core/ext/transport/chttp2/transport/stream_lists.c", + "src/core/ext/transport/chttp2/transport/stream_map.c", + "src/core/ext/transport/chttp2/transport/timeout_encoding.c", + "src/core/ext/transport/chttp2/transport/varint.c", + "src/core/ext/transport/chttp2/transport/writing.c", "src/core/lib/census/grpc_context.c", "src/core/lib/census/grpc_filter.c", "src/core/lib/census/grpc_plugin.c", @@ -1454,7 +1477,6 @@ objc_library( "src/core/lib/surface/call_log_batch.c", "src/core/lib/surface/channel.c", "src/core/lib/surface/channel_connectivity.c", - "src/core/lib/surface/channel_create.c", "src/core/lib/surface/channel_init.c", "src/core/lib/surface/channel_ping.c", "src/core/lib/surface/channel_stack_type.c", @@ -1464,37 +1486,17 @@ objc_library( "src/core/lib/surface/lame_client.c", "src/core/lib/surface/metadata_array.c", "src/core/lib/surface/server.c", - "src/core/lib/surface/server_chttp2.c", "src/core/lib/surface/validate_metadata.c", "src/core/lib/surface/version.c", "src/core/lib/transport/byte_stream.c", - "src/core/lib/transport/chttp2/alpn.c", - "src/core/lib/transport/chttp2/bin_encoder.c", - "src/core/lib/transport/chttp2/frame_data.c", - "src/core/lib/transport/chttp2/frame_goaway.c", - "src/core/lib/transport/chttp2/frame_ping.c", - "src/core/lib/transport/chttp2/frame_rst_stream.c", - "src/core/lib/transport/chttp2/frame_settings.c", - "src/core/lib/transport/chttp2/frame_window_update.c", - "src/core/lib/transport/chttp2/hpack_encoder.c", - "src/core/lib/transport/chttp2/hpack_parser.c", - "src/core/lib/transport/chttp2/hpack_table.c", - "src/core/lib/transport/chttp2/huffsyms.c", - "src/core/lib/transport/chttp2/incoming_metadata.c", - "src/core/lib/transport/chttp2/parsing.c", - "src/core/lib/transport/chttp2/status_conversion.c", - "src/core/lib/transport/chttp2/stream_lists.c", - "src/core/lib/transport/chttp2/stream_map.c", - "src/core/lib/transport/chttp2/timeout_encoding.c", - "src/core/lib/transport/chttp2/varint.c", - "src/core/lib/transport/chttp2/writing.c", - "src/core/lib/transport/chttp2_transport.c", "src/core/lib/transport/connectivity_state.c", "src/core/lib/transport/metadata.c", "src/core/lib/transport/metadata_batch.c", "src/core/lib/transport/static_metadata.c", "src/core/lib/transport/transport.c", "src/core/lib/transport/transport_op_string.c", + "src/core/ext/transport/chttp2/client/secure/secure_channel_create.c", + "src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c", "src/core/lib/http/httpcli_security_connector.c", "src/core/lib/security/b64.c", "src/core/lib/security/client_auth_filter.c", @@ -1510,9 +1512,7 @@ objc_library( "src/core/lib/security/security_connector.c", "src/core/lib/security/security_context.c", "src/core/lib/security/server_auth_filter.c", - "src/core/lib/security/server_secure_chttp2.c", "src/core/lib/surface/init_secure.c", - "src/core/lib/surface/secure_channel_create.c", "src/core/lib/tsi/fake_transport_security.c", "src/core/lib/tsi/ssl_transport_security.c", "src/core/lib/tsi/transport_security.c", @@ -1540,6 +1540,27 @@ objc_library( "include/grpc/impl/codegen/propagation_bits.h", "include/grpc/impl/codegen/status.h", "include/grpc/census.h", + "src/core/ext/transport/chttp2/transport/alpn.h", + "src/core/ext/transport/chttp2/transport/bin_encoder.h", + "src/core/ext/transport/chttp2/transport/chttp2_transport.h", + "src/core/ext/transport/chttp2/transport/frame.h", + "src/core/ext/transport/chttp2/transport/frame_data.h", + "src/core/ext/transport/chttp2/transport/frame_goaway.h", + "src/core/ext/transport/chttp2/transport/frame_ping.h", + "src/core/ext/transport/chttp2/transport/frame_rst_stream.h", + "src/core/ext/transport/chttp2/transport/frame_settings.h", + "src/core/ext/transport/chttp2/transport/frame_window_update.h", + "src/core/ext/transport/chttp2/transport/hpack_encoder.h", + "src/core/ext/transport/chttp2/transport/hpack_parser.h", + "src/core/ext/transport/chttp2/transport/hpack_table.h", + "src/core/ext/transport/chttp2/transport/http2_errors.h", + "src/core/ext/transport/chttp2/transport/huffsyms.h", + "src/core/ext/transport/chttp2/transport/incoming_metadata.h", + "src/core/ext/transport/chttp2/transport/internal.h", + "src/core/ext/transport/chttp2/transport/status_conversion.h", + "src/core/ext/transport/chttp2/transport/stream_map.h", + "src/core/ext/transport/chttp2/transport/timeout_encoding.h", + "src/core/ext/transport/chttp2/transport/varint.h", "src/core/lib/census/grpc_filter.h", "src/core/lib/census/grpc_plugin.h", "src/core/lib/channel/channel_args.h", @@ -1633,27 +1654,6 @@ objc_library( "src/core/lib/surface/server.h", "src/core/lib/surface/surface_trace.h", "src/core/lib/transport/byte_stream.h", - "src/core/lib/transport/chttp2/alpn.h", - "src/core/lib/transport/chttp2/bin_encoder.h", - "src/core/lib/transport/chttp2/frame.h", - "src/core/lib/transport/chttp2/frame_data.h", - "src/core/lib/transport/chttp2/frame_goaway.h", - "src/core/lib/transport/chttp2/frame_ping.h", - "src/core/lib/transport/chttp2/frame_rst_stream.h", - "src/core/lib/transport/chttp2/frame_settings.h", - "src/core/lib/transport/chttp2/frame_window_update.h", - "src/core/lib/transport/chttp2/hpack_encoder.h", - "src/core/lib/transport/chttp2/hpack_parser.h", - "src/core/lib/transport/chttp2/hpack_table.h", - "src/core/lib/transport/chttp2/http2_errors.h", - "src/core/lib/transport/chttp2/huffsyms.h", - "src/core/lib/transport/chttp2/incoming_metadata.h", - "src/core/lib/transport/chttp2/internal.h", - "src/core/lib/transport/chttp2/status_conversion.h", - "src/core/lib/transport/chttp2/stream_map.h", - "src/core/lib/transport/chttp2/timeout_encoding.h", - "src/core/lib/transport/chttp2/varint.h", - "src/core/lib/transport/chttp2_transport.h", "src/core/lib/transport/connectivity_state.h", "src/core/lib/transport/metadata.h", "src/core/lib/transport/metadata_batch.h", @@ -2419,6 +2419,29 @@ endif LIBGRPC_SRC = \ + src/core/ext/transport/chttp2/client/insecure/channel_create.c \ + src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \ + src/core/ext/transport/chttp2/transport/alpn.c \ + src/core/ext/transport/chttp2/transport/bin_encoder.c \ + src/core/ext/transport/chttp2/transport/chttp2_transport.c \ + src/core/ext/transport/chttp2/transport/frame_data.c \ + src/core/ext/transport/chttp2/transport/frame_goaway.c \ + src/core/ext/transport/chttp2/transport/frame_ping.c \ + src/core/ext/transport/chttp2/transport/frame_rst_stream.c \ + src/core/ext/transport/chttp2/transport/frame_settings.c \ + src/core/ext/transport/chttp2/transport/frame_window_update.c \ + src/core/ext/transport/chttp2/transport/hpack_encoder.c \ + src/core/ext/transport/chttp2/transport/hpack_parser.c \ + src/core/ext/transport/chttp2/transport/hpack_table.c \ + src/core/ext/transport/chttp2/transport/huffsyms.c \ + src/core/ext/transport/chttp2/transport/incoming_metadata.c \ + src/core/ext/transport/chttp2/transport/parsing.c \ + src/core/ext/transport/chttp2/transport/status_conversion.c \ + src/core/ext/transport/chttp2/transport/stream_lists.c \ + src/core/ext/transport/chttp2/transport/stream_map.c \ + src/core/ext/transport/chttp2/transport/timeout_encoding.c \ + src/core/ext/transport/chttp2/transport/varint.c \ + src/core/ext/transport/chttp2/transport/writing.c \ src/core/lib/census/grpc_context.c \ src/core/lib/census/grpc_filter.c \ src/core/lib/census/grpc_plugin.c \ @@ -2512,7 +2535,6 @@ LIBGRPC_SRC = \ src/core/lib/surface/call_log_batch.c \ src/core/lib/surface/channel.c \ src/core/lib/surface/channel_connectivity.c \ - src/core/lib/surface/channel_create.c \ src/core/lib/surface/channel_init.c \ src/core/lib/surface/channel_ping.c \ src/core/lib/surface/channel_stack_type.c \ @@ -2522,37 +2544,17 @@ LIBGRPC_SRC = \ src/core/lib/surface/lame_client.c \ src/core/lib/surface/metadata_array.c \ src/core/lib/surface/server.c \ - src/core/lib/surface/server_chttp2.c \ src/core/lib/surface/validate_metadata.c \ src/core/lib/surface/version.c \ src/core/lib/transport/byte_stream.c \ - src/core/lib/transport/chttp2/alpn.c \ - src/core/lib/transport/chttp2/bin_encoder.c \ - src/core/lib/transport/chttp2/frame_data.c \ - src/core/lib/transport/chttp2/frame_goaway.c \ - src/core/lib/transport/chttp2/frame_ping.c \ - src/core/lib/transport/chttp2/frame_rst_stream.c \ - src/core/lib/transport/chttp2/frame_settings.c \ - src/core/lib/transport/chttp2/frame_window_update.c \ - src/core/lib/transport/chttp2/hpack_encoder.c \ - src/core/lib/transport/chttp2/hpack_parser.c \ - src/core/lib/transport/chttp2/hpack_table.c \ - src/core/lib/transport/chttp2/huffsyms.c \ - src/core/lib/transport/chttp2/incoming_metadata.c \ - src/core/lib/transport/chttp2/parsing.c \ - src/core/lib/transport/chttp2/status_conversion.c \ - src/core/lib/transport/chttp2/stream_lists.c \ - src/core/lib/transport/chttp2/stream_map.c \ - src/core/lib/transport/chttp2/timeout_encoding.c \ - src/core/lib/transport/chttp2/varint.c \ - src/core/lib/transport/chttp2/writing.c \ - src/core/lib/transport/chttp2_transport.c \ src/core/lib/transport/connectivity_state.c \ src/core/lib/transport/metadata.c \ src/core/lib/transport/metadata_batch.c \ src/core/lib/transport/static_metadata.c \ src/core/lib/transport/transport.c \ src/core/lib/transport/transport_op_string.c \ + src/core/ext/transport/chttp2/client/secure/secure_channel_create.c \ + src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c \ src/core/lib/http/httpcli_security_connector.c \ src/core/lib/security/b64.c \ src/core/lib/security/client_auth_filter.c \ @@ -2568,9 +2570,7 @@ LIBGRPC_SRC = \ src/core/lib/security/security_connector.c \ src/core/lib/security/security_context.c \ src/core/lib/security/server_auth_filter.c \ - src/core/lib/security/server_secure_chttp2.c \ src/core/lib/surface/init_secure.c \ - src/core/lib/surface/secure_channel_create.c \ src/core/lib/tsi/fake_transport_security.c \ src/core/lib/tsi/ssl_transport_security.c \ src/core/lib/tsi/transport_security.c \ @@ -2781,6 +2781,29 @@ endif LIBGRPC_UNSECURE_SRC = \ src/core/lib/surface/init_unsecure.c \ + src/core/ext/transport/chttp2/client/insecure/channel_create.c \ + src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \ + src/core/ext/transport/chttp2/transport/alpn.c \ + src/core/ext/transport/chttp2/transport/bin_encoder.c \ + src/core/ext/transport/chttp2/transport/chttp2_transport.c \ + src/core/ext/transport/chttp2/transport/frame_data.c \ + src/core/ext/transport/chttp2/transport/frame_goaway.c \ + src/core/ext/transport/chttp2/transport/frame_ping.c \ + src/core/ext/transport/chttp2/transport/frame_rst_stream.c \ + src/core/ext/transport/chttp2/transport/frame_settings.c \ + src/core/ext/transport/chttp2/transport/frame_window_update.c \ + src/core/ext/transport/chttp2/transport/hpack_encoder.c \ + src/core/ext/transport/chttp2/transport/hpack_parser.c \ + src/core/ext/transport/chttp2/transport/hpack_table.c \ + src/core/ext/transport/chttp2/transport/huffsyms.c \ + src/core/ext/transport/chttp2/transport/incoming_metadata.c \ + src/core/ext/transport/chttp2/transport/parsing.c \ + src/core/ext/transport/chttp2/transport/status_conversion.c \ + src/core/ext/transport/chttp2/transport/stream_lists.c \ + src/core/ext/transport/chttp2/transport/stream_map.c \ + src/core/ext/transport/chttp2/transport/timeout_encoding.c \ + src/core/ext/transport/chttp2/transport/varint.c \ + src/core/ext/transport/chttp2/transport/writing.c \ src/core/lib/census/grpc_context.c \ src/core/lib/census/grpc_filter.c \ src/core/lib/census/grpc_plugin.c \ @@ -2874,7 +2897,6 @@ LIBGRPC_UNSECURE_SRC = \ src/core/lib/surface/call_log_batch.c \ src/core/lib/surface/channel.c \ src/core/lib/surface/channel_connectivity.c \ - src/core/lib/surface/channel_create.c \ src/core/lib/surface/channel_init.c \ src/core/lib/surface/channel_ping.c \ src/core/lib/surface/channel_stack_type.c \ @@ -2884,31 +2906,9 @@ LIBGRPC_UNSECURE_SRC = \ src/core/lib/surface/lame_client.c \ src/core/lib/surface/metadata_array.c \ src/core/lib/surface/server.c \ - src/core/lib/surface/server_chttp2.c \ src/core/lib/surface/validate_metadata.c \ src/core/lib/surface/version.c \ src/core/lib/transport/byte_stream.c \ - src/core/lib/transport/chttp2/alpn.c \ - src/core/lib/transport/chttp2/bin_encoder.c \ - src/core/lib/transport/chttp2/frame_data.c \ - src/core/lib/transport/chttp2/frame_goaway.c \ - src/core/lib/transport/chttp2/frame_ping.c \ - src/core/lib/transport/chttp2/frame_rst_stream.c \ - src/core/lib/transport/chttp2/frame_settings.c \ - src/core/lib/transport/chttp2/frame_window_update.c \ - src/core/lib/transport/chttp2/hpack_encoder.c \ - src/core/lib/transport/chttp2/hpack_parser.c \ - src/core/lib/transport/chttp2/hpack_table.c \ - src/core/lib/transport/chttp2/huffsyms.c \ - src/core/lib/transport/chttp2/incoming_metadata.c \ - src/core/lib/transport/chttp2/parsing.c \ - src/core/lib/transport/chttp2/status_conversion.c \ - src/core/lib/transport/chttp2/stream_lists.c \ - src/core/lib/transport/chttp2/stream_map.c \ - src/core/lib/transport/chttp2/timeout_encoding.c \ - src/core/lib/transport/chttp2/varint.c \ - src/core/lib/transport/chttp2/writing.c \ - src/core/lib/transport/chttp2_transport.c \ src/core/lib/transport/connectivity_state.c \ src/core/lib/transport/metadata.c \ src/core/lib/transport/metadata_batch.c \ @@ -13416,6 +13416,8 @@ ifneq ($(OPENSSL_DEP),) # This is to ensure the embedded OpenSSL is built beforehand, properly # installing headers to their final destination on the drive. We need this # otherwise parallel compilation will fail if a source is compiled first. +src/core/ext/transport/chttp2/client/secure/secure_channel_create.c: $(OPENSSL_DEP) +src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c: $(OPENSSL_DEP) src/core/lib/http/httpcli_security_connector.c: $(OPENSSL_DEP) src/core/lib/security/b64.c: $(OPENSSL_DEP) src/core/lib/security/client_auth_filter.c: $(OPENSSL_DEP) @@ -13431,9 +13433,7 @@ src/core/lib/security/secure_endpoint.c: $(OPENSSL_DEP) src/core/lib/security/security_connector.c: $(OPENSSL_DEP) src/core/lib/security/security_context.c: $(OPENSSL_DEP) src/core/lib/security/server_auth_filter.c: $(OPENSSL_DEP) -src/core/lib/security/server_secure_chttp2.c: $(OPENSSL_DEP) src/core/lib/surface/init_secure.c: $(OPENSSL_DEP) -src/core/lib/surface/secure_channel_create.c: $(OPENSSL_DEP) src/core/lib/tsi/fake_transport_security.c: $(OPENSSL_DEP) src/core/lib/tsi/ssl_transport_security.c: $(OPENSSL_DEP) src/core/lib/tsi/transport_security.c: $(OPENSSL_DEP) diff --git a/binding.gyp b/binding.gyp index 416ce20864..6ee8c3fd4f 100644 --- a/binding.gyp +++ b/binding.gyp @@ -558,6 +558,29 @@ 'gpr', ], 'sources': [ + 'src/core/ext/transport/chttp2/client/insecure/channel_create.c', + 'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c', + 'src/core/ext/transport/chttp2/transport/alpn.c', + 'src/core/ext/transport/chttp2/transport/bin_encoder.c', + 'src/core/ext/transport/chttp2/transport/chttp2_transport.c', + 'src/core/ext/transport/chttp2/transport/frame_data.c', + 'src/core/ext/transport/chttp2/transport/frame_goaway.c', + 'src/core/ext/transport/chttp2/transport/frame_ping.c', + 'src/core/ext/transport/chttp2/transport/frame_rst_stream.c', + 'src/core/ext/transport/chttp2/transport/frame_settings.c', + 'src/core/ext/transport/chttp2/transport/frame_window_update.c', + 'src/core/ext/transport/chttp2/transport/hpack_encoder.c', + 'src/core/ext/transport/chttp2/transport/hpack_parser.c', + 'src/core/ext/transport/chttp2/transport/hpack_table.c', + 'src/core/ext/transport/chttp2/transport/huffsyms.c', + 'src/core/ext/transport/chttp2/transport/incoming_metadata.c', + 'src/core/ext/transport/chttp2/transport/parsing.c', + 'src/core/ext/transport/chttp2/transport/status_conversion.c', + 'src/core/ext/transport/chttp2/transport/stream_lists.c', + 'src/core/ext/transport/chttp2/transport/stream_map.c', + 'src/core/ext/transport/chttp2/transport/timeout_encoding.c', + 'src/core/ext/transport/chttp2/transport/varint.c', + 'src/core/ext/transport/chttp2/transport/writing.c', 'src/core/lib/census/grpc_context.c', 'src/core/lib/census/grpc_filter.c', 'src/core/lib/census/grpc_plugin.c', @@ -651,7 +674,6 @@ 'src/core/lib/surface/call_log_batch.c', 'src/core/lib/surface/channel.c', 'src/core/lib/surface/channel_connectivity.c', - 'src/core/lib/surface/channel_create.c', 'src/core/lib/surface/channel_init.c', 'src/core/lib/surface/channel_ping.c', 'src/core/lib/surface/channel_stack_type.c', @@ -661,37 +683,17 @@ 'src/core/lib/surface/lame_client.c', 'src/core/lib/surface/metadata_array.c', 'src/core/lib/surface/server.c', - 'src/core/lib/surface/server_chttp2.c', 'src/core/lib/surface/validate_metadata.c', 'src/core/lib/surface/version.c', 'src/core/lib/transport/byte_stream.c', - 'src/core/lib/transport/chttp2/alpn.c', - 'src/core/lib/transport/chttp2/bin_encoder.c', - 'src/core/lib/transport/chttp2/frame_data.c', - 'src/core/lib/transport/chttp2/frame_goaway.c', - 'src/core/lib/transport/chttp2/frame_ping.c', - 'src/core/lib/transport/chttp2/frame_rst_stream.c', - 'src/core/lib/transport/chttp2/frame_settings.c', - 'src/core/lib/transport/chttp2/frame_window_update.c', - 'src/core/lib/transport/chttp2/hpack_encoder.c', - 'src/core/lib/transport/chttp2/hpack_parser.c', - 'src/core/lib/transport/chttp2/hpack_table.c', - 'src/core/lib/transport/chttp2/huffsyms.c', - 'src/core/lib/transport/chttp2/incoming_metadata.c', - 'src/core/lib/transport/chttp2/parsing.c', - 'src/core/lib/transport/chttp2/status_conversion.c', - 'src/core/lib/transport/chttp2/stream_lists.c', - 'src/core/lib/transport/chttp2/stream_map.c', - 'src/core/lib/transport/chttp2/timeout_encoding.c', - 'src/core/lib/transport/chttp2/varint.c', - 'src/core/lib/transport/chttp2/writing.c', - 'src/core/lib/transport/chttp2_transport.c', 'src/core/lib/transport/connectivity_state.c', 'src/core/lib/transport/metadata.c', 'src/core/lib/transport/metadata_batch.c', 'src/core/lib/transport/static_metadata.c', 'src/core/lib/transport/transport.c', 'src/core/lib/transport/transport_op_string.c', + 'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c', + 'src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c', 'src/core/lib/http/httpcli_security_connector.c', 'src/core/lib/security/b64.c', 'src/core/lib/security/client_auth_filter.c', @@ -707,9 +709,7 @@ 'src/core/lib/security/security_connector.c', 'src/core/lib/security/security_context.c', 'src/core/lib/security/server_auth_filter.c', - 'src/core/lib/security/server_secure_chttp2.c', 'src/core/lib/surface/init_secure.c', - 'src/core/lib/surface/secure_channel_create.c', 'src/core/lib/tsi/fake_transport_security.c', 'src/core/lib/tsi/ssl_transport_security.c', 'src/core/lib/tsi/transport_security.c', diff --git a/build.yaml b/build.yaml index 0398bc23b8..8290ac5a61 100644 --- a/build.yaml +++ b/build.yaml @@ -247,6 +247,27 @@ filegroups: - include/grpc/grpc.h - include/grpc/status.h headers: + - src/core/ext/transport/chttp2/transport/alpn.h + - src/core/ext/transport/chttp2/transport/bin_encoder.h + - src/core/ext/transport/chttp2/transport/chttp2_transport.h + - src/core/ext/transport/chttp2/transport/frame.h + - src/core/ext/transport/chttp2/transport/frame_data.h + - src/core/ext/transport/chttp2/transport/frame_goaway.h + - src/core/ext/transport/chttp2/transport/frame_ping.h + - src/core/ext/transport/chttp2/transport/frame_rst_stream.h + - src/core/ext/transport/chttp2/transport/frame_settings.h + - src/core/ext/transport/chttp2/transport/frame_window_update.h + - src/core/ext/transport/chttp2/transport/hpack_encoder.h + - src/core/ext/transport/chttp2/transport/hpack_parser.h + - src/core/ext/transport/chttp2/transport/hpack_table.h + - src/core/ext/transport/chttp2/transport/http2_errors.h + - src/core/ext/transport/chttp2/transport/huffsyms.h + - src/core/ext/transport/chttp2/transport/incoming_metadata.h + - src/core/ext/transport/chttp2/transport/internal.h + - src/core/ext/transport/chttp2/transport/status_conversion.h + - src/core/ext/transport/chttp2/transport/stream_map.h + - src/core/ext/transport/chttp2/transport/timeout_encoding.h + - src/core/ext/transport/chttp2/transport/varint.h - src/core/lib/census/grpc_filter.h - src/core/lib/census/grpc_plugin.h - src/core/lib/channel/channel_args.h @@ -340,27 +361,6 @@ filegroups: - src/core/lib/surface/server.h - src/core/lib/surface/surface_trace.h - src/core/lib/transport/byte_stream.h - - src/core/lib/transport/chttp2/alpn.h - - src/core/lib/transport/chttp2/bin_encoder.h - - src/core/lib/transport/chttp2/frame.h - - src/core/lib/transport/chttp2/frame_data.h - - src/core/lib/transport/chttp2/frame_goaway.h - - src/core/lib/transport/chttp2/frame_ping.h - - src/core/lib/transport/chttp2/frame_rst_stream.h - - src/core/lib/transport/chttp2/frame_settings.h - - src/core/lib/transport/chttp2/frame_window_update.h - - src/core/lib/transport/chttp2/hpack_encoder.h - - src/core/lib/transport/chttp2/hpack_parser.h - - src/core/lib/transport/chttp2/hpack_table.h - - src/core/lib/transport/chttp2/http2_errors.h - - src/core/lib/transport/chttp2/huffsyms.h - - src/core/lib/transport/chttp2/incoming_metadata.h - - src/core/lib/transport/chttp2/internal.h - - src/core/lib/transport/chttp2/status_conversion.h - - src/core/lib/transport/chttp2/stream_map.h - - src/core/lib/transport/chttp2/timeout_encoding.h - - src/core/lib/transport/chttp2/varint.h - - src/core/lib/transport/chttp2_transport.h - src/core/lib/transport/connectivity_state.h - src/core/lib/transport/metadata.h - src/core/lib/transport/metadata_batch.h @@ -368,6 +368,29 @@ filegroups: - src/core/lib/transport/transport.h - src/core/lib/transport/transport_impl.h src: + - src/core/ext/transport/chttp2/client/insecure/channel_create.c + - src/core/ext/transport/chttp2/server/insecure/server_chttp2.c + - src/core/ext/transport/chttp2/transport/alpn.c + - src/core/ext/transport/chttp2/transport/bin_encoder.c + - src/core/ext/transport/chttp2/transport/chttp2_transport.c + - src/core/ext/transport/chttp2/transport/frame_data.c + - src/core/ext/transport/chttp2/transport/frame_goaway.c + - src/core/ext/transport/chttp2/transport/frame_ping.c + - src/core/ext/transport/chttp2/transport/frame_rst_stream.c + - src/core/ext/transport/chttp2/transport/frame_settings.c + - src/core/ext/transport/chttp2/transport/frame_window_update.c + - src/core/ext/transport/chttp2/transport/hpack_encoder.c + - src/core/ext/transport/chttp2/transport/hpack_parser.c + - src/core/ext/transport/chttp2/transport/hpack_table.c + - src/core/ext/transport/chttp2/transport/huffsyms.c + - src/core/ext/transport/chttp2/transport/incoming_metadata.c + - src/core/ext/transport/chttp2/transport/parsing.c + - src/core/ext/transport/chttp2/transport/status_conversion.c + - src/core/ext/transport/chttp2/transport/stream_lists.c + - src/core/ext/transport/chttp2/transport/stream_map.c + - src/core/ext/transport/chttp2/transport/timeout_encoding.c + - src/core/ext/transport/chttp2/transport/varint.c + - src/core/ext/transport/chttp2/transport/writing.c - src/core/lib/census/grpc_context.c - src/core/lib/census/grpc_filter.c - src/core/lib/census/grpc_plugin.c @@ -461,7 +484,6 @@ filegroups: - src/core/lib/surface/call_log_batch.c - src/core/lib/surface/channel.c - src/core/lib/surface/channel_connectivity.c - - src/core/lib/surface/channel_create.c - src/core/lib/surface/channel_init.c - src/core/lib/surface/channel_ping.c - src/core/lib/surface/channel_stack_type.c @@ -471,31 +493,9 @@ filegroups: - src/core/lib/surface/lame_client.c - src/core/lib/surface/metadata_array.c - src/core/lib/surface/server.c - - src/core/lib/surface/server_chttp2.c - src/core/lib/surface/validate_metadata.c - src/core/lib/surface/version.c - src/core/lib/transport/byte_stream.c - - src/core/lib/transport/chttp2/alpn.c - - src/core/lib/transport/chttp2/bin_encoder.c - - src/core/lib/transport/chttp2/frame_data.c - - src/core/lib/transport/chttp2/frame_goaway.c - - src/core/lib/transport/chttp2/frame_ping.c - - src/core/lib/transport/chttp2/frame_rst_stream.c - - src/core/lib/transport/chttp2/frame_settings.c - - src/core/lib/transport/chttp2/frame_window_update.c - - src/core/lib/transport/chttp2/hpack_encoder.c - - src/core/lib/transport/chttp2/hpack_parser.c - - src/core/lib/transport/chttp2/hpack_table.c - - src/core/lib/transport/chttp2/huffsyms.c - - src/core/lib/transport/chttp2/incoming_metadata.c - - src/core/lib/transport/chttp2/parsing.c - - src/core/lib/transport/chttp2/status_conversion.c - - src/core/lib/transport/chttp2/stream_lists.c - - src/core/lib/transport/chttp2/stream_map.c - - src/core/lib/transport/chttp2/timeout_encoding.c - - src/core/lib/transport/chttp2/varint.c - - src/core/lib/transport/chttp2/writing.c - - src/core/lib/transport/chttp2_transport.c - src/core/lib/transport/connectivity_state.c - src/core/lib/transport/metadata.c - src/core/lib/transport/metadata_batch.c @@ -527,6 +527,8 @@ filegroups: - src/core/lib/tsi/transport_security.h - src/core/lib/tsi/transport_security_interface.h src: + - src/core/ext/transport/chttp2/client/secure/secure_channel_create.c + - src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c - src/core/lib/http/httpcli_security_connector.c - src/core/lib/security/b64.c - src/core/lib/security/client_auth_filter.c @@ -542,9 +544,7 @@ filegroups: - src/core/lib/security/security_connector.c - src/core/lib/security/security_context.c - src/core/lib/security/server_auth_filter.c - - src/core/lib/security/server_secure_chttp2.c - src/core/lib/surface/init_secure.c - - src/core/lib/surface/secure_channel_create.c - src/core/lib/tsi/fake_transport_security.c - src/core/lib/tsi/ssl_transport_security.c - src/core/lib/tsi/transport_security.c @@ -80,6 +80,29 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/support/tmpfile_posix.c \ src/core/lib/support/tmpfile_win32.c \ src/core/lib/support/wrap_memcpy.c \ + src/core/ext/transport/chttp2/client/insecure/channel_create.c \ + src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \ + src/core/ext/transport/chttp2/transport/alpn.c \ + src/core/ext/transport/chttp2/transport/bin_encoder.c \ + src/core/ext/transport/chttp2/transport/chttp2_transport.c \ + src/core/ext/transport/chttp2/transport/frame_data.c \ + src/core/ext/transport/chttp2/transport/frame_goaway.c \ + src/core/ext/transport/chttp2/transport/frame_ping.c \ + src/core/ext/transport/chttp2/transport/frame_rst_stream.c \ + src/core/ext/transport/chttp2/transport/frame_settings.c \ + src/core/ext/transport/chttp2/transport/frame_window_update.c \ + src/core/ext/transport/chttp2/transport/hpack_encoder.c \ + src/core/ext/transport/chttp2/transport/hpack_parser.c \ + src/core/ext/transport/chttp2/transport/hpack_table.c \ + src/core/ext/transport/chttp2/transport/huffsyms.c \ + src/core/ext/transport/chttp2/transport/incoming_metadata.c \ + src/core/ext/transport/chttp2/transport/parsing.c \ + src/core/ext/transport/chttp2/transport/status_conversion.c \ + src/core/ext/transport/chttp2/transport/stream_lists.c \ + src/core/ext/transport/chttp2/transport/stream_map.c \ + src/core/ext/transport/chttp2/transport/timeout_encoding.c \ + src/core/ext/transport/chttp2/transport/varint.c \ + src/core/ext/transport/chttp2/transport/writing.c \ src/core/lib/census/grpc_context.c \ src/core/lib/census/grpc_filter.c \ src/core/lib/census/grpc_plugin.c \ @@ -173,7 +196,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/surface/call_log_batch.c \ src/core/lib/surface/channel.c \ src/core/lib/surface/channel_connectivity.c \ - src/core/lib/surface/channel_create.c \ src/core/lib/surface/channel_init.c \ src/core/lib/surface/channel_ping.c \ src/core/lib/surface/channel_stack_type.c \ @@ -183,37 +205,17 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/surface/lame_client.c \ src/core/lib/surface/metadata_array.c \ src/core/lib/surface/server.c \ - src/core/lib/surface/server_chttp2.c \ src/core/lib/surface/validate_metadata.c \ src/core/lib/surface/version.c \ src/core/lib/transport/byte_stream.c \ - src/core/lib/transport/chttp2/alpn.c \ - src/core/lib/transport/chttp2/bin_encoder.c \ - src/core/lib/transport/chttp2/frame_data.c \ - src/core/lib/transport/chttp2/frame_goaway.c \ - src/core/lib/transport/chttp2/frame_ping.c \ - src/core/lib/transport/chttp2/frame_rst_stream.c \ - src/core/lib/transport/chttp2/frame_settings.c \ - src/core/lib/transport/chttp2/frame_window_update.c \ - src/core/lib/transport/chttp2/hpack_encoder.c \ - src/core/lib/transport/chttp2/hpack_parser.c \ - src/core/lib/transport/chttp2/hpack_table.c \ - src/core/lib/transport/chttp2/huffsyms.c \ - src/core/lib/transport/chttp2/incoming_metadata.c \ - src/core/lib/transport/chttp2/parsing.c \ - src/core/lib/transport/chttp2/status_conversion.c \ - src/core/lib/transport/chttp2/stream_lists.c \ - src/core/lib/transport/chttp2/stream_map.c \ - src/core/lib/transport/chttp2/timeout_encoding.c \ - src/core/lib/transport/chttp2/varint.c \ - src/core/lib/transport/chttp2/writing.c \ - src/core/lib/transport/chttp2_transport.c \ src/core/lib/transport/connectivity_state.c \ src/core/lib/transport/metadata.c \ src/core/lib/transport/metadata_batch.c \ src/core/lib/transport/static_metadata.c \ src/core/lib/transport/transport.c \ src/core/lib/transport/transport_op_string.c \ + src/core/ext/transport/chttp2/client/secure/secure_channel_create.c \ + src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c \ src/core/lib/http/httpcli_security_connector.c \ src/core/lib/security/b64.c \ src/core/lib/security/client_auth_filter.c \ @@ -229,9 +231,7 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/security/security_connector.c \ src/core/lib/security/security_context.c \ src/core/lib/security/server_auth_filter.c \ - src/core/lib/security/server_secure_chttp2.c \ src/core/lib/surface/init_secure.c \ - src/core/lib/surface/secure_channel_create.c \ src/core/lib/tsi/fake_transport_security.c \ src/core/lib/tsi/ssl_transport_security.c \ src/core/lib/tsi/transport_security.c \ @@ -546,6 +546,11 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/php/ext/grpc) PHP_ADD_BUILD_DIR($ext_builddir/src/boringssl) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/client/insecure) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/client/secure) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/server/insecure) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/server/secure) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/transport) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/census) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/channel) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/client_config) @@ -562,7 +567,6 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/support) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/surface) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/transport) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/transport/chttp2) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/tsi) PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto) PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/aes) diff --git a/gRPC.podspec b/gRPC.podspec index 3d5e8af15f..019bc627f7 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -161,6 +161,27 @@ Pod::Spec.new do |s| 'src/core/lib/support/tmpfile_posix.c', 'src/core/lib/support/tmpfile_win32.c', 'src/core/lib/support/wrap_memcpy.c', + 'src/core/ext/transport/chttp2/transport/alpn.h', + 'src/core/ext/transport/chttp2/transport/bin_encoder.h', + 'src/core/ext/transport/chttp2/transport/chttp2_transport.h', + 'src/core/ext/transport/chttp2/transport/frame.h', + 'src/core/ext/transport/chttp2/transport/frame_data.h', + 'src/core/ext/transport/chttp2/transport/frame_goaway.h', + 'src/core/ext/transport/chttp2/transport/frame_ping.h', + 'src/core/ext/transport/chttp2/transport/frame_rst_stream.h', + 'src/core/ext/transport/chttp2/transport/frame_settings.h', + 'src/core/ext/transport/chttp2/transport/frame_window_update.h', + 'src/core/ext/transport/chttp2/transport/hpack_encoder.h', + 'src/core/ext/transport/chttp2/transport/hpack_parser.h', + 'src/core/ext/transport/chttp2/transport/hpack_table.h', + 'src/core/ext/transport/chttp2/transport/http2_errors.h', + 'src/core/ext/transport/chttp2/transport/huffsyms.h', + 'src/core/ext/transport/chttp2/transport/incoming_metadata.h', + 'src/core/ext/transport/chttp2/transport/internal.h', + 'src/core/ext/transport/chttp2/transport/status_conversion.h', + 'src/core/ext/transport/chttp2/transport/stream_map.h', + 'src/core/ext/transport/chttp2/transport/timeout_encoding.h', + 'src/core/ext/transport/chttp2/transport/varint.h', 'src/core/lib/census/grpc_filter.h', 'src/core/lib/census/grpc_plugin.h', 'src/core/lib/channel/channel_args.h', @@ -254,27 +275,6 @@ Pod::Spec.new do |s| 'src/core/lib/surface/server.h', 'src/core/lib/surface/surface_trace.h', 'src/core/lib/transport/byte_stream.h', - 'src/core/lib/transport/chttp2/alpn.h', - 'src/core/lib/transport/chttp2/bin_encoder.h', - 'src/core/lib/transport/chttp2/frame.h', - 'src/core/lib/transport/chttp2/frame_data.h', - 'src/core/lib/transport/chttp2/frame_goaway.h', - 'src/core/lib/transport/chttp2/frame_ping.h', - 'src/core/lib/transport/chttp2/frame_rst_stream.h', - 'src/core/lib/transport/chttp2/frame_settings.h', - 'src/core/lib/transport/chttp2/frame_window_update.h', - 'src/core/lib/transport/chttp2/hpack_encoder.h', - 'src/core/lib/transport/chttp2/hpack_parser.h', - 'src/core/lib/transport/chttp2/hpack_table.h', - 'src/core/lib/transport/chttp2/http2_errors.h', - 'src/core/lib/transport/chttp2/huffsyms.h', - 'src/core/lib/transport/chttp2/incoming_metadata.h', - 'src/core/lib/transport/chttp2/internal.h', - 'src/core/lib/transport/chttp2/status_conversion.h', - 'src/core/lib/transport/chttp2/stream_map.h', - 'src/core/lib/transport/chttp2/timeout_encoding.h', - 'src/core/lib/transport/chttp2/varint.h', - 'src/core/lib/transport/chttp2_transport.h', 'src/core/lib/transport/connectivity_state.h', 'src/core/lib/transport/metadata.h', 'src/core/lib/transport/metadata_batch.h', @@ -315,6 +315,29 @@ Pod::Spec.new do |s| 'include/grpc/impl/codegen/propagation_bits.h', 'include/grpc/impl/codegen/status.h', 'include/grpc/census.h', + 'src/core/ext/transport/chttp2/client/insecure/channel_create.c', + 'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c', + 'src/core/ext/transport/chttp2/transport/alpn.c', + 'src/core/ext/transport/chttp2/transport/bin_encoder.c', + 'src/core/ext/transport/chttp2/transport/chttp2_transport.c', + 'src/core/ext/transport/chttp2/transport/frame_data.c', + 'src/core/ext/transport/chttp2/transport/frame_goaway.c', + 'src/core/ext/transport/chttp2/transport/frame_ping.c', + 'src/core/ext/transport/chttp2/transport/frame_rst_stream.c', + 'src/core/ext/transport/chttp2/transport/frame_settings.c', + 'src/core/ext/transport/chttp2/transport/frame_window_update.c', + 'src/core/ext/transport/chttp2/transport/hpack_encoder.c', + 'src/core/ext/transport/chttp2/transport/hpack_parser.c', + 'src/core/ext/transport/chttp2/transport/hpack_table.c', + 'src/core/ext/transport/chttp2/transport/huffsyms.c', + 'src/core/ext/transport/chttp2/transport/incoming_metadata.c', + 'src/core/ext/transport/chttp2/transport/parsing.c', + 'src/core/ext/transport/chttp2/transport/status_conversion.c', + 'src/core/ext/transport/chttp2/transport/stream_lists.c', + 'src/core/ext/transport/chttp2/transport/stream_map.c', + 'src/core/ext/transport/chttp2/transport/timeout_encoding.c', + 'src/core/ext/transport/chttp2/transport/varint.c', + 'src/core/ext/transport/chttp2/transport/writing.c', 'src/core/lib/census/grpc_context.c', 'src/core/lib/census/grpc_filter.c', 'src/core/lib/census/grpc_plugin.c', @@ -408,7 +431,6 @@ Pod::Spec.new do |s| 'src/core/lib/surface/call_log_batch.c', 'src/core/lib/surface/channel.c', 'src/core/lib/surface/channel_connectivity.c', - 'src/core/lib/surface/channel_create.c', 'src/core/lib/surface/channel_init.c', 'src/core/lib/surface/channel_ping.c', 'src/core/lib/surface/channel_stack_type.c', @@ -418,37 +440,17 @@ Pod::Spec.new do |s| 'src/core/lib/surface/lame_client.c', 'src/core/lib/surface/metadata_array.c', 'src/core/lib/surface/server.c', - 'src/core/lib/surface/server_chttp2.c', 'src/core/lib/surface/validate_metadata.c', 'src/core/lib/surface/version.c', 'src/core/lib/transport/byte_stream.c', - 'src/core/lib/transport/chttp2/alpn.c', - 'src/core/lib/transport/chttp2/bin_encoder.c', - 'src/core/lib/transport/chttp2/frame_data.c', - 'src/core/lib/transport/chttp2/frame_goaway.c', - 'src/core/lib/transport/chttp2/frame_ping.c', - 'src/core/lib/transport/chttp2/frame_rst_stream.c', - 'src/core/lib/transport/chttp2/frame_settings.c', - 'src/core/lib/transport/chttp2/frame_window_update.c', - 'src/core/lib/transport/chttp2/hpack_encoder.c', - 'src/core/lib/transport/chttp2/hpack_parser.c', - 'src/core/lib/transport/chttp2/hpack_table.c', - 'src/core/lib/transport/chttp2/huffsyms.c', - 'src/core/lib/transport/chttp2/incoming_metadata.c', - 'src/core/lib/transport/chttp2/parsing.c', - 'src/core/lib/transport/chttp2/status_conversion.c', - 'src/core/lib/transport/chttp2/stream_lists.c', - 'src/core/lib/transport/chttp2/stream_map.c', - 'src/core/lib/transport/chttp2/timeout_encoding.c', - 'src/core/lib/transport/chttp2/varint.c', - 'src/core/lib/transport/chttp2/writing.c', - 'src/core/lib/transport/chttp2_transport.c', 'src/core/lib/transport/connectivity_state.c', 'src/core/lib/transport/metadata.c', 'src/core/lib/transport/metadata_batch.c', 'src/core/lib/transport/static_metadata.c', 'src/core/lib/transport/transport.c', 'src/core/lib/transport/transport_op_string.c', + 'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c', + 'src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c', 'src/core/lib/http/httpcli_security_connector.c', 'src/core/lib/security/b64.c', 'src/core/lib/security/client_auth_filter.c', @@ -464,9 +466,7 @@ Pod::Spec.new do |s| 'src/core/lib/security/security_connector.c', 'src/core/lib/security/security_context.c', 'src/core/lib/security/server_auth_filter.c', - 'src/core/lib/security/server_secure_chttp2.c', 'src/core/lib/surface/init_secure.c', - 'src/core/lib/surface/secure_channel_create.c', 'src/core/lib/tsi/fake_transport_security.c', 'src/core/lib/tsi/ssl_transport_security.c', 'src/core/lib/tsi/transport_security.c', @@ -492,6 +492,27 @@ Pod::Spec.new do |s| 'src/core/lib/support/thd_internal.h', 'src/core/lib/support/time_precise.h', 'src/core/lib/support/tmpfile.h', + 'src/core/ext/transport/chttp2/transport/alpn.h', + 'src/core/ext/transport/chttp2/transport/bin_encoder.h', + 'src/core/ext/transport/chttp2/transport/chttp2_transport.h', + 'src/core/ext/transport/chttp2/transport/frame.h', + 'src/core/ext/transport/chttp2/transport/frame_data.h', + 'src/core/ext/transport/chttp2/transport/frame_goaway.h', + 'src/core/ext/transport/chttp2/transport/frame_ping.h', + 'src/core/ext/transport/chttp2/transport/frame_rst_stream.h', + 'src/core/ext/transport/chttp2/transport/frame_settings.h', + 'src/core/ext/transport/chttp2/transport/frame_window_update.h', + 'src/core/ext/transport/chttp2/transport/hpack_encoder.h', + 'src/core/ext/transport/chttp2/transport/hpack_parser.h', + 'src/core/ext/transport/chttp2/transport/hpack_table.h', + 'src/core/ext/transport/chttp2/transport/http2_errors.h', + 'src/core/ext/transport/chttp2/transport/huffsyms.h', + 'src/core/ext/transport/chttp2/transport/incoming_metadata.h', + 'src/core/ext/transport/chttp2/transport/internal.h', + 'src/core/ext/transport/chttp2/transport/status_conversion.h', + 'src/core/ext/transport/chttp2/transport/stream_map.h', + 'src/core/ext/transport/chttp2/transport/timeout_encoding.h', + 'src/core/ext/transport/chttp2/transport/varint.h', 'src/core/lib/census/grpc_filter.h', 'src/core/lib/census/grpc_plugin.h', 'src/core/lib/channel/channel_args.h', @@ -585,27 +606,6 @@ Pod::Spec.new do |s| 'src/core/lib/surface/server.h', 'src/core/lib/surface/surface_trace.h', 'src/core/lib/transport/byte_stream.h', - 'src/core/lib/transport/chttp2/alpn.h', - 'src/core/lib/transport/chttp2/bin_encoder.h', - 'src/core/lib/transport/chttp2/frame.h', - 'src/core/lib/transport/chttp2/frame_data.h', - 'src/core/lib/transport/chttp2/frame_goaway.h', - 'src/core/lib/transport/chttp2/frame_ping.h', - 'src/core/lib/transport/chttp2/frame_rst_stream.h', - 'src/core/lib/transport/chttp2/frame_settings.h', - 'src/core/lib/transport/chttp2/frame_window_update.h', - 'src/core/lib/transport/chttp2/hpack_encoder.h', - 'src/core/lib/transport/chttp2/hpack_parser.h', - 'src/core/lib/transport/chttp2/hpack_table.h', - 'src/core/lib/transport/chttp2/http2_errors.h', - 'src/core/lib/transport/chttp2/huffsyms.h', - 'src/core/lib/transport/chttp2/incoming_metadata.h', - 'src/core/lib/transport/chttp2/internal.h', - 'src/core/lib/transport/chttp2/status_conversion.h', - 'src/core/lib/transport/chttp2/stream_map.h', - 'src/core/lib/transport/chttp2/timeout_encoding.h', - 'src/core/lib/transport/chttp2/varint.h', - 'src/core/lib/transport/chttp2_transport.h', 'src/core/lib/transport/connectivity_state.h', 'src/core/lib/transport/metadata.h', 'src/core/lib/transport/metadata_batch.h', diff --git a/grpc.gemspec b/grpc.gemspec index aa52890aeb..c610f7ffae 100755 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -157,6 +157,27 @@ Gem::Specification.new do |s| s.files += %w( include/grpc/impl/codegen/propagation_bits.h ) s.files += %w( include/grpc/impl/codegen/status.h ) s.files += %w( include/grpc/census.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/alpn.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/bin_encoder.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/chttp2_transport.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/frame.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/frame_data.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/frame_goaway.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/frame_ping.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/frame_rst_stream.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/frame_settings.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/frame_window_update.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/hpack_encoder.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/hpack_parser.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/hpack_table.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/http2_errors.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/huffsyms.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/incoming_metadata.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/internal.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/status_conversion.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/stream_map.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/timeout_encoding.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/varint.h ) s.files += %w( src/core/lib/census/grpc_filter.h ) s.files += %w( src/core/lib/census/grpc_plugin.h ) s.files += %w( src/core/lib/channel/channel_args.h ) @@ -250,27 +271,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/surface/server.h ) s.files += %w( src/core/lib/surface/surface_trace.h ) s.files += %w( src/core/lib/transport/byte_stream.h ) - s.files += %w( src/core/lib/transport/chttp2/alpn.h ) - s.files += %w( src/core/lib/transport/chttp2/bin_encoder.h ) - s.files += %w( src/core/lib/transport/chttp2/frame.h ) - s.files += %w( src/core/lib/transport/chttp2/frame_data.h ) - s.files += %w( src/core/lib/transport/chttp2/frame_goaway.h ) - s.files += %w( src/core/lib/transport/chttp2/frame_ping.h ) - s.files += %w( src/core/lib/transport/chttp2/frame_rst_stream.h ) - s.files += %w( src/core/lib/transport/chttp2/frame_settings.h ) - s.files += %w( src/core/lib/transport/chttp2/frame_window_update.h ) - s.files += %w( src/core/lib/transport/chttp2/hpack_encoder.h ) - s.files += %w( src/core/lib/transport/chttp2/hpack_parser.h ) - s.files += %w( src/core/lib/transport/chttp2/hpack_table.h ) - s.files += %w( src/core/lib/transport/chttp2/http2_errors.h ) - s.files += %w( src/core/lib/transport/chttp2/huffsyms.h ) - s.files += %w( src/core/lib/transport/chttp2/incoming_metadata.h ) - s.files += %w( src/core/lib/transport/chttp2/internal.h ) - s.files += %w( src/core/lib/transport/chttp2/status_conversion.h ) - s.files += %w( src/core/lib/transport/chttp2/stream_map.h ) - s.files += %w( src/core/lib/transport/chttp2/timeout_encoding.h ) - s.files += %w( src/core/lib/transport/chttp2/varint.h ) - s.files += %w( src/core/lib/transport/chttp2_transport.h ) s.files += %w( src/core/lib/transport/connectivity_state.h ) s.files += %w( src/core/lib/transport/metadata.h ) s.files += %w( src/core/lib/transport/metadata_batch.h ) @@ -298,6 +298,29 @@ Gem::Specification.new do |s| s.files += %w( third_party/nanopb/pb_common.h ) s.files += %w( third_party/nanopb/pb_decode.h ) s.files += %w( third_party/nanopb/pb_encode.h ) + s.files += %w( src/core/ext/transport/chttp2/client/insecure/channel_create.c ) + s.files += %w( src/core/ext/transport/chttp2/server/insecure/server_chttp2.c ) + s.files += %w( src/core/ext/transport/chttp2/transport/alpn.c ) + s.files += %w( src/core/ext/transport/chttp2/transport/bin_encoder.c ) + s.files += %w( src/core/ext/transport/chttp2/transport/chttp2_transport.c ) + s.files += %w( src/core/ext/transport/chttp2/transport/frame_data.c ) + s.files += %w( src/core/ext/transport/chttp2/transport/frame_goaway.c ) + s.files += %w( src/core/ext/transport/chttp2/transport/frame_ping.c ) + s.files += %w( src/core/ext/transport/chttp2/transport/frame_rst_stream.c ) + s.files += %w( src/core/ext/transport/chttp2/transport/frame_settings.c ) + s.files += %w( src/core/ext/transport/chttp2/transport/frame_window_update.c ) + s.files += %w( src/core/ext/transport/chttp2/transport/hpack_encoder.c ) + s.files += %w( src/core/ext/transport/chttp2/transport/hpack_parser.c ) + s.files += %w( src/core/ext/transport/chttp2/transport/hpack_table.c ) + s.files += %w( src/core/ext/transport/chttp2/transport/huffsyms.c ) + s.files += %w( src/core/ext/transport/chttp2/transport/incoming_metadata.c ) + s.files += %w( src/core/ext/transport/chttp2/transport/parsing.c ) + s.files += %w( src/core/ext/transport/chttp2/transport/status_conversion.c ) + s.files += %w( src/core/ext/transport/chttp2/transport/stream_lists.c ) + s.files += %w( src/core/ext/transport/chttp2/transport/stream_map.c ) + s.files += %w( src/core/ext/transport/chttp2/transport/timeout_encoding.c ) + s.files += %w( src/core/ext/transport/chttp2/transport/varint.c ) + s.files += %w( src/core/ext/transport/chttp2/transport/writing.c ) s.files += %w( src/core/lib/census/grpc_context.c ) s.files += %w( src/core/lib/census/grpc_filter.c ) s.files += %w( src/core/lib/census/grpc_plugin.c ) @@ -391,7 +414,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/surface/call_log_batch.c ) s.files += %w( src/core/lib/surface/channel.c ) s.files += %w( src/core/lib/surface/channel_connectivity.c ) - s.files += %w( src/core/lib/surface/channel_create.c ) s.files += %w( src/core/lib/surface/channel_init.c ) s.files += %w( src/core/lib/surface/channel_ping.c ) s.files += %w( src/core/lib/surface/channel_stack_type.c ) @@ -401,37 +423,17 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/surface/lame_client.c ) s.files += %w( src/core/lib/surface/metadata_array.c ) s.files += %w( src/core/lib/surface/server.c ) - s.files += %w( src/core/lib/surface/server_chttp2.c ) s.files += %w( src/core/lib/surface/validate_metadata.c ) s.files += %w( src/core/lib/surface/version.c ) s.files += %w( src/core/lib/transport/byte_stream.c ) - s.files += %w( src/core/lib/transport/chttp2/alpn.c ) - s.files += %w( src/core/lib/transport/chttp2/bin_encoder.c ) - s.files += %w( src/core/lib/transport/chttp2/frame_data.c ) - s.files += %w( src/core/lib/transport/chttp2/frame_goaway.c ) - s.files += %w( src/core/lib/transport/chttp2/frame_ping.c ) - s.files += %w( src/core/lib/transport/chttp2/frame_rst_stream.c ) - s.files += %w( src/core/lib/transport/chttp2/frame_settings.c ) - s.files += %w( src/core/lib/transport/chttp2/frame_window_update.c ) - s.files += %w( src/core/lib/transport/chttp2/hpack_encoder.c ) - s.files += %w( src/core/lib/transport/chttp2/hpack_parser.c ) - s.files += %w( src/core/lib/transport/chttp2/hpack_table.c ) - s.files += %w( src/core/lib/transport/chttp2/huffsyms.c ) - s.files += %w( src/core/lib/transport/chttp2/incoming_metadata.c ) - s.files += %w( src/core/lib/transport/chttp2/parsing.c ) - s.files += %w( src/core/lib/transport/chttp2/status_conversion.c ) - s.files += %w( src/core/lib/transport/chttp2/stream_lists.c ) - s.files += %w( src/core/lib/transport/chttp2/stream_map.c ) - s.files += %w( src/core/lib/transport/chttp2/timeout_encoding.c ) - s.files += %w( src/core/lib/transport/chttp2/varint.c ) - s.files += %w( src/core/lib/transport/chttp2/writing.c ) - s.files += %w( src/core/lib/transport/chttp2_transport.c ) s.files += %w( src/core/lib/transport/connectivity_state.c ) s.files += %w( src/core/lib/transport/metadata.c ) s.files += %w( src/core/lib/transport/metadata_batch.c ) s.files += %w( src/core/lib/transport/static_metadata.c ) s.files += %w( src/core/lib/transport/transport.c ) s.files += %w( src/core/lib/transport/transport_op_string.c ) + s.files += %w( src/core/ext/transport/chttp2/client/secure/secure_channel_create.c ) + s.files += %w( src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c ) s.files += %w( src/core/lib/http/httpcli_security_connector.c ) s.files += %w( src/core/lib/security/b64.c ) s.files += %w( src/core/lib/security/client_auth_filter.c ) @@ -447,9 +449,7 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/security/security_connector.c ) s.files += %w( src/core/lib/security/security_context.c ) s.files += %w( src/core/lib/security/server_auth_filter.c ) - s.files += %w( src/core/lib/security/server_secure_chttp2.c ) s.files += %w( src/core/lib/surface/init_secure.c ) - s.files += %w( src/core/lib/surface/secure_channel_create.c ) s.files += %w( src/core/lib/tsi/fake_transport_security.c ) s.files += %w( src/core/lib/tsi/ssl_transport_security.c ) s.files += %w( src/core/lib/tsi/transport_security.c ) diff --git a/package.json b/package.json index 37856d7cc7..d9979462d9 100644 --- a/package.json +++ b/package.json @@ -99,6 +99,27 @@ "include/grpc/impl/codegen/propagation_bits.h", "include/grpc/impl/codegen/status.h", "include/grpc/census.h", + "src/core/ext/transport/chttp2/transport/alpn.h", + "src/core/ext/transport/chttp2/transport/bin_encoder.h", + "src/core/ext/transport/chttp2/transport/chttp2_transport.h", + "src/core/ext/transport/chttp2/transport/frame.h", + "src/core/ext/transport/chttp2/transport/frame_data.h", + "src/core/ext/transport/chttp2/transport/frame_goaway.h", + "src/core/ext/transport/chttp2/transport/frame_ping.h", + "src/core/ext/transport/chttp2/transport/frame_rst_stream.h", + "src/core/ext/transport/chttp2/transport/frame_settings.h", + "src/core/ext/transport/chttp2/transport/frame_window_update.h", + "src/core/ext/transport/chttp2/transport/hpack_encoder.h", + "src/core/ext/transport/chttp2/transport/hpack_parser.h", + "src/core/ext/transport/chttp2/transport/hpack_table.h", + "src/core/ext/transport/chttp2/transport/http2_errors.h", + "src/core/ext/transport/chttp2/transport/huffsyms.h", + "src/core/ext/transport/chttp2/transport/incoming_metadata.h", + "src/core/ext/transport/chttp2/transport/internal.h", + "src/core/ext/transport/chttp2/transport/status_conversion.h", + "src/core/ext/transport/chttp2/transport/stream_map.h", + "src/core/ext/transport/chttp2/transport/timeout_encoding.h", + "src/core/ext/transport/chttp2/transport/varint.h", "src/core/lib/census/grpc_filter.h", "src/core/lib/census/grpc_plugin.h", "src/core/lib/channel/channel_args.h", @@ -192,27 +213,6 @@ "src/core/lib/surface/server.h", "src/core/lib/surface/surface_trace.h", "src/core/lib/transport/byte_stream.h", - "src/core/lib/transport/chttp2/alpn.h", - "src/core/lib/transport/chttp2/bin_encoder.h", - "src/core/lib/transport/chttp2/frame.h", - "src/core/lib/transport/chttp2/frame_data.h", - "src/core/lib/transport/chttp2/frame_goaway.h", - "src/core/lib/transport/chttp2/frame_ping.h", - "src/core/lib/transport/chttp2/frame_rst_stream.h", - "src/core/lib/transport/chttp2/frame_settings.h", - "src/core/lib/transport/chttp2/frame_window_update.h", - "src/core/lib/transport/chttp2/hpack_encoder.h", - "src/core/lib/transport/chttp2/hpack_parser.h", - "src/core/lib/transport/chttp2/hpack_table.h", - "src/core/lib/transport/chttp2/http2_errors.h", - "src/core/lib/transport/chttp2/huffsyms.h", - "src/core/lib/transport/chttp2/incoming_metadata.h", - "src/core/lib/transport/chttp2/internal.h", - "src/core/lib/transport/chttp2/status_conversion.h", - "src/core/lib/transport/chttp2/stream_map.h", - "src/core/lib/transport/chttp2/timeout_encoding.h", - "src/core/lib/transport/chttp2/varint.h", - "src/core/lib/transport/chttp2_transport.h", "src/core/lib/transport/connectivity_state.h", "src/core/lib/transport/metadata.h", "src/core/lib/transport/metadata_batch.h", @@ -240,6 +240,29 @@ "third_party/nanopb/pb_common.h", "third_party/nanopb/pb_decode.h", "third_party/nanopb/pb_encode.h", + "src/core/ext/transport/chttp2/client/insecure/channel_create.c", + "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c", + "src/core/ext/transport/chttp2/transport/alpn.c", + "src/core/ext/transport/chttp2/transport/bin_encoder.c", + "src/core/ext/transport/chttp2/transport/chttp2_transport.c", + "src/core/ext/transport/chttp2/transport/frame_data.c", + "src/core/ext/transport/chttp2/transport/frame_goaway.c", + "src/core/ext/transport/chttp2/transport/frame_ping.c", + "src/core/ext/transport/chttp2/transport/frame_rst_stream.c", + "src/core/ext/transport/chttp2/transport/frame_settings.c", + "src/core/ext/transport/chttp2/transport/frame_window_update.c", + "src/core/ext/transport/chttp2/transport/hpack_encoder.c", + "src/core/ext/transport/chttp2/transport/hpack_parser.c", + "src/core/ext/transport/chttp2/transport/hpack_table.c", + "src/core/ext/transport/chttp2/transport/huffsyms.c", + "src/core/ext/transport/chttp2/transport/incoming_metadata.c", + "src/core/ext/transport/chttp2/transport/parsing.c", + "src/core/ext/transport/chttp2/transport/status_conversion.c", + "src/core/ext/transport/chttp2/transport/stream_lists.c", + "src/core/ext/transport/chttp2/transport/stream_map.c", + "src/core/ext/transport/chttp2/transport/timeout_encoding.c", + "src/core/ext/transport/chttp2/transport/varint.c", + "src/core/ext/transport/chttp2/transport/writing.c", "src/core/lib/census/grpc_context.c", "src/core/lib/census/grpc_filter.c", "src/core/lib/census/grpc_plugin.c", @@ -333,7 +356,6 @@ "src/core/lib/surface/call_log_batch.c", "src/core/lib/surface/channel.c", "src/core/lib/surface/channel_connectivity.c", - "src/core/lib/surface/channel_create.c", "src/core/lib/surface/channel_init.c", "src/core/lib/surface/channel_ping.c", "src/core/lib/surface/channel_stack_type.c", @@ -343,37 +365,17 @@ "src/core/lib/surface/lame_client.c", "src/core/lib/surface/metadata_array.c", "src/core/lib/surface/server.c", - "src/core/lib/surface/server_chttp2.c", "src/core/lib/surface/validate_metadata.c", "src/core/lib/surface/version.c", "src/core/lib/transport/byte_stream.c", - "src/core/lib/transport/chttp2/alpn.c", - "src/core/lib/transport/chttp2/bin_encoder.c", - "src/core/lib/transport/chttp2/frame_data.c", - "src/core/lib/transport/chttp2/frame_goaway.c", - "src/core/lib/transport/chttp2/frame_ping.c", - "src/core/lib/transport/chttp2/frame_rst_stream.c", - "src/core/lib/transport/chttp2/frame_settings.c", - "src/core/lib/transport/chttp2/frame_window_update.c", - "src/core/lib/transport/chttp2/hpack_encoder.c", - "src/core/lib/transport/chttp2/hpack_parser.c", - "src/core/lib/transport/chttp2/hpack_table.c", - "src/core/lib/transport/chttp2/huffsyms.c", - "src/core/lib/transport/chttp2/incoming_metadata.c", - "src/core/lib/transport/chttp2/parsing.c", - "src/core/lib/transport/chttp2/status_conversion.c", - "src/core/lib/transport/chttp2/stream_lists.c", - "src/core/lib/transport/chttp2/stream_map.c", - "src/core/lib/transport/chttp2/timeout_encoding.c", - "src/core/lib/transport/chttp2/varint.c", - "src/core/lib/transport/chttp2/writing.c", - "src/core/lib/transport/chttp2_transport.c", "src/core/lib/transport/connectivity_state.c", "src/core/lib/transport/metadata.c", "src/core/lib/transport/metadata_batch.c", "src/core/lib/transport/static_metadata.c", "src/core/lib/transport/transport.c", "src/core/lib/transport/transport_op_string.c", + "src/core/ext/transport/chttp2/client/secure/secure_channel_create.c", + "src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c", "src/core/lib/http/httpcli_security_connector.c", "src/core/lib/security/b64.c", "src/core/lib/security/client_auth_filter.c", @@ -389,9 +391,7 @@ "src/core/lib/security/security_connector.c", "src/core/lib/security/security_context.c", "src/core/lib/security/server_auth_filter.c", - "src/core/lib/security/server_secure_chttp2.c", "src/core/lib/surface/init_secure.c", - "src/core/lib/surface/secure_channel_create.c", "src/core/lib/tsi/fake_transport_security.c", "src/core/lib/tsi/ssl_transport_security.c", "src/core/lib/tsi/transport_security.c", diff --git a/package.xml b/package.xml index bb969d115c..6147de41fa 100644 --- a/package.xml +++ b/package.xml @@ -161,6 +161,27 @@ <file baseinstalldir="/" name="include/grpc/impl/codegen/propagation_bits.h" role="src" /> <file baseinstalldir="/" name="include/grpc/impl/codegen/status.h" role="src" /> <file baseinstalldir="/" name="include/grpc/census.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/alpn.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/bin_encoder.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/chttp2_transport.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/frame.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/frame_data.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/frame_goaway.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/frame_ping.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/frame_rst_stream.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/frame_settings.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/frame_window_update.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/hpack_encoder.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/hpack_parser.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/hpack_table.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/http2_errors.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/huffsyms.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/incoming_metadata.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/internal.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/status_conversion.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/stream_map.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/timeout_encoding.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/varint.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/census/grpc_filter.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/census/grpc_plugin.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/channel/channel_args.h" role="src" /> @@ -254,27 +275,6 @@ <file baseinstalldir="/" name="src/core/lib/surface/server.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/surface/surface_trace.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/transport/byte_stream.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/alpn.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/bin_encoder.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/frame.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/frame_data.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/frame_goaway.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/frame_ping.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/frame_rst_stream.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/frame_settings.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/frame_window_update.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/hpack_encoder.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/hpack_parser.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/hpack_table.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/http2_errors.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/huffsyms.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/incoming_metadata.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/internal.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/status_conversion.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/stream_map.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/timeout_encoding.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/varint.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2_transport.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/transport/connectivity_state.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/transport/metadata.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/transport/metadata_batch.h" role="src" /> @@ -302,6 +302,29 @@ <file baseinstalldir="/" name="third_party/nanopb/pb_common.h" role="src" /> <file baseinstalldir="/" name="third_party/nanopb/pb_decode.h" role="src" /> <file baseinstalldir="/" name="third_party/nanopb/pb_encode.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/insecure/channel_create.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/server/insecure/server_chttp2.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/alpn.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/bin_encoder.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/chttp2_transport.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/frame_data.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/frame_goaway.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/frame_ping.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/frame_rst_stream.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/frame_settings.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/frame_window_update.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/hpack_encoder.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/hpack_parser.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/hpack_table.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/huffsyms.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/incoming_metadata.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/parsing.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/status_conversion.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/stream_lists.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/stream_map.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/timeout_encoding.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/varint.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/writing.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/census/grpc_context.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/census/grpc_filter.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/census/grpc_plugin.c" role="src" /> @@ -395,7 +418,6 @@ <file baseinstalldir="/" name="src/core/lib/surface/call_log_batch.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/surface/channel.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/surface/channel_connectivity.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/surface/channel_create.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/surface/channel_init.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/surface/channel_ping.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/surface/channel_stack_type.c" role="src" /> @@ -405,37 +427,17 @@ <file baseinstalldir="/" name="src/core/lib/surface/lame_client.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/surface/metadata_array.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/surface/server.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/surface/server_chttp2.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/surface/validate_metadata.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/surface/version.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/transport/byte_stream.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/alpn.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/bin_encoder.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/frame_data.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/frame_goaway.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/frame_ping.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/frame_rst_stream.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/frame_settings.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/frame_window_update.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/hpack_encoder.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/hpack_parser.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/hpack_table.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/huffsyms.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/incoming_metadata.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/parsing.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/status_conversion.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/stream_lists.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/stream_map.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/timeout_encoding.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/varint.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2/writing.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/transport/chttp2_transport.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/transport/connectivity_state.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/transport/metadata.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/transport/metadata_batch.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/transport/static_metadata.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/transport/transport.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/transport/transport_op_string.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/secure/secure_channel_create.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/http/httpcli_security_connector.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/security/b64.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/security/client_auth_filter.c" role="src" /> @@ -451,9 +453,7 @@ <file baseinstalldir="/" name="src/core/lib/security/security_connector.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/security/security_context.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/security/server_auth_filter.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/security/server_secure_chttp2.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/surface/init_secure.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/surface/secure_channel_create.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/tsi/fake_transport_security.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/tsi/ssl_transport_security.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/tsi/transport_security.c" role="src" /> diff --git a/src/core/ext/transport/chttp2/client/insecure/README.md b/src/core/ext/transport/chttp2/client/insecure/README.md new file mode 100644 index 0000000000..fa11463388 --- /dev/null +++ b/src/core/ext/transport/chttp2/client/insecure/README.md @@ -0,0 +1 @@ +Plugin for creating insecure channels using chttp2 diff --git a/src/core/lib/surface/channel_create.c b/src/core/ext/transport/chttp2/client/insecure/channel_create.c index e8777ce816..ae2f37d309 100644 --- a/src/core/lib/surface/channel_create.c +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create.c @@ -49,7 +49,7 @@ #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/channel.h" -#include "src/core/lib/transport/chttp2_transport.h" +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" typedef struct { grpc_connector base; diff --git a/src/core/ext/transport/chttp2/client/secure/README.md b/src/core/ext/transport/chttp2/client/secure/README.md new file mode 100644 index 0000000000..405a86e5db --- /dev/null +++ b/src/core/ext/transport/chttp2/client/secure/README.md @@ -0,0 +1 @@ +Plugin for creating secure channels using chttp2 diff --git a/src/core/lib/surface/secure_channel_create.c b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c index dcb367023e..e77b7f7e33 100644 --- a/src/core/lib/surface/secure_channel_create.c +++ b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c @@ -40,6 +40,7 @@ #include <grpc/support/slice.h> #include <grpc/support/slice_buffer.h> +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/client_channel.h" #include "src/core/lib/client_config/resolver_registry.h" @@ -49,7 +50,6 @@ #include "src/core/lib/security/security_context.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/channel.h" -#include "src/core/lib/transport/chttp2_transport.h" #include "src/core/lib/tsi/transport_security_interface.h" typedef struct { diff --git a/src/core/ext/transport/chttp2/server/insecure/README.md b/src/core/ext/transport/chttp2/server/insecure/README.md new file mode 100644 index 0000000000..fc0bc14ed7 --- /dev/null +++ b/src/core/ext/transport/chttp2/server/insecure/README.md @@ -0,0 +1 @@ +Plugin for creating insecure servers using chttp2 diff --git a/src/core/lib/surface/server_chttp2.c b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.c index f0c2ee5153..16666093cd 100644 --- a/src/core/lib/surface/server_chttp2.c +++ b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.c @@ -41,7 +41,7 @@ #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/server.h" -#include "src/core/lib/transport/chttp2_transport.h" +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" static void setup_transport(grpc_exec_ctx *exec_ctx, void *server, grpc_transport *transport) { diff --git a/src/core/ext/transport/chttp2/server/secure/README.md b/src/core/ext/transport/chttp2/server/secure/README.md new file mode 100644 index 0000000000..6bda696a9a --- /dev/null +++ b/src/core/ext/transport/chttp2/server/secure/README.md @@ -0,0 +1 @@ +Plugin for creating secure servers using chttp2 diff --git a/src/core/lib/security/server_secure_chttp2.c b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c index 7c9dd221ed..dddea203fb 100644 --- a/src/core/lib/security/server_secure_chttp2.c +++ b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c @@ -50,7 +50,7 @@ #include "src/core/lib/security/security_context.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/server.h" -#include "src/core/lib/transport/chttp2_transport.h" +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" typedef struct grpc_server_secure_state { grpc_server *server; diff --git a/src/core/ext/transport/chttp2/transport/README.md b/src/core/ext/transport/chttp2/transport/README.md new file mode 100644 index 0000000000..4684e58759 --- /dev/null +++ b/src/core/ext/transport/chttp2/transport/README.md @@ -0,0 +1,4 @@ +chttp2 transport plugin - implements grpc over http2 + +Used by chttp2/{client,server}/{insecure,secure} plugins to implement most of +their functionality diff --git a/src/core/lib/transport/chttp2/alpn.c b/src/core/ext/transport/chttp2/transport/alpn.c index befe319180..c901905d02 100644 --- a/src/core/lib/transport/chttp2/alpn.c +++ b/src/core/ext/transport/chttp2/transport/alpn.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/transport/chttp2/alpn.h" +#include "src/core/ext/transport/chttp2/transport/alpn.h" #include <grpc/support/log.h> #include <grpc/support/useful.h> diff --git a/src/core/lib/transport/chttp2/alpn.h b/src/core/ext/transport/chttp2/transport/alpn.h index a9184e63a4..a9184e63a4 100644 --- a/src/core/lib/transport/chttp2/alpn.h +++ b/src/core/ext/transport/chttp2/transport/alpn.h diff --git a/src/core/lib/transport/chttp2/bin_encoder.c b/src/core/ext/transport/chttp2/transport/bin_encoder.c index 79d0aa3d6f..d39f99c271 100644 --- a/src/core/lib/transport/chttp2/bin_encoder.c +++ b/src/core/ext/transport/chttp2/transport/bin_encoder.c @@ -31,12 +31,12 @@ * */ -#include "src/core/lib/transport/chttp2/bin_encoder.h" +#include "src/core/ext/transport/chttp2/transport/bin_encoder.h" #include <string.h> #include <grpc/support/log.h> -#include "src/core/lib/transport/chttp2/huffsyms.h" +#include "src/core/ext/transport/chttp2/transport/huffsyms.h" static const char alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; diff --git a/src/core/lib/transport/chttp2/bin_encoder.h b/src/core/ext/transport/chttp2/transport/bin_encoder.h index 1c5cd1e1c6..1c5cd1e1c6 100644 --- a/src/core/lib/transport/chttp2/bin_encoder.h +++ b/src/core/ext/transport/chttp2/transport/bin_encoder.h diff --git a/src/core/lib/transport/chttp2_transport.c b/src/core/ext/transport/chttp2/transport/chttp2_transport.c index 7fed3d8b47..86c0cd7960 100644 --- a/src/core/lib/transport/chttp2_transport.c +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/transport/chttp2_transport.h" +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include <math.h> #include <stdio.h> @@ -45,10 +45,10 @@ #include "src/core/lib/profiling/timers.h" #include "src/core/lib/support/string.h" -#include "src/core/lib/transport/chttp2/http2_errors.h" -#include "src/core/lib/transport/chttp2/internal.h" -#include "src/core/lib/transport/chttp2/status_conversion.h" -#include "src/core/lib/transport/chttp2/timeout_encoding.h" +#include "src/core/ext/transport/chttp2/transport/http2_errors.h" +#include "src/core/ext/transport/chttp2/transport/internal.h" +#include "src/core/ext/transport/chttp2/transport/status_conversion.h" +#include "src/core/ext/transport/chttp2/transport/timeout_encoding.h" #include "src/core/lib/transport/static_metadata.h" #include "src/core/lib/transport/transport_impl.h" diff --git a/src/core/lib/transport/chttp2_transport.h b/src/core/ext/transport/chttp2/transport/chttp2_transport.h index 5008cab7f8..5008cab7f8 100644 --- a/src/core/lib/transport/chttp2_transport.h +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.h diff --git a/src/core/lib/transport/chttp2/frame.h b/src/core/ext/transport/chttp2/transport/frame.h index 4674bc9703..4674bc9703 100644 --- a/src/core/lib/transport/chttp2/frame.h +++ b/src/core/ext/transport/chttp2/transport/frame.h diff --git a/src/core/lib/transport/chttp2/frame_data.c b/src/core/ext/transport/chttp2/transport/frame_data.c index cf25c3ccc1..39acf468b4 100644 --- a/src/core/lib/transport/chttp2/frame_data.c +++ b/src/core/ext/transport/chttp2/transport/frame_data.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/transport/chttp2/frame_data.h" +#include "src/core/ext/transport/chttp2/transport/frame_data.h" #include <string.h> @@ -39,7 +39,7 @@ #include <grpc/support/log.h> #include <grpc/support/useful.h> #include "src/core/lib/support/string.h" -#include "src/core/lib/transport/chttp2/internal.h" +#include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/transport/transport.h" grpc_chttp2_parse_error grpc_chttp2_data_parser_init( diff --git a/src/core/lib/transport/chttp2/frame_data.h b/src/core/ext/transport/chttp2/transport/frame_data.h index da404a42c6..3b76627c63 100644 --- a/src/core/lib/transport/chttp2/frame_data.h +++ b/src/core/ext/transport/chttp2/transport/frame_data.h @@ -40,7 +40,7 @@ #include <grpc/support/slice_buffer.h> #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/byte_stream.h" -#include "src/core/lib/transport/chttp2/frame.h" +#include "src/core/ext/transport/chttp2/transport/frame.h" typedef enum { GRPC_CHTTP2_DATA_FH_0, diff --git a/src/core/lib/transport/chttp2/frame_goaway.c b/src/core/ext/transport/chttp2/transport/frame_goaway.c index bb8c28df90..3697fdef41 100644 --- a/src/core/lib/transport/chttp2/frame_goaway.c +++ b/src/core/ext/transport/chttp2/transport/frame_goaway.c @@ -31,8 +31,8 @@ * */ -#include "src/core/lib/transport/chttp2/frame_goaway.h" -#include "src/core/lib/transport/chttp2/internal.h" +#include "src/core/ext/transport/chttp2/transport/frame_goaway.h" +#include "src/core/ext/transport/chttp2/transport/internal.h" #include <string.h> diff --git a/src/core/lib/transport/chttp2/frame_goaway.h b/src/core/ext/transport/chttp2/transport/frame_goaway.h index f64c44f3d9..426bee7bb7 100644 --- a/src/core/lib/transport/chttp2/frame_goaway.h +++ b/src/core/ext/transport/chttp2/transport/frame_goaway.h @@ -38,7 +38,7 @@ #include <grpc/support/slice.h> #include <grpc/support/slice_buffer.h> #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/transport/chttp2/frame.h" +#include "src/core/ext/transport/chttp2/transport/frame.h" typedef enum { GRPC_CHTTP2_GOAWAY_LSI0, diff --git a/src/core/lib/transport/chttp2/frame_ping.c b/src/core/ext/transport/chttp2/transport/frame_ping.c index 14ca394264..c0192a734d 100644 --- a/src/core/lib/transport/chttp2/frame_ping.c +++ b/src/core/ext/transport/chttp2/transport/frame_ping.c @@ -31,8 +31,8 @@ * */ -#include "src/core/lib/transport/chttp2/frame_ping.h" -#include "src/core/lib/transport/chttp2/internal.h" +#include "src/core/ext/transport/chttp2/transport/frame_ping.h" +#include "src/core/ext/transport/chttp2/transport/internal.h" #include <string.h> diff --git a/src/core/lib/transport/chttp2/frame_ping.h b/src/core/ext/transport/chttp2/transport/frame_ping.h index 7640fc4773..3727e007b3 100644 --- a/src/core/lib/transport/chttp2/frame_ping.h +++ b/src/core/ext/transport/chttp2/transport/frame_ping.h @@ -36,7 +36,7 @@ #include <grpc/support/slice.h> #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/transport/chttp2/frame.h" +#include "src/core/ext/transport/chttp2/transport/frame.h" typedef struct { uint8_t byte; diff --git a/src/core/lib/transport/chttp2/frame_rst_stream.c b/src/core/ext/transport/chttp2/transport/frame_rst_stream.c index 060912afc4..acfc3627e8 100644 --- a/src/core/lib/transport/chttp2/frame_rst_stream.c +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.c @@ -31,12 +31,12 @@ * */ -#include "src/core/lib/transport/chttp2/frame_rst_stream.h" -#include "src/core/lib/transport/chttp2/internal.h" +#include "src/core/ext/transport/chttp2/transport/frame_rst_stream.h" +#include "src/core/ext/transport/chttp2/transport/internal.h" #include <grpc/support/log.h> -#include "src/core/lib/transport/chttp2/frame.h" +#include "src/core/ext/transport/chttp2/transport/frame.h" gpr_slice grpc_chttp2_rst_stream_create(uint32_t id, uint32_t code) { gpr_slice slice = gpr_slice_malloc(13); diff --git a/src/core/lib/transport/chttp2/frame_rst_stream.h b/src/core/ext/transport/chttp2/transport/frame_rst_stream.h index 93155fde9d..ebc6d9294b 100644 --- a/src/core/lib/transport/chttp2/frame_rst_stream.h +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.h @@ -36,7 +36,7 @@ #include <grpc/support/slice.h> #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/transport/chttp2/frame.h" +#include "src/core/ext/transport/chttp2/transport/frame.h" typedef struct { uint8_t byte; diff --git a/src/core/lib/transport/chttp2/frame_settings.c b/src/core/ext/transport/chttp2/transport/frame_settings.c index 48429c2a78..62d3b91d90 100644 --- a/src/core/lib/transport/chttp2/frame_settings.c +++ b/src/core/ext/transport/chttp2/transport/frame_settings.c @@ -31,8 +31,8 @@ * */ -#include "src/core/lib/transport/chttp2/frame_settings.h" -#include "src/core/lib/transport/chttp2/internal.h" +#include "src/core/ext/transport/chttp2/transport/frame_settings.h" +#include "src/core/ext/transport/chttp2/transport/internal.h" #include <string.h> @@ -40,9 +40,9 @@ #include <grpc/support/useful.h> #include "src/core/lib/debug/trace.h" -#include "src/core/lib/transport/chttp2/frame.h" -#include "src/core/lib/transport/chttp2/http2_errors.h" -#include "src/core/lib/transport/chttp2_transport.h" +#include "src/core/ext/transport/chttp2/transport/frame.h" +#include "src/core/ext/transport/chttp2/transport/http2_errors.h" +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #define MAX_MAX_HEADER_LIST_SIZE (1024 * 1024 * 1024) diff --git a/src/core/lib/transport/chttp2/frame_settings.h b/src/core/ext/transport/chttp2/transport/frame_settings.h index 8b294de021..eb49327397 100644 --- a/src/core/lib/transport/chttp2/frame_settings.h +++ b/src/core/ext/transport/chttp2/transport/frame_settings.h @@ -37,7 +37,7 @@ #include <grpc/support/port_platform.h> #include <grpc/support/slice.h> #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/transport/chttp2/frame.h" +#include "src/core/ext/transport/chttp2/transport/frame.h" typedef enum { GRPC_CHTTP2_SPS_ID0, diff --git a/src/core/lib/transport/chttp2/frame_window_update.c b/src/core/ext/transport/chttp2/transport/frame_window_update.c index 2ab5003316..1a561cebaf 100644 --- a/src/core/lib/transport/chttp2/frame_window_update.c +++ b/src/core/ext/transport/chttp2/transport/frame_window_update.c @@ -31,8 +31,8 @@ * */ -#include "src/core/lib/transport/chttp2/frame_window_update.h" -#include "src/core/lib/transport/chttp2/internal.h" +#include "src/core/ext/transport/chttp2/transport/frame_window_update.h" +#include "src/core/ext/transport/chttp2/transport/internal.h" #include <grpc/support/log.h> diff --git a/src/core/lib/transport/chttp2/frame_window_update.h b/src/core/ext/transport/chttp2/transport/frame_window_update.h index 4b1aea294d..0893594449 100644 --- a/src/core/lib/transport/chttp2/frame_window_update.h +++ b/src/core/ext/transport/chttp2/transport/frame_window_update.h @@ -36,7 +36,7 @@ #include <grpc/support/slice.h> #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/transport/chttp2/frame.h" +#include "src/core/ext/transport/chttp2/transport/frame.h" typedef struct { uint8_t byte; diff --git a/src/core/lib/transport/chttp2/hpack_encoder.c b/src/core/ext/transport/chttp2/transport/hpack_encoder.c index 6b45929b04..819addd9e3 100644 --- a/src/core/lib/transport/chttp2/hpack_encoder.c +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/transport/chttp2/hpack_encoder.h" +#include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include <assert.h> #include <string.h> @@ -45,10 +45,10 @@ #include <grpc/support/log.h> #include <grpc/support/useful.h> -#include "src/core/lib/transport/chttp2/bin_encoder.h" -#include "src/core/lib/transport/chttp2/hpack_table.h" -#include "src/core/lib/transport/chttp2/timeout_encoding.h" -#include "src/core/lib/transport/chttp2/varint.h" +#include "src/core/ext/transport/chttp2/transport/bin_encoder.h" +#include "src/core/ext/transport/chttp2/transport/hpack_table.h" +#include "src/core/ext/transport/chttp2/transport/timeout_encoding.h" +#include "src/core/ext/transport/chttp2/transport/varint.h" #include "src/core/lib/transport/static_metadata.h" #define HASH_FRAGMENT_1(x) ((x)&255) diff --git a/src/core/lib/transport/chttp2/hpack_encoder.h b/src/core/ext/transport/chttp2/transport/hpack_encoder.h index de46a8f146..b17d9c2152 100644 --- a/src/core/lib/transport/chttp2/hpack_encoder.h +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.h @@ -37,7 +37,7 @@ #include <grpc/support/port_platform.h> #include <grpc/support/slice.h> #include <grpc/support/slice_buffer.h> -#include "src/core/lib/transport/chttp2/frame.h" +#include "src/core/ext/transport/chttp2/transport/frame.h" #include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/metadata_batch.h" diff --git a/src/core/lib/transport/chttp2/hpack_parser.c b/src/core/ext/transport/chttp2/transport/hpack_parser.c index d41ebab147..4ac6ddb02a 100644 --- a/src/core/lib/transport/chttp2/hpack_parser.c +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.c @@ -31,8 +31,8 @@ * */ -#include "src/core/lib/transport/chttp2/hpack_parser.h" -#include "src/core/lib/transport/chttp2/internal.h" +#include "src/core/ext/transport/chttp2/transport/hpack_parser.h" +#include "src/core/ext/transport/chttp2/transport/internal.h" #include <assert.h> #include <stddef.h> @@ -50,7 +50,7 @@ #include "src/core/lib/profiling/timers.h" #include "src/core/lib/support/string.h" -#include "src/core/lib/transport/chttp2/bin_encoder.h" +#include "src/core/ext/transport/chttp2/transport/bin_encoder.h" typedef enum { NOT_BINARY, diff --git a/src/core/lib/transport/chttp2/hpack_parser.h b/src/core/ext/transport/chttp2/transport/hpack_parser.h index a534fd5cf4..68dcd579ca 100644 --- a/src/core/lib/transport/chttp2/hpack_parser.h +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.h @@ -38,8 +38,8 @@ #include <grpc/support/port_platform.h> #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/transport/chttp2/frame.h" -#include "src/core/lib/transport/chttp2/hpack_table.h" +#include "src/core/ext/transport/chttp2/transport/frame.h" +#include "src/core/ext/transport/chttp2/transport/hpack_table.h" #include "src/core/lib/transport/metadata.h" typedef struct grpc_chttp2_hpack_parser grpc_chttp2_hpack_parser; diff --git a/src/core/lib/transport/chttp2/hpack_table.c b/src/core/ext/transport/chttp2/transport/hpack_table.c index f92bc26585..d02f4ddc61 100644 --- a/src/core/lib/transport/chttp2/hpack_table.c +++ b/src/core/ext/transport/chttp2/transport/hpack_table.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/transport/chttp2/hpack_table.h" +#include "src/core/ext/transport/chttp2/transport/hpack_table.h" #include <assert.h> #include <string.h> diff --git a/src/core/lib/transport/chttp2/hpack_table.h b/src/core/ext/transport/chttp2/transport/hpack_table.h index 2cbc02dd9c..2cbc02dd9c 100644 --- a/src/core/lib/transport/chttp2/hpack_table.h +++ b/src/core/ext/transport/chttp2/transport/hpack_table.h diff --git a/src/core/lib/transport/chttp2/hpack_tables.txt b/src/core/ext/transport/chttp2/transport/hpack_tables.txt index 08842a0267..08842a0267 100644 --- a/src/core/lib/transport/chttp2/hpack_tables.txt +++ b/src/core/ext/transport/chttp2/transport/hpack_tables.txt diff --git a/src/core/lib/transport/chttp2/http2_errors.h b/src/core/ext/transport/chttp2/transport/http2_errors.h index 0238f9d80b..0238f9d80b 100644 --- a/src/core/lib/transport/chttp2/http2_errors.h +++ b/src/core/ext/transport/chttp2/transport/http2_errors.h diff --git a/src/core/lib/transport/chttp2/huffsyms.c b/src/core/ext/transport/chttp2/transport/huffsyms.c index 27497e6ae0..91f62bf34b 100644 --- a/src/core/lib/transport/chttp2/huffsyms.c +++ b/src/core/ext/transport/chttp2/transport/huffsyms.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/transport/chttp2/huffsyms.h" +#include "src/core/ext/transport/chttp2/transport/huffsyms.h" /* Constants pulled from the HPACK spec, and converted to C using the vim command: diff --git a/src/core/lib/transport/chttp2/huffsyms.h b/src/core/ext/transport/chttp2/transport/huffsyms.h index 1ca77b9207..1ca77b9207 100644 --- a/src/core/lib/transport/chttp2/huffsyms.h +++ b/src/core/ext/transport/chttp2/transport/huffsyms.h diff --git a/src/core/lib/transport/chttp2/incoming_metadata.c b/src/core/ext/transport/chttp2/transport/incoming_metadata.c index a1a8d37562..ef5fd4fe03 100644 --- a/src/core/lib/transport/chttp2/incoming_metadata.c +++ b/src/core/ext/transport/chttp2/transport/incoming_metadata.c @@ -31,11 +31,11 @@ * */ -#include "src/core/lib/transport/chttp2/incoming_metadata.h" +#include "src/core/ext/transport/chttp2/transport/incoming_metadata.h" #include <string.h> -#include "src/core/lib/transport/chttp2/internal.h" +#include "src/core/ext/transport/chttp2/transport/internal.h" #include <grpc/support/alloc.h> #include <grpc/support/log.h> diff --git a/src/core/lib/transport/chttp2/incoming_metadata.h b/src/core/ext/transport/chttp2/transport/incoming_metadata.h index edfa0adf9d..edfa0adf9d 100644 --- a/src/core/lib/transport/chttp2/incoming_metadata.h +++ b/src/core/ext/transport/chttp2/transport/incoming_metadata.h diff --git a/src/core/lib/transport/chttp2/internal.h b/src/core/ext/transport/chttp2/transport/internal.h index 346e404204..8fcbccb370 100644 --- a/src/core/lib/transport/chttp2/internal.h +++ b/src/core/ext/transport/chttp2/transport/internal.h @@ -38,17 +38,17 @@ #include <stdbool.h> #include "src/core/lib/iomgr/endpoint.h" -#include "src/core/lib/transport/chttp2/frame.h" -#include "src/core/lib/transport/chttp2/frame_data.h" -#include "src/core/lib/transport/chttp2/frame_goaway.h" -#include "src/core/lib/transport/chttp2/frame_ping.h" -#include "src/core/lib/transport/chttp2/frame_rst_stream.h" -#include "src/core/lib/transport/chttp2/frame_settings.h" -#include "src/core/lib/transport/chttp2/frame_window_update.h" -#include "src/core/lib/transport/chttp2/hpack_encoder.h" -#include "src/core/lib/transport/chttp2/hpack_parser.h" -#include "src/core/lib/transport/chttp2/incoming_metadata.h" -#include "src/core/lib/transport/chttp2/stream_map.h" +#include "src/core/ext/transport/chttp2/transport/frame.h" +#include "src/core/ext/transport/chttp2/transport/frame_data.h" +#include "src/core/ext/transport/chttp2/transport/frame_goaway.h" +#include "src/core/ext/transport/chttp2/transport/frame_ping.h" +#include "src/core/ext/transport/chttp2/transport/frame_rst_stream.h" +#include "src/core/ext/transport/chttp2/transport/frame_settings.h" +#include "src/core/ext/transport/chttp2/transport/frame_window_update.h" +#include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" +#include "src/core/ext/transport/chttp2/transport/hpack_parser.h" +#include "src/core/ext/transport/chttp2/transport/incoming_metadata.h" +#include "src/core/ext/transport/chttp2/transport/stream_map.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/transport_impl.h" diff --git a/src/core/lib/transport/chttp2/parsing.c b/src/core/ext/transport/chttp2/transport/parsing.c index 9ee52f63f2..1ca49a899f 100644 --- a/src/core/lib/transport/chttp2/parsing.c +++ b/src/core/ext/transport/chttp2/transport/parsing.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/transport/chttp2/internal.h" +#include "src/core/ext/transport/chttp2/transport/internal.h" #include <string.h> @@ -40,9 +40,9 @@ #include <grpc/support/string_util.h> #include "src/core/lib/profiling/timers.h" -#include "src/core/lib/transport/chttp2/http2_errors.h" -#include "src/core/lib/transport/chttp2/status_conversion.h" -#include "src/core/lib/transport/chttp2/timeout_encoding.h" +#include "src/core/ext/transport/chttp2/transport/http2_errors.h" +#include "src/core/ext/transport/chttp2/transport/status_conversion.h" +#include "src/core/ext/transport/chttp2/transport/timeout_encoding.h" #include "src/core/lib/transport/static_metadata.h" static int init_frame_parser(grpc_exec_ctx *exec_ctx, diff --git a/src/core/lib/transport/chttp2/status_conversion.c b/src/core/ext/transport/chttp2/transport/status_conversion.c index 73dd63e720..5a79579989 100644 --- a/src/core/lib/transport/chttp2/status_conversion.c +++ b/src/core/ext/transport/chttp2/transport/status_conversion.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/transport/chttp2/status_conversion.h" +#include "src/core/ext/transport/chttp2/transport/status_conversion.h" int grpc_chttp2_grpc_status_to_http2_error(grpc_status_code status) { switch (status) { diff --git a/src/core/lib/transport/chttp2/status_conversion.h b/src/core/ext/transport/chttp2/transport/status_conversion.h index 241417d32e..388e42086c 100644 --- a/src/core/lib/transport/chttp2/status_conversion.h +++ b/src/core/ext/transport/chttp2/transport/status_conversion.h @@ -35,7 +35,7 @@ #define GRPC_CORE_LIB_TRANSPORT_CHTTP2_STATUS_CONVERSION_H #include <grpc/grpc.h> -#include "src/core/lib/transport/chttp2/http2_errors.h" +#include "src/core/ext/transport/chttp2/transport/http2_errors.h" /* Conversion of grpc status codes to http2 error codes (for RST_STREAM) */ grpc_chttp2_error_code grpc_chttp2_grpc_status_to_http2_error( diff --git a/src/core/lib/transport/chttp2/stream_lists.c b/src/core/ext/transport/chttp2/transport/stream_lists.c index b51a041dc7..01ed49b1ec 100644 --- a/src/core/lib/transport/chttp2/stream_lists.c +++ b/src/core/ext/transport/chttp2/transport/stream_lists.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/transport/chttp2/internal.h" +#include "src/core/ext/transport/chttp2/transport/internal.h" #include <grpc/support/log.h> diff --git a/src/core/lib/transport/chttp2/stream_map.c b/src/core/ext/transport/chttp2/transport/stream_map.c index dbbbe783bf..3fb1389650 100644 --- a/src/core/lib/transport/chttp2/stream_map.c +++ b/src/core/ext/transport/chttp2/transport/stream_map.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/transport/chttp2/stream_map.h" +#include "src/core/ext/transport/chttp2/transport/stream_map.h" #include <string.h> diff --git a/src/core/lib/transport/chttp2/stream_map.h b/src/core/ext/transport/chttp2/transport/stream_map.h index 1c56b18e54..1c56b18e54 100644 --- a/src/core/lib/transport/chttp2/stream_map.h +++ b/src/core/ext/transport/chttp2/transport/stream_map.h diff --git a/src/core/lib/transport/chttp2/timeout_encoding.c b/src/core/ext/transport/chttp2/transport/timeout_encoding.c index 0edacaafd3..d5b9da9252 100644 --- a/src/core/lib/transport/chttp2/timeout_encoding.c +++ b/src/core/ext/transport/chttp2/transport/timeout_encoding.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/transport/chttp2/timeout_encoding.h" +#include "src/core/ext/transport/chttp2/transport/timeout_encoding.h" #include <stdio.h> #include <string.h> diff --git a/src/core/lib/transport/chttp2/timeout_encoding.h b/src/core/ext/transport/chttp2/transport/timeout_encoding.h index 731beb5a37..731beb5a37 100644 --- a/src/core/lib/transport/chttp2/timeout_encoding.h +++ b/src/core/ext/transport/chttp2/transport/timeout_encoding.h diff --git a/src/core/lib/transport/chttp2/varint.c b/src/core/ext/transport/chttp2/transport/varint.c index 6dfef45362..6721d042a2 100644 --- a/src/core/lib/transport/chttp2/varint.c +++ b/src/core/ext/transport/chttp2/transport/varint.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/transport/chttp2/varint.h" +#include "src/core/ext/transport/chttp2/transport/varint.h" uint32_t grpc_chttp2_hpack_varint_length(uint32_t tail_value) { if (tail_value < (1 << 7)) { diff --git a/src/core/lib/transport/chttp2/varint.h b/src/core/ext/transport/chttp2/transport/varint.h index e4a0ae3c22..e4a0ae3c22 100644 --- a/src/core/lib/transport/chttp2/varint.h +++ b/src/core/ext/transport/chttp2/transport/varint.h diff --git a/src/core/lib/transport/chttp2/writing.c b/src/core/ext/transport/chttp2/transport/writing.c index daea331d31..d4a4ccee59 100644 --- a/src/core/lib/transport/chttp2/writing.c +++ b/src/core/ext/transport/chttp2/transport/writing.c @@ -31,14 +31,14 @@ * */ -#include "src/core/lib/transport/chttp2/internal.h" +#include "src/core/ext/transport/chttp2/transport/internal.h" #include <limits.h> #include <grpc/support/log.h> #include "src/core/lib/profiling/timers.h" -#include "src/core/lib/transport/chttp2/http2_errors.h" +#include "src/core/ext/transport/chttp2/transport/http2_errors.h" static void finalize_outbuf(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport_writing *transport_writing); diff --git a/src/core/lib/security/security_connector.c b/src/core/lib/security/security_connector.c index 5474bc3a9e..6749b5a559 100644 --- a/src/core/lib/security/security_connector.c +++ b/src/core/lib/security/security_connector.c @@ -49,7 +49,7 @@ #include "src/core/lib/support/env.h" #include "src/core/lib/support/load_file.h" #include "src/core/lib/support/string.h" -#include "src/core/lib/transport/chttp2/alpn.h" +#include "src/core/ext/transport/chttp2/transport/alpn.h" #include "src/core/lib/tsi/fake_transport_security.h" #include "src/core/lib/tsi/ssl_transport_security.h" diff --git a/src/core/lib/surface/init.c b/src/core/lib/surface/init.c index dcb9c62d36..cdba72a14e 100644 --- a/src/core/lib/surface/init.c +++ b/src/core/lib/surface/init.c @@ -67,7 +67,7 @@ #include "src/core/lib/surface/lame_client.h" #include "src/core/lib/surface/server.h" #include "src/core/lib/surface/surface_trace.h" -#include "src/core/lib/transport/chttp2_transport.h" +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/transport_impl.h" diff --git a/src/core/lib/transport/metadata.c b/src/core/lib/transport/metadata.c index 7605f09991..abb7a0ae3c 100644 --- a/src/core/lib/transport/metadata.c +++ b/src/core/lib/transport/metadata.c @@ -48,7 +48,7 @@ #include "src/core/lib/profiling/timers.h" #include "src/core/lib/support/murmur_hash.h" #include "src/core/lib/support/string.h" -#include "src/core/lib/transport/chttp2/bin_encoder.h" +#include "src/core/ext/transport/chttp2/transport/bin_encoder.h" #include "src/core/lib/transport/static_metadata.h" /* There are two kinds of mdelem and mdstr instances. diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index a5bc18af5e..c6745ef36d 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -74,6 +74,29 @@ CORE_SOURCE_FILES = [ 'src/core/lib/support/tmpfile_posix.c', 'src/core/lib/support/tmpfile_win32.c', 'src/core/lib/support/wrap_memcpy.c', + 'src/core/ext/transport/chttp2/client/insecure/channel_create.c', + 'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c', + 'src/core/ext/transport/chttp2/transport/alpn.c', + 'src/core/ext/transport/chttp2/transport/bin_encoder.c', + 'src/core/ext/transport/chttp2/transport/chttp2_transport.c', + 'src/core/ext/transport/chttp2/transport/frame_data.c', + 'src/core/ext/transport/chttp2/transport/frame_goaway.c', + 'src/core/ext/transport/chttp2/transport/frame_ping.c', + 'src/core/ext/transport/chttp2/transport/frame_rst_stream.c', + 'src/core/ext/transport/chttp2/transport/frame_settings.c', + 'src/core/ext/transport/chttp2/transport/frame_window_update.c', + 'src/core/ext/transport/chttp2/transport/hpack_encoder.c', + 'src/core/ext/transport/chttp2/transport/hpack_parser.c', + 'src/core/ext/transport/chttp2/transport/hpack_table.c', + 'src/core/ext/transport/chttp2/transport/huffsyms.c', + 'src/core/ext/transport/chttp2/transport/incoming_metadata.c', + 'src/core/ext/transport/chttp2/transport/parsing.c', + 'src/core/ext/transport/chttp2/transport/status_conversion.c', + 'src/core/ext/transport/chttp2/transport/stream_lists.c', + 'src/core/ext/transport/chttp2/transport/stream_map.c', + 'src/core/ext/transport/chttp2/transport/timeout_encoding.c', + 'src/core/ext/transport/chttp2/transport/varint.c', + 'src/core/ext/transport/chttp2/transport/writing.c', 'src/core/lib/census/grpc_context.c', 'src/core/lib/census/grpc_filter.c', 'src/core/lib/census/grpc_plugin.c', @@ -167,7 +190,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/surface/call_log_batch.c', 'src/core/lib/surface/channel.c', 'src/core/lib/surface/channel_connectivity.c', - 'src/core/lib/surface/channel_create.c', 'src/core/lib/surface/channel_init.c', 'src/core/lib/surface/channel_ping.c', 'src/core/lib/surface/channel_stack_type.c', @@ -177,37 +199,17 @@ CORE_SOURCE_FILES = [ 'src/core/lib/surface/lame_client.c', 'src/core/lib/surface/metadata_array.c', 'src/core/lib/surface/server.c', - 'src/core/lib/surface/server_chttp2.c', 'src/core/lib/surface/validate_metadata.c', 'src/core/lib/surface/version.c', 'src/core/lib/transport/byte_stream.c', - 'src/core/lib/transport/chttp2/alpn.c', - 'src/core/lib/transport/chttp2/bin_encoder.c', - 'src/core/lib/transport/chttp2/frame_data.c', - 'src/core/lib/transport/chttp2/frame_goaway.c', - 'src/core/lib/transport/chttp2/frame_ping.c', - 'src/core/lib/transport/chttp2/frame_rst_stream.c', - 'src/core/lib/transport/chttp2/frame_settings.c', - 'src/core/lib/transport/chttp2/frame_window_update.c', - 'src/core/lib/transport/chttp2/hpack_encoder.c', - 'src/core/lib/transport/chttp2/hpack_parser.c', - 'src/core/lib/transport/chttp2/hpack_table.c', - 'src/core/lib/transport/chttp2/huffsyms.c', - 'src/core/lib/transport/chttp2/incoming_metadata.c', - 'src/core/lib/transport/chttp2/parsing.c', - 'src/core/lib/transport/chttp2/status_conversion.c', - 'src/core/lib/transport/chttp2/stream_lists.c', - 'src/core/lib/transport/chttp2/stream_map.c', - 'src/core/lib/transport/chttp2/timeout_encoding.c', - 'src/core/lib/transport/chttp2/varint.c', - 'src/core/lib/transport/chttp2/writing.c', - 'src/core/lib/transport/chttp2_transport.c', 'src/core/lib/transport/connectivity_state.c', 'src/core/lib/transport/metadata.c', 'src/core/lib/transport/metadata_batch.c', 'src/core/lib/transport/static_metadata.c', 'src/core/lib/transport/transport.c', 'src/core/lib/transport/transport_op_string.c', + 'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c', + 'src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c', 'src/core/lib/http/httpcli_security_connector.c', 'src/core/lib/security/b64.c', 'src/core/lib/security/client_auth_filter.c', @@ -223,9 +225,7 @@ CORE_SOURCE_FILES = [ 'src/core/lib/security/security_connector.c', 'src/core/lib/security/security_context.c', 'src/core/lib/security/server_auth_filter.c', - 'src/core/lib/security/server_secure_chttp2.c', 'src/core/lib/surface/init_secure.c', - 'src/core/lib/surface/secure_channel_create.c', 'src/core/lib/tsi/fake_transport_security.c', 'src/core/lib/tsi/ssl_transport_security.c', 'src/core/lib/tsi/transport_security.c', diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c index 2e9623e5ec..087f94deda 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.c @@ -39,7 +39,7 @@ #include "src/core/lib/support/string.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/lib/surface/server.h" -#include "src/core/lib/transport/chttp2_transport.h" +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include <grpc/support/alloc.h> #include <grpc/support/sync.h> diff --git a/test/core/bad_ssl/servers/alpn.c b/test/core/bad_ssl/servers/alpn.c index 98dcd1c0ca..3225fd0315 100644 --- a/test/core/bad_ssl/servers/alpn.c +++ b/test/core/bad_ssl/servers/alpn.c @@ -38,7 +38,7 @@ #include <grpc/support/log.h> #include <grpc/support/useful.h> -#include "src/core/lib/transport/chttp2/alpn.h" +#include "src/core/ext/transport/chttp2/transport/alpn.h" #include "test/core/bad_ssl/server_common.h" #include "test/core/end2end/data/ssl_test_data.h" diff --git a/test/core/end2end/fixtures/h2_census.c b/test/core/end2end/fixtures/h2_census.c index 8d504e4598..e4c3ec5d0f 100644 --- a/test/core/end2end/fixtures/h2_census.c +++ b/test/core/end2end/fixtures/h2_census.c @@ -47,7 +47,7 @@ #include "src/core/lib/channel/http_server_filter.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" -#include "src/core/lib/transport/chttp2_transport.h" +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_compress.c b/test/core/end2end/fixtures/h2_compress.c index a45c27af7a..2996445522 100644 --- a/test/core/end2end/fixtures/h2_compress.c +++ b/test/core/end2end/fixtures/h2_compress.c @@ -47,7 +47,7 @@ #include "src/core/lib/channel/http_server_filter.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" -#include "src/core/lib/transport/chttp2_transport.h" +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_full+pipe.c b/test/core/end2end/fixtures/h2_full+pipe.c index def5efaa42..692ae06b9d 100644 --- a/test/core/end2end/fixtures/h2_full+pipe.c +++ b/test/core/end2end/fixtures/h2_full+pipe.c @@ -47,7 +47,7 @@ #include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" -#include "src/core/lib/transport/chttp2_transport.h" +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_full+poll+pipe.c b/test/core/end2end/fixtures/h2_full+poll+pipe.c index 0584b81448..276a8b2b50 100644 --- a/test/core/end2end/fixtures/h2_full+poll+pipe.c +++ b/test/core/end2end/fixtures/h2_full+poll+pipe.c @@ -49,7 +49,7 @@ #include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" -#include "src/core/lib/transport/chttp2_transport.h" +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_full+poll.c b/test/core/end2end/fixtures/h2_full+poll.c index 8576e3ee90..eb6b808099 100644 --- a/test/core/end2end/fixtures/h2_full+poll.c +++ b/test/core/end2end/fixtures/h2_full+poll.c @@ -48,7 +48,7 @@ #include "src/core/lib/iomgr/pollset_posix.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" -#include "src/core/lib/transport/chttp2_transport.h" +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_full+trace.c b/test/core/end2end/fixtures/h2_full+trace.c index 0d531565f2..2adf3aeac0 100644 --- a/test/core/end2end/fixtures/h2_full+trace.c +++ b/test/core/end2end/fixtures/h2_full+trace.c @@ -47,7 +47,7 @@ #include "src/core/lib/support/env.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" -#include "src/core/lib/transport/chttp2_transport.h" +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_full.c b/test/core/end2end/fixtures/h2_full.c index 4eae620935..aea2dd16b1 100644 --- a/test/core/end2end/fixtures/h2_full.c +++ b/test/core/end2end/fixtures/h2_full.c @@ -46,7 +46,7 @@ #include "src/core/lib/channel/http_server_filter.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" -#include "src/core/lib/transport/chttp2_transport.h" +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_proxy.c b/test/core/end2end/fixtures/h2_proxy.c index 39ecd89293..b91a74ce1b 100644 --- a/test/core/end2end/fixtures/h2_proxy.c +++ b/test/core/end2end/fixtures/h2_proxy.c @@ -46,7 +46,7 @@ #include "src/core/lib/channel/http_server_filter.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" -#include "src/core/lib/transport/chttp2_transport.h" +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "test/core/end2end/fixtures/proxy.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index 374390fb29..7b888c28d5 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -50,7 +50,7 @@ #include "src/core/lib/support/env.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" -#include "src/core/lib/transport/chttp2_transport.h" +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c index c11a528116..c7bbcb3f88 100644 --- a/test/core/end2end/fixtures/h2_sockpair.c +++ b/test/core/end2end/fixtures/h2_sockpair.c @@ -49,7 +49,7 @@ #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" -#include "src/core/lib/transport/chttp2_transport.h" +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c index 6a504c6a9c..2ea75c0940 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -49,7 +49,7 @@ #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" -#include "src/core/lib/transport/chttp2_transport.h" +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_uds+poll.c b/test/core/end2end/fixtures/h2_uds+poll.c index e431ef37ed..dfd20cfb12 100644 --- a/test/core/end2end/fixtures/h2_uds+poll.c +++ b/test/core/end2end/fixtures/h2_uds+poll.c @@ -52,7 +52,7 @@ #include "src/core/lib/support/string.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" -#include "src/core/lib/transport/chttp2_transport.h" +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_uds.c b/test/core/end2end/fixtures/h2_uds.c index 1bdcdef8de..a6681aec5a 100644 --- a/test/core/end2end/fixtures/h2_uds.c +++ b/test/core/end2end/fixtures/h2_uds.c @@ -50,7 +50,7 @@ #include "src/core/lib/support/string.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" -#include "src/core/lib/transport/chttp2_transport.h" +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/transport/chttp2/alpn_test.c b/test/core/transport/chttp2/alpn_test.c index a3c8a9a43c..13509c13f7 100644 --- a/test/core/transport/chttp2/alpn_test.c +++ b/test/core/transport/chttp2/alpn_test.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/transport/chttp2/alpn.h" +#include "src/core/ext/transport/chttp2/transport/alpn.h" #include <grpc/support/log.h> #include "test/core/util/test_config.h" diff --git a/test/core/transport/chttp2/bin_encoder_test.c b/test/core/transport/chttp2/bin_encoder_test.c index fd798d88d5..56b86e037b 100644 --- a/test/core/transport/chttp2/bin_encoder_test.c +++ b/test/core/transport/chttp2/bin_encoder_test.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/transport/chttp2/bin_encoder.h" +#include "src/core/ext/transport/chttp2/transport/bin_encoder.h" #include <string.h> diff --git a/test/core/transport/chttp2/hpack_encoder_test.c b/test/core/transport/chttp2/hpack_encoder_test.c index b23e999c52..fa836505d8 100644 --- a/test/core/transport/chttp2/hpack_encoder_test.c +++ b/test/core/transport/chttp2/hpack_encoder_test.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/transport/chttp2/hpack_encoder.h" +#include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include <stdio.h> @@ -39,7 +39,7 @@ #include <grpc/support/log.h> #include <grpc/support/string_util.h> #include "src/core/lib/support/string.h" -#include "src/core/lib/transport/chttp2/hpack_parser.h" +#include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include "src/core/lib/transport/metadata.h" #include "test/core/util/parse_hexstring.h" #include "test/core/util/slice_splitter.h" diff --git a/test/core/transport/chttp2/hpack_parser_test.c b/test/core/transport/chttp2/hpack_parser_test.c index e716d38cdb..1ec47972fd 100644 --- a/test/core/transport/chttp2/hpack_parser_test.c +++ b/test/core/transport/chttp2/hpack_parser_test.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/transport/chttp2/hpack_parser.h" +#include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include <stdarg.h> diff --git a/test/core/transport/chttp2/hpack_table_test.c b/test/core/transport/chttp2/hpack_table_test.c index fbacdc3ad6..6a2dadf81f 100644 --- a/test/core/transport/chttp2/hpack_table_test.c +++ b/test/core/transport/chttp2/hpack_table_test.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/transport/chttp2/hpack_table.h" +#include "src/core/ext/transport/chttp2/transport/hpack_table.h" #include <stdio.h> #include <string.h> diff --git a/test/core/transport/chttp2/status_conversion_test.c b/test/core/transport/chttp2/status_conversion_test.c index f2770e5702..8f39ff34c2 100644 --- a/test/core/transport/chttp2/status_conversion_test.c +++ b/test/core/transport/chttp2/status_conversion_test.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/transport/chttp2/status_conversion.h" +#include "src/core/ext/transport/chttp2/transport/status_conversion.h" #include <grpc/support/log.h> #include "test/core/util/test_config.h" diff --git a/test/core/transport/chttp2/stream_map_test.c b/test/core/transport/chttp2/stream_map_test.c index baeac175ea..c514814ddc 100644 --- a/test/core/transport/chttp2/stream_map_test.c +++ b/test/core/transport/chttp2/stream_map_test.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/transport/chttp2/stream_map.h" +#include "src/core/ext/transport/chttp2/transport/stream_map.h" #include <grpc/support/log.h> #include "test/core/util/test_config.h" diff --git a/test/core/transport/chttp2/timeout_encoding_test.c b/test/core/transport/chttp2/timeout_encoding_test.c index 9a91a14433..7cc698e4ae 100644 --- a/test/core/transport/chttp2/timeout_encoding_test.c +++ b/test/core/transport/chttp2/timeout_encoding_test.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/transport/chttp2/timeout_encoding.h" +#include "src/core/ext/transport/chttp2/transport/timeout_encoding.h" #include <stdio.h> #include <string.h> diff --git a/test/core/transport/chttp2/varint_test.c b/test/core/transport/chttp2/varint_test.c index 960c9536ef..85c6c84f84 100644 --- a/test/core/transport/chttp2/varint_test.c +++ b/test/core/transport/chttp2/varint_test.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/transport/chttp2/varint.h" +#include "src/core/ext/transport/chttp2/transport/varint.h" #include <grpc/support/log.h> #include <grpc/support/slice.h> diff --git a/test/core/transport/metadata_test.c b/test/core/transport/metadata_test.c index 30e3113913..acd3f3f337 100644 --- a/test/core/transport/metadata_test.c +++ b/test/core/transport/metadata_test.c @@ -41,7 +41,7 @@ #include <grpc/support/string_util.h> #include "src/core/lib/support/string.h" -#include "src/core/lib/transport/chttp2/bin_encoder.h" +#include "src/core/ext/transport/chttp2/transport/bin_encoder.h" #include "test/core/util/test_config.h" #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x) diff --git a/tools/codegen/core/gen_hpack_tables.c b/tools/codegen/core/gen_hpack_tables.c index d809bd36e5..cb2b89ae25 100644 --- a/tools/codegen/core/gen_hpack_tables.c +++ b/tools/codegen/core/gen_hpack_tables.c @@ -39,7 +39,7 @@ #include <string.h> #include <grpc/support/log.h> -#include "src/core/lib/transport/chttp2/huffsyms.h" +#include "src/core/ext/transport/chttp2/transport/huffsyms.h" /* * first byte LUT generation diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 7f91115cec..0b1a257906 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -773,6 +773,27 @@ include/grpc/impl/codegen/grpc_types.h \ include/grpc/impl/codegen/propagation_bits.h \ include/grpc/impl/codegen/status.h \ include/grpc/census.h \ +src/core/ext/transport/chttp2/transport/alpn.h \ +src/core/ext/transport/chttp2/transport/bin_encoder.h \ +src/core/ext/transport/chttp2/transport/chttp2_transport.h \ +src/core/ext/transport/chttp2/transport/frame.h \ +src/core/ext/transport/chttp2/transport/frame_data.h \ +src/core/ext/transport/chttp2/transport/frame_goaway.h \ +src/core/ext/transport/chttp2/transport/frame_ping.h \ +src/core/ext/transport/chttp2/transport/frame_rst_stream.h \ +src/core/ext/transport/chttp2/transport/frame_settings.h \ +src/core/ext/transport/chttp2/transport/frame_window_update.h \ +src/core/ext/transport/chttp2/transport/hpack_encoder.h \ +src/core/ext/transport/chttp2/transport/hpack_parser.h \ +src/core/ext/transport/chttp2/transport/hpack_table.h \ +src/core/ext/transport/chttp2/transport/http2_errors.h \ +src/core/ext/transport/chttp2/transport/huffsyms.h \ +src/core/ext/transport/chttp2/transport/incoming_metadata.h \ +src/core/ext/transport/chttp2/transport/internal.h \ +src/core/ext/transport/chttp2/transport/status_conversion.h \ +src/core/ext/transport/chttp2/transport/stream_map.h \ +src/core/ext/transport/chttp2/transport/timeout_encoding.h \ +src/core/ext/transport/chttp2/transport/varint.h \ src/core/lib/census/grpc_filter.h \ src/core/lib/census/grpc_plugin.h \ src/core/lib/channel/channel_args.h \ @@ -866,27 +887,6 @@ src/core/lib/surface/lame_client.h \ src/core/lib/surface/server.h \ src/core/lib/surface/surface_trace.h \ src/core/lib/transport/byte_stream.h \ -src/core/lib/transport/chttp2/alpn.h \ -src/core/lib/transport/chttp2/bin_encoder.h \ -src/core/lib/transport/chttp2/frame.h \ -src/core/lib/transport/chttp2/frame_data.h \ -src/core/lib/transport/chttp2/frame_goaway.h \ -src/core/lib/transport/chttp2/frame_ping.h \ -src/core/lib/transport/chttp2/frame_rst_stream.h \ -src/core/lib/transport/chttp2/frame_settings.h \ -src/core/lib/transport/chttp2/frame_window_update.h \ -src/core/lib/transport/chttp2/hpack_encoder.h \ -src/core/lib/transport/chttp2/hpack_parser.h \ -src/core/lib/transport/chttp2/hpack_table.h \ -src/core/lib/transport/chttp2/http2_errors.h \ -src/core/lib/transport/chttp2/huffsyms.h \ -src/core/lib/transport/chttp2/incoming_metadata.h \ -src/core/lib/transport/chttp2/internal.h \ -src/core/lib/transport/chttp2/status_conversion.h \ -src/core/lib/transport/chttp2/stream_map.h \ -src/core/lib/transport/chttp2/timeout_encoding.h \ -src/core/lib/transport/chttp2/varint.h \ -src/core/lib/transport/chttp2_transport.h \ src/core/lib/transport/connectivity_state.h \ src/core/lib/transport/metadata.h \ src/core/lib/transport/metadata_batch.h \ @@ -914,6 +914,29 @@ third_party/nanopb/pb.h \ third_party/nanopb/pb_common.h \ third_party/nanopb/pb_decode.h \ third_party/nanopb/pb_encode.h \ +src/core/ext/transport/chttp2/client/insecure/channel_create.c \ +src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \ +src/core/ext/transport/chttp2/transport/alpn.c \ +src/core/ext/transport/chttp2/transport/bin_encoder.c \ +src/core/ext/transport/chttp2/transport/chttp2_transport.c \ +src/core/ext/transport/chttp2/transport/frame_data.c \ +src/core/ext/transport/chttp2/transport/frame_goaway.c \ +src/core/ext/transport/chttp2/transport/frame_ping.c \ +src/core/ext/transport/chttp2/transport/frame_rst_stream.c \ +src/core/ext/transport/chttp2/transport/frame_settings.c \ +src/core/ext/transport/chttp2/transport/frame_window_update.c \ +src/core/ext/transport/chttp2/transport/hpack_encoder.c \ +src/core/ext/transport/chttp2/transport/hpack_parser.c \ +src/core/ext/transport/chttp2/transport/hpack_table.c \ +src/core/ext/transport/chttp2/transport/huffsyms.c \ +src/core/ext/transport/chttp2/transport/incoming_metadata.c \ +src/core/ext/transport/chttp2/transport/parsing.c \ +src/core/ext/transport/chttp2/transport/status_conversion.c \ +src/core/ext/transport/chttp2/transport/stream_lists.c \ +src/core/ext/transport/chttp2/transport/stream_map.c \ +src/core/ext/transport/chttp2/transport/timeout_encoding.c \ +src/core/ext/transport/chttp2/transport/varint.c \ +src/core/ext/transport/chttp2/transport/writing.c \ src/core/lib/census/grpc_context.c \ src/core/lib/census/grpc_filter.c \ src/core/lib/census/grpc_plugin.c \ @@ -1007,7 +1030,6 @@ src/core/lib/surface/call_details.c \ src/core/lib/surface/call_log_batch.c \ src/core/lib/surface/channel.c \ src/core/lib/surface/channel_connectivity.c \ -src/core/lib/surface/channel_create.c \ src/core/lib/surface/channel_init.c \ src/core/lib/surface/channel_ping.c \ src/core/lib/surface/channel_stack_type.c \ @@ -1017,37 +1039,17 @@ src/core/lib/surface/init.c \ src/core/lib/surface/lame_client.c \ src/core/lib/surface/metadata_array.c \ src/core/lib/surface/server.c \ -src/core/lib/surface/server_chttp2.c \ src/core/lib/surface/validate_metadata.c \ src/core/lib/surface/version.c \ src/core/lib/transport/byte_stream.c \ -src/core/lib/transport/chttp2/alpn.c \ -src/core/lib/transport/chttp2/bin_encoder.c \ -src/core/lib/transport/chttp2/frame_data.c \ -src/core/lib/transport/chttp2/frame_goaway.c \ -src/core/lib/transport/chttp2/frame_ping.c \ -src/core/lib/transport/chttp2/frame_rst_stream.c \ -src/core/lib/transport/chttp2/frame_settings.c \ -src/core/lib/transport/chttp2/frame_window_update.c \ -src/core/lib/transport/chttp2/hpack_encoder.c \ -src/core/lib/transport/chttp2/hpack_parser.c \ -src/core/lib/transport/chttp2/hpack_table.c \ -src/core/lib/transport/chttp2/huffsyms.c \ -src/core/lib/transport/chttp2/incoming_metadata.c \ -src/core/lib/transport/chttp2/parsing.c \ -src/core/lib/transport/chttp2/status_conversion.c \ -src/core/lib/transport/chttp2/stream_lists.c \ -src/core/lib/transport/chttp2/stream_map.c \ -src/core/lib/transport/chttp2/timeout_encoding.c \ -src/core/lib/transport/chttp2/varint.c \ -src/core/lib/transport/chttp2/writing.c \ -src/core/lib/transport/chttp2_transport.c \ src/core/lib/transport/connectivity_state.c \ src/core/lib/transport/metadata.c \ src/core/lib/transport/metadata_batch.c \ src/core/lib/transport/static_metadata.c \ src/core/lib/transport/transport.c \ src/core/lib/transport/transport_op_string.c \ +src/core/ext/transport/chttp2/client/secure/secure_channel_create.c \ +src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c \ src/core/lib/http/httpcli_security_connector.c \ src/core/lib/security/b64.c \ src/core/lib/security/client_auth_filter.c \ @@ -1063,9 +1065,7 @@ src/core/lib/security/secure_endpoint.c \ src/core/lib/security/security_connector.c \ src/core/lib/security/security_context.c \ src/core/lib/security/server_auth_filter.c \ -src/core/lib/security/server_secure_chttp2.c \ src/core/lib/surface/init_secure.c \ -src/core/lib/surface/secure_channel_create.c \ src/core/lib/tsi/fake_transport_security.c \ src/core/lib/tsi/ssl_transport_security.c \ src/core/lib/tsi/transport_security.c \ diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 8653cf7017..dcecd63c05 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -3924,6 +3924,27 @@ "include/grpc/impl/codegen/propagation_bits.h", "include/grpc/impl/codegen/status.h", "include/grpc/status.h", + "src/core/ext/transport/chttp2/transport/alpn.h", + "src/core/ext/transport/chttp2/transport/bin_encoder.h", + "src/core/ext/transport/chttp2/transport/chttp2_transport.h", + "src/core/ext/transport/chttp2/transport/frame.h", + "src/core/ext/transport/chttp2/transport/frame_data.h", + "src/core/ext/transport/chttp2/transport/frame_goaway.h", + "src/core/ext/transport/chttp2/transport/frame_ping.h", + "src/core/ext/transport/chttp2/transport/frame_rst_stream.h", + "src/core/ext/transport/chttp2/transport/frame_settings.h", + "src/core/ext/transport/chttp2/transport/frame_window_update.h", + "src/core/ext/transport/chttp2/transport/hpack_encoder.h", + "src/core/ext/transport/chttp2/transport/hpack_parser.h", + "src/core/ext/transport/chttp2/transport/hpack_table.h", + "src/core/ext/transport/chttp2/transport/http2_errors.h", + "src/core/ext/transport/chttp2/transport/huffsyms.h", + "src/core/ext/transport/chttp2/transport/incoming_metadata.h", + "src/core/ext/transport/chttp2/transport/internal.h", + "src/core/ext/transport/chttp2/transport/status_conversion.h", + "src/core/ext/transport/chttp2/transport/stream_map.h", + "src/core/ext/transport/chttp2/transport/timeout_encoding.h", + "src/core/ext/transport/chttp2/transport/varint.h", "src/core/lib/census/aggregation.h", "src/core/lib/census/grpc_filter.h", "src/core/lib/census/grpc_plugin.h", @@ -4029,27 +4050,6 @@ "src/core/lib/surface/server.h", "src/core/lib/surface/surface_trace.h", "src/core/lib/transport/byte_stream.h", - "src/core/lib/transport/chttp2/alpn.h", - "src/core/lib/transport/chttp2/bin_encoder.h", - "src/core/lib/transport/chttp2/frame.h", - "src/core/lib/transport/chttp2/frame_data.h", - "src/core/lib/transport/chttp2/frame_goaway.h", - "src/core/lib/transport/chttp2/frame_ping.h", - "src/core/lib/transport/chttp2/frame_rst_stream.h", - "src/core/lib/transport/chttp2/frame_settings.h", - "src/core/lib/transport/chttp2/frame_window_update.h", - "src/core/lib/transport/chttp2/hpack_encoder.h", - "src/core/lib/transport/chttp2/hpack_parser.h", - "src/core/lib/transport/chttp2/hpack_table.h", - "src/core/lib/transport/chttp2/http2_errors.h", - "src/core/lib/transport/chttp2/huffsyms.h", - "src/core/lib/transport/chttp2/incoming_metadata.h", - "src/core/lib/transport/chttp2/internal.h", - "src/core/lib/transport/chttp2/status_conversion.h", - "src/core/lib/transport/chttp2/stream_map.h", - "src/core/lib/transport/chttp2/timeout_encoding.h", - "src/core/lib/transport/chttp2/varint.h", - "src/core/lib/transport/chttp2_transport.h", "src/core/lib/transport/connectivity_state.h", "src/core/lib/transport/metadata.h", "src/core/lib/transport/metadata_batch.h", @@ -4082,6 +4082,52 @@ "include/grpc/impl/codegen/propagation_bits.h", "include/grpc/impl/codegen/status.h", "include/grpc/status.h", + "src/core/ext/transport/chttp2/client/insecure/channel_create.c", + "src/core/ext/transport/chttp2/client/secure/secure_channel_create.c", + "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c", + "src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c", + "src/core/ext/transport/chttp2/transport/alpn.c", + "src/core/ext/transport/chttp2/transport/alpn.h", + "src/core/ext/transport/chttp2/transport/bin_encoder.c", + "src/core/ext/transport/chttp2/transport/bin_encoder.h", + "src/core/ext/transport/chttp2/transport/chttp2_transport.c", + "src/core/ext/transport/chttp2/transport/chttp2_transport.h", + "src/core/ext/transport/chttp2/transport/frame.h", + "src/core/ext/transport/chttp2/transport/frame_data.c", + "src/core/ext/transport/chttp2/transport/frame_data.h", + "src/core/ext/transport/chttp2/transport/frame_goaway.c", + "src/core/ext/transport/chttp2/transport/frame_goaway.h", + "src/core/ext/transport/chttp2/transport/frame_ping.c", + "src/core/ext/transport/chttp2/transport/frame_ping.h", + "src/core/ext/transport/chttp2/transport/frame_rst_stream.c", + "src/core/ext/transport/chttp2/transport/frame_rst_stream.h", + "src/core/ext/transport/chttp2/transport/frame_settings.c", + "src/core/ext/transport/chttp2/transport/frame_settings.h", + "src/core/ext/transport/chttp2/transport/frame_window_update.c", + "src/core/ext/transport/chttp2/transport/frame_window_update.h", + "src/core/ext/transport/chttp2/transport/hpack_encoder.c", + "src/core/ext/transport/chttp2/transport/hpack_encoder.h", + "src/core/ext/transport/chttp2/transport/hpack_parser.c", + "src/core/ext/transport/chttp2/transport/hpack_parser.h", + "src/core/ext/transport/chttp2/transport/hpack_table.c", + "src/core/ext/transport/chttp2/transport/hpack_table.h", + "src/core/ext/transport/chttp2/transport/http2_errors.h", + "src/core/ext/transport/chttp2/transport/huffsyms.c", + "src/core/ext/transport/chttp2/transport/huffsyms.h", + "src/core/ext/transport/chttp2/transport/incoming_metadata.c", + "src/core/ext/transport/chttp2/transport/incoming_metadata.h", + "src/core/ext/transport/chttp2/transport/internal.h", + "src/core/ext/transport/chttp2/transport/parsing.c", + "src/core/ext/transport/chttp2/transport/status_conversion.c", + "src/core/ext/transport/chttp2/transport/status_conversion.h", + "src/core/ext/transport/chttp2/transport/stream_lists.c", + "src/core/ext/transport/chttp2/transport/stream_map.c", + "src/core/ext/transport/chttp2/transport/stream_map.h", + "src/core/ext/transport/chttp2/transport/timeout_encoding.c", + "src/core/ext/transport/chttp2/transport/timeout_encoding.h", + "src/core/ext/transport/chttp2/transport/varint.c", + "src/core/ext/transport/chttp2/transport/varint.h", + "src/core/ext/transport/chttp2/transport/writing.c", "src/core/lib/census/aggregation.h", "src/core/lib/census/context.c", "src/core/lib/census/grpc_context.c", @@ -4277,7 +4323,6 @@ "src/core/lib/security/security_context.c", "src/core/lib/security/security_context.h", "src/core/lib/security/server_auth_filter.c", - "src/core/lib/security/server_secure_chttp2.c", "src/core/lib/statistics/census_interface.h", "src/core/lib/statistics/census_rpc_stats.h", "src/core/lib/surface/alarm.c", @@ -4293,7 +4338,6 @@ "src/core/lib/surface/channel.c", "src/core/lib/surface/channel.h", "src/core/lib/surface/channel_connectivity.c", - "src/core/lib/surface/channel_create.c", "src/core/lib/surface/channel_init.c", "src/core/lib/surface/channel_init.h", "src/core/lib/surface/channel_ping.c", @@ -4309,57 +4353,13 @@ "src/core/lib/surface/lame_client.c", "src/core/lib/surface/lame_client.h", "src/core/lib/surface/metadata_array.c", - "src/core/lib/surface/secure_channel_create.c", "src/core/lib/surface/server.c", "src/core/lib/surface/server.h", - "src/core/lib/surface/server_chttp2.c", "src/core/lib/surface/surface_trace.h", "src/core/lib/surface/validate_metadata.c", "src/core/lib/surface/version.c", "src/core/lib/transport/byte_stream.c", "src/core/lib/transport/byte_stream.h", - "src/core/lib/transport/chttp2/alpn.c", - "src/core/lib/transport/chttp2/alpn.h", - "src/core/lib/transport/chttp2/bin_encoder.c", - "src/core/lib/transport/chttp2/bin_encoder.h", - "src/core/lib/transport/chttp2/frame.h", - "src/core/lib/transport/chttp2/frame_data.c", - "src/core/lib/transport/chttp2/frame_data.h", - "src/core/lib/transport/chttp2/frame_goaway.c", - "src/core/lib/transport/chttp2/frame_goaway.h", - "src/core/lib/transport/chttp2/frame_ping.c", - "src/core/lib/transport/chttp2/frame_ping.h", - "src/core/lib/transport/chttp2/frame_rst_stream.c", - "src/core/lib/transport/chttp2/frame_rst_stream.h", - "src/core/lib/transport/chttp2/frame_settings.c", - "src/core/lib/transport/chttp2/frame_settings.h", - "src/core/lib/transport/chttp2/frame_window_update.c", - "src/core/lib/transport/chttp2/frame_window_update.h", - "src/core/lib/transport/chttp2/hpack_encoder.c", - "src/core/lib/transport/chttp2/hpack_encoder.h", - "src/core/lib/transport/chttp2/hpack_parser.c", - "src/core/lib/transport/chttp2/hpack_parser.h", - "src/core/lib/transport/chttp2/hpack_table.c", - "src/core/lib/transport/chttp2/hpack_table.h", - "src/core/lib/transport/chttp2/http2_errors.h", - "src/core/lib/transport/chttp2/huffsyms.c", - "src/core/lib/transport/chttp2/huffsyms.h", - "src/core/lib/transport/chttp2/incoming_metadata.c", - "src/core/lib/transport/chttp2/incoming_metadata.h", - "src/core/lib/transport/chttp2/internal.h", - "src/core/lib/transport/chttp2/parsing.c", - "src/core/lib/transport/chttp2/status_conversion.c", - "src/core/lib/transport/chttp2/status_conversion.h", - "src/core/lib/transport/chttp2/stream_lists.c", - "src/core/lib/transport/chttp2/stream_map.c", - "src/core/lib/transport/chttp2/stream_map.h", - "src/core/lib/transport/chttp2/timeout_encoding.c", - "src/core/lib/transport/chttp2/timeout_encoding.h", - "src/core/lib/transport/chttp2/varint.c", - "src/core/lib/transport/chttp2/varint.h", - "src/core/lib/transport/chttp2/writing.c", - "src/core/lib/transport/chttp2_transport.c", - "src/core/lib/transport/chttp2_transport.h", "src/core/lib/transport/connectivity_state.c", "src/core/lib/transport/connectivity_state.h", "src/core/lib/transport/metadata.c", @@ -4552,6 +4552,27 @@ "include/grpc/impl/codegen/propagation_bits.h", "include/grpc/impl/codegen/status.h", "include/grpc/status.h", + "src/core/ext/transport/chttp2/transport/alpn.h", + "src/core/ext/transport/chttp2/transport/bin_encoder.h", + "src/core/ext/transport/chttp2/transport/chttp2_transport.h", + "src/core/ext/transport/chttp2/transport/frame.h", + "src/core/ext/transport/chttp2/transport/frame_data.h", + "src/core/ext/transport/chttp2/transport/frame_goaway.h", + "src/core/ext/transport/chttp2/transport/frame_ping.h", + "src/core/ext/transport/chttp2/transport/frame_rst_stream.h", + "src/core/ext/transport/chttp2/transport/frame_settings.h", + "src/core/ext/transport/chttp2/transport/frame_window_update.h", + "src/core/ext/transport/chttp2/transport/hpack_encoder.h", + "src/core/ext/transport/chttp2/transport/hpack_parser.h", + "src/core/ext/transport/chttp2/transport/hpack_table.h", + "src/core/ext/transport/chttp2/transport/http2_errors.h", + "src/core/ext/transport/chttp2/transport/huffsyms.h", + "src/core/ext/transport/chttp2/transport/incoming_metadata.h", + "src/core/ext/transport/chttp2/transport/internal.h", + "src/core/ext/transport/chttp2/transport/status_conversion.h", + "src/core/ext/transport/chttp2/transport/stream_map.h", + "src/core/ext/transport/chttp2/transport/timeout_encoding.h", + "src/core/ext/transport/chttp2/transport/varint.h", "src/core/lib/census/aggregation.h", "src/core/lib/census/grpc_filter.h", "src/core/lib/census/grpc_plugin.h", @@ -4648,27 +4669,6 @@ "src/core/lib/surface/server.h", "src/core/lib/surface/surface_trace.h", "src/core/lib/transport/byte_stream.h", - "src/core/lib/transport/chttp2/alpn.h", - "src/core/lib/transport/chttp2/bin_encoder.h", - "src/core/lib/transport/chttp2/frame.h", - "src/core/lib/transport/chttp2/frame_data.h", - "src/core/lib/transport/chttp2/frame_goaway.h", - "src/core/lib/transport/chttp2/frame_ping.h", - "src/core/lib/transport/chttp2/frame_rst_stream.h", - "src/core/lib/transport/chttp2/frame_settings.h", - "src/core/lib/transport/chttp2/frame_window_update.h", - "src/core/lib/transport/chttp2/hpack_encoder.h", - "src/core/lib/transport/chttp2/hpack_parser.h", - "src/core/lib/transport/chttp2/hpack_table.h", - "src/core/lib/transport/chttp2/http2_errors.h", - "src/core/lib/transport/chttp2/huffsyms.h", - "src/core/lib/transport/chttp2/incoming_metadata.h", - "src/core/lib/transport/chttp2/internal.h", - "src/core/lib/transport/chttp2/status_conversion.h", - "src/core/lib/transport/chttp2/stream_map.h", - "src/core/lib/transport/chttp2/timeout_encoding.h", - "src/core/lib/transport/chttp2/varint.h", - "src/core/lib/transport/chttp2_transport.h", "src/core/lib/transport/connectivity_state.h", "src/core/lib/transport/metadata.h", "src/core/lib/transport/metadata_batch.h", @@ -4695,6 +4695,50 @@ "include/grpc/impl/codegen/propagation_bits.h", "include/grpc/impl/codegen/status.h", "include/grpc/status.h", + "src/core/ext/transport/chttp2/client/insecure/channel_create.c", + "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c", + "src/core/ext/transport/chttp2/transport/alpn.c", + "src/core/ext/transport/chttp2/transport/alpn.h", + "src/core/ext/transport/chttp2/transport/bin_encoder.c", + "src/core/ext/transport/chttp2/transport/bin_encoder.h", + "src/core/ext/transport/chttp2/transport/chttp2_transport.c", + "src/core/ext/transport/chttp2/transport/chttp2_transport.h", + "src/core/ext/transport/chttp2/transport/frame.h", + "src/core/ext/transport/chttp2/transport/frame_data.c", + "src/core/ext/transport/chttp2/transport/frame_data.h", + "src/core/ext/transport/chttp2/transport/frame_goaway.c", + "src/core/ext/transport/chttp2/transport/frame_goaway.h", + "src/core/ext/transport/chttp2/transport/frame_ping.c", + "src/core/ext/transport/chttp2/transport/frame_ping.h", + "src/core/ext/transport/chttp2/transport/frame_rst_stream.c", + "src/core/ext/transport/chttp2/transport/frame_rst_stream.h", + "src/core/ext/transport/chttp2/transport/frame_settings.c", + "src/core/ext/transport/chttp2/transport/frame_settings.h", + "src/core/ext/transport/chttp2/transport/frame_window_update.c", + "src/core/ext/transport/chttp2/transport/frame_window_update.h", + "src/core/ext/transport/chttp2/transport/hpack_encoder.c", + "src/core/ext/transport/chttp2/transport/hpack_encoder.h", + "src/core/ext/transport/chttp2/transport/hpack_parser.c", + "src/core/ext/transport/chttp2/transport/hpack_parser.h", + "src/core/ext/transport/chttp2/transport/hpack_table.c", + "src/core/ext/transport/chttp2/transport/hpack_table.h", + "src/core/ext/transport/chttp2/transport/http2_errors.h", + "src/core/ext/transport/chttp2/transport/huffsyms.c", + "src/core/ext/transport/chttp2/transport/huffsyms.h", + "src/core/ext/transport/chttp2/transport/incoming_metadata.c", + "src/core/ext/transport/chttp2/transport/incoming_metadata.h", + "src/core/ext/transport/chttp2/transport/internal.h", + "src/core/ext/transport/chttp2/transport/parsing.c", + "src/core/ext/transport/chttp2/transport/status_conversion.c", + "src/core/ext/transport/chttp2/transport/status_conversion.h", + "src/core/ext/transport/chttp2/transport/stream_lists.c", + "src/core/ext/transport/chttp2/transport/stream_map.c", + "src/core/ext/transport/chttp2/transport/stream_map.h", + "src/core/ext/transport/chttp2/transport/timeout_encoding.c", + "src/core/ext/transport/chttp2/transport/timeout_encoding.h", + "src/core/ext/transport/chttp2/transport/varint.c", + "src/core/ext/transport/chttp2/transport/varint.h", + "src/core/ext/transport/chttp2/transport/writing.c", "src/core/lib/census/aggregation.h", "src/core/lib/census/context.c", "src/core/lib/census/grpc_context.c", @@ -4881,7 +4925,6 @@ "src/core/lib/surface/channel.c", "src/core/lib/surface/channel.h", "src/core/lib/surface/channel_connectivity.c", - "src/core/lib/surface/channel_create.c", "src/core/lib/surface/channel_init.c", "src/core/lib/surface/channel_init.h", "src/core/lib/surface/channel_ping.c", @@ -4899,54 +4942,11 @@ "src/core/lib/surface/metadata_array.c", "src/core/lib/surface/server.c", "src/core/lib/surface/server.h", - "src/core/lib/surface/server_chttp2.c", "src/core/lib/surface/surface_trace.h", "src/core/lib/surface/validate_metadata.c", "src/core/lib/surface/version.c", "src/core/lib/transport/byte_stream.c", "src/core/lib/transport/byte_stream.h", - "src/core/lib/transport/chttp2/alpn.c", - "src/core/lib/transport/chttp2/alpn.h", - "src/core/lib/transport/chttp2/bin_encoder.c", - "src/core/lib/transport/chttp2/bin_encoder.h", - "src/core/lib/transport/chttp2/frame.h", - "src/core/lib/transport/chttp2/frame_data.c", - "src/core/lib/transport/chttp2/frame_data.h", - "src/core/lib/transport/chttp2/frame_goaway.c", - "src/core/lib/transport/chttp2/frame_goaway.h", - "src/core/lib/transport/chttp2/frame_ping.c", - "src/core/lib/transport/chttp2/frame_ping.h", - "src/core/lib/transport/chttp2/frame_rst_stream.c", - "src/core/lib/transport/chttp2/frame_rst_stream.h", - "src/core/lib/transport/chttp2/frame_settings.c", - "src/core/lib/transport/chttp2/frame_settings.h", - "src/core/lib/transport/chttp2/frame_window_update.c", - "src/core/lib/transport/chttp2/frame_window_update.h", - "src/core/lib/transport/chttp2/hpack_encoder.c", - "src/core/lib/transport/chttp2/hpack_encoder.h", - "src/core/lib/transport/chttp2/hpack_parser.c", - "src/core/lib/transport/chttp2/hpack_parser.h", - "src/core/lib/transport/chttp2/hpack_table.c", - "src/core/lib/transport/chttp2/hpack_table.h", - "src/core/lib/transport/chttp2/http2_errors.h", - "src/core/lib/transport/chttp2/huffsyms.c", - "src/core/lib/transport/chttp2/huffsyms.h", - "src/core/lib/transport/chttp2/incoming_metadata.c", - "src/core/lib/transport/chttp2/incoming_metadata.h", - "src/core/lib/transport/chttp2/internal.h", - "src/core/lib/transport/chttp2/parsing.c", - "src/core/lib/transport/chttp2/status_conversion.c", - "src/core/lib/transport/chttp2/status_conversion.h", - "src/core/lib/transport/chttp2/stream_lists.c", - "src/core/lib/transport/chttp2/stream_map.c", - "src/core/lib/transport/chttp2/stream_map.h", - "src/core/lib/transport/chttp2/timeout_encoding.c", - "src/core/lib/transport/chttp2/timeout_encoding.h", - "src/core/lib/transport/chttp2/varint.c", - "src/core/lib/transport/chttp2/varint.h", - "src/core/lib/transport/chttp2/writing.c", - "src/core/lib/transport/chttp2_transport.c", - "src/core/lib/transport/chttp2_transport.h", "src/core/lib/transport/connectivity_state.c", "src/core/lib/transport/connectivity_state.h", "src/core/lib/transport/metadata.c", diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj index b09abb28c4..efc5adba06 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj @@ -282,6 +282,27 @@ <ClInclude Include="$(SolutionDir)\..\include\grpc\census.h" /> </ItemGroup> <ItemGroup> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\alpn.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\bin_encoder.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\chttp2_transport.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_data.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_goaway.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_ping.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_rst_stream.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_settings.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_window_update.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_encoder.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_parser.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_table.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\http2_errors.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\huffsyms.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\incoming_metadata.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\internal.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\status_conversion.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\stream_map.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\timeout_encoding.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\varint.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\census\grpc_filter.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\census\grpc_plugin.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.h" /> @@ -375,27 +396,6 @@ <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\server.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\surface_trace.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\byte_stream.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\alpn.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\bin_encoder.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_data.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_goaway.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_ping.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_rst_stream.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_settings.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_window_update.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_encoder.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_parser.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_table.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\http2_errors.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\huffsyms.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\incoming_metadata.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\internal.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\status_conversion.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\stream_map.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\timeout_encoding.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\varint.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2_transport.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\connectivity_state.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\metadata.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\metadata_batch.h" /> @@ -425,6 +425,52 @@ <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb_encode.h" /> </ItemGroup> <ItemGroup> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\insecure\channel_create.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\server\insecure\server_chttp2.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\alpn.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\bin_encoder.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\chttp2_transport.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_data.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_goaway.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_ping.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_rst_stream.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_settings.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_window_update.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_encoder.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_parser.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_table.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\huffsyms.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\incoming_metadata.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\parsing.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\status_conversion.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\stream_lists.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\stream_map.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\timeout_encoding.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\varint.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\writing.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\census\grpc_context.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\census\grpc_filter.c"> @@ -611,8 +657,6 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel_connectivity.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel_create.c"> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel_init.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel_ping.c"> @@ -631,56 +675,12 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\server.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\server_chttp2.c"> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\validate_metadata.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\version.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\byte_stream.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\alpn.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\bin_encoder.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_data.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_goaway.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_ping.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_rst_stream.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_settings.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_window_update.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_encoder.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_parser.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_table.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\huffsyms.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\incoming_metadata.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\parsing.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\status_conversion.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\stream_lists.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\stream_map.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\timeout_encoding.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\varint.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\writing.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2_transport.c"> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\connectivity_state.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\metadata.c"> @@ -693,6 +693,10 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\transport_op_string.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\secure\secure_channel_create.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\server\secure\server_secure_chttp2.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\http\httpcli_security_connector.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\b64.c"> @@ -723,12 +727,8 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\server_auth_filter.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\server_secure_chttp2.c"> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\init_secure.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\secure_channel_create.c"> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\tsi\fake_transport_security.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\tsi\ssl_transport_security.c"> diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters index 81136ebb93..1ebe7bb89c 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters @@ -1,6 +1,75 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\insecure\channel_create.c"> + <Filter>src\core\ext\transport\chttp2\client\insecure</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\server\insecure\server_chttp2.c"> + <Filter>src\core\ext\transport\chttp2\server\insecure</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\alpn.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\bin_encoder.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\chttp2_transport.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_data.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_goaway.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_ping.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_rst_stream.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_settings.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_window_update.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_encoder.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_parser.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_table.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\huffsyms.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\incoming_metadata.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\parsing.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\status_conversion.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\stream_lists.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\stream_map.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\timeout_encoding.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\varint.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\writing.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\census\grpc_context.c"> <Filter>src\core\lib\census</Filter> </ClCompile> @@ -280,9 +349,6 @@ <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel_connectivity.c"> <Filter>src\core\lib\surface</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel_create.c"> - <Filter>src\core\lib\surface</Filter> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel_init.c"> <Filter>src\core\lib\surface</Filter> </ClCompile> @@ -310,9 +376,6 @@ <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\server.c"> <Filter>src\core\lib\surface</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\server_chttp2.c"> - <Filter>src\core\lib\surface</Filter> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\validate_metadata.c"> <Filter>src\core\lib\surface</Filter> </ClCompile> @@ -322,69 +385,6 @@ <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\byte_stream.c"> <Filter>src\core\lib\transport</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\alpn.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\bin_encoder.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_data.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_goaway.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_ping.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_rst_stream.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_settings.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_window_update.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_encoder.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_parser.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_table.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\huffsyms.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\incoming_metadata.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\parsing.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\status_conversion.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\stream_lists.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\stream_map.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\timeout_encoding.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\varint.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\writing.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2_transport.c"> - <Filter>src\core\lib\transport</Filter> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\connectivity_state.c"> <Filter>src\core\lib\transport</Filter> </ClCompile> @@ -403,6 +403,12 @@ <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\transport_op_string.c"> <Filter>src\core\lib\transport</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\secure\secure_channel_create.c"> + <Filter>src\core\ext\transport\chttp2\client\secure</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\server\secure\server_secure_chttp2.c"> + <Filter>src\core\ext\transport\chttp2\server\secure</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\http\httpcli_security_connector.c"> <Filter>src\core\lib\http</Filter> </ClCompile> @@ -448,15 +454,9 @@ <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\server_auth_filter.c"> <Filter>src\core\lib\security</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\server_secure_chttp2.c"> - <Filter>src\core\lib\security</Filter> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\init_secure.c"> <Filter>src\core\lib\surface</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\secure_channel_create.c"> - <Filter>src\core\lib\surface</Filter> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\tsi\fake_transport_security.c"> <Filter>src\core\lib\tsi</Filter> </ClCompile> @@ -536,6 +536,69 @@ </ClInclude> </ItemGroup> <ItemGroup> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\alpn.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\bin_encoder.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\chttp2_transport.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_data.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_goaway.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_ping.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_rst_stream.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_settings.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_window_update.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_encoder.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_parser.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_table.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\http2_errors.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\huffsyms.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\incoming_metadata.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\internal.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\status_conversion.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\stream_map.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\timeout_encoding.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\varint.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\lib\census\grpc_filter.h"> <Filter>src\core\lib\census</Filter> </ClInclude> @@ -815,69 +878,6 @@ <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\byte_stream.h"> <Filter>src\core\lib\transport</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\alpn.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\bin_encoder.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_data.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_goaway.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_ping.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_rst_stream.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_settings.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_window_update.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_encoder.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_parser.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_table.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\http2_errors.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\huffsyms.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\incoming_metadata.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\internal.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\status_conversion.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\stream_map.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\timeout_encoding.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\varint.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2_transport.h"> - <Filter>src\core\lib\transport</Filter> - </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\connectivity_state.h"> <Filter>src\core\lib\transport</Filter> </ClInclude> @@ -980,6 +980,36 @@ <Filter Include="src\core"> <UniqueIdentifier>{ea745680-21ea-9c5e-679b-64dc40562d08}</UniqueIdentifier> </Filter> + <Filter Include="src\core\ext"> + <UniqueIdentifier>{3f32a58f-394f-5f13-06aa-6cc52cc2daaf}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\ext\transport"> + <UniqueIdentifier>{e3abfd0a-064e-0f2f-c8e8-7c5a7e98142a}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\ext\transport\chttp2"> + <UniqueIdentifier>{ac42667b-bbba-3571-20bc-7a4240ef26ca}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\ext\transport\chttp2\client"> + <UniqueIdentifier>{dbffebe0-eebb-577d-1860-ef6837f4cf50}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\ext\transport\chttp2\client\insecure"> + <UniqueIdentifier>{4e699b02-fae4-dabd-afd2-2e41b05bef0e}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\ext\transport\chttp2\client\secure"> + <UniqueIdentifier>{e98ed28e-8dc5-3bb4-22a2-8893831a0ab8}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\ext\transport\chttp2\server"> + <UniqueIdentifier>{1d36fe16-b004-6bee-c661-328234bbb469}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\ext\transport\chttp2\server\insecure"> + <UniqueIdentifier>{e8539863-6029-cca4-44a9-5481cacf8144}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\ext\transport\chttp2\server\secure"> + <UniqueIdentifier>{0afa539f-8c83-d4b9-cdea-550091f09638}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\ext\transport\chttp2\transport"> + <UniqueIdentifier>{6f34254e-e69f-c9b4-156d-5024bade5408}</UniqueIdentifier> + </Filter> <Filter Include="src\core\lib"> <UniqueIdentifier>{5b2ded3f-84a5-f6b4-2060-286c7d1dc945}</UniqueIdentifier> </Filter> @@ -1037,9 +1067,6 @@ <Filter Include="src\core\lib\transport"> <UniqueIdentifier>{e9d0d3fc-c100-f3e6-89b8-649f241155bf}</UniqueIdentifier> </Filter> - <Filter Include="src\core\lib\transport\chttp2"> - <UniqueIdentifier>{a47fedfc-b6c6-d588-14fc-6645d736bcd6}</UniqueIdentifier> - </Filter> <Filter Include="src\core\lib\tsi"> <UniqueIdentifier>{95ad2811-c8d0-7a42-2a73-baf03fcbf699}</UniqueIdentifier> </Filter> diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj index 0512501cfc..db657c1d0e 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj @@ -272,6 +272,27 @@ <ClInclude Include="$(SolutionDir)\..\include\grpc\census.h" /> </ItemGroup> <ItemGroup> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\alpn.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\bin_encoder.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\chttp2_transport.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_data.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_goaway.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_ping.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_rst_stream.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_settings.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_window_update.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_encoder.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_parser.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_table.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\http2_errors.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\huffsyms.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\incoming_metadata.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\internal.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\status_conversion.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\stream_map.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\timeout_encoding.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\varint.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\census\grpc_filter.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\census\grpc_plugin.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.h" /> @@ -365,27 +386,6 @@ <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\server.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\surface_trace.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\byte_stream.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\alpn.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\bin_encoder.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_data.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_goaway.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_ping.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_rst_stream.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_settings.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_window_update.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_encoder.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_parser.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_table.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\http2_errors.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\huffsyms.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\incoming_metadata.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\internal.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\status_conversion.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\stream_map.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\timeout_encoding.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\varint.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2_transport.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\connectivity_state.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\metadata.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\metadata_batch.h" /> @@ -403,6 +403,52 @@ <ItemGroup> <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\init_unsecure.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\insecure\channel_create.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\server\insecure\server_chttp2.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\alpn.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\bin_encoder.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\chttp2_transport.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_data.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_goaway.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_ping.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_rst_stream.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_settings.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_window_update.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_encoder.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_parser.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_table.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\huffsyms.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\incoming_metadata.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\parsing.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\status_conversion.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\stream_lists.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\stream_map.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\timeout_encoding.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\varint.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\writing.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\census\grpc_context.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\census\grpc_filter.c"> @@ -589,8 +635,6 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel_connectivity.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel_create.c"> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel_init.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel_ping.c"> @@ -609,56 +653,12 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\server.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\server_chttp2.c"> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\validate_metadata.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\version.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\byte_stream.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\alpn.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\bin_encoder.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_data.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_goaway.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_ping.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_rst_stream.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_settings.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_window_update.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_encoder.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_parser.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_table.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\huffsyms.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\incoming_metadata.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\parsing.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\status_conversion.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\stream_lists.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\stream_map.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\timeout_encoding.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\varint.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\writing.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2_transport.c"> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\connectivity_state.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\metadata.c"> diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters index 5309b18729..fa30917880 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -4,6 +4,75 @@ <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\init_unsecure.c"> <Filter>src\core\lib\surface</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\insecure\channel_create.c"> + <Filter>src\core\ext\transport\chttp2\client\insecure</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\server\insecure\server_chttp2.c"> + <Filter>src\core\ext\transport\chttp2\server\insecure</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\alpn.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\bin_encoder.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\chttp2_transport.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_data.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_goaway.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_ping.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_rst_stream.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_settings.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_window_update.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_encoder.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_parser.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_table.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\huffsyms.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\incoming_metadata.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\parsing.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\status_conversion.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\stream_lists.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\stream_map.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\timeout_encoding.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\varint.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\writing.c"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\census\grpc_context.c"> <Filter>src\core\lib\census</Filter> </ClCompile> @@ -283,9 +352,6 @@ <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel_connectivity.c"> <Filter>src\core\lib\surface</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel_create.c"> - <Filter>src\core\lib\surface</Filter> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel_init.c"> <Filter>src\core\lib\surface</Filter> </ClCompile> @@ -313,9 +379,6 @@ <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\server.c"> <Filter>src\core\lib\surface</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\server_chttp2.c"> - <Filter>src\core\lib\surface</Filter> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\validate_metadata.c"> <Filter>src\core\lib\surface</Filter> </ClCompile> @@ -325,69 +388,6 @@ <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\byte_stream.c"> <Filter>src\core\lib\transport</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\alpn.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\bin_encoder.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_data.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_goaway.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_ping.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_rst_stream.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_settings.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_window_update.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_encoder.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_parser.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_table.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\huffsyms.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\incoming_metadata.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\parsing.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\status_conversion.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\stream_lists.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\stream_map.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\timeout_encoding.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\varint.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\writing.c"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\chttp2_transport.c"> - <Filter>src\core\lib\transport</Filter> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\connectivity_state.c"> <Filter>src\core\lib\transport</Filter> </ClCompile> @@ -473,6 +473,69 @@ </ClInclude> </ItemGroup> <ItemGroup> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\alpn.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\bin_encoder.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\chttp2_transport.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_data.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_goaway.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_ping.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_rst_stream.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_settings.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_window_update.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_encoder.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_parser.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_table.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\http2_errors.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\huffsyms.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\incoming_metadata.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\internal.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\status_conversion.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\stream_map.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\timeout_encoding.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\varint.h"> + <Filter>src\core\ext\transport\chttp2\transport</Filter> + </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\lib\census\grpc_filter.h"> <Filter>src\core\lib\census</Filter> </ClInclude> @@ -752,69 +815,6 @@ <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\byte_stream.h"> <Filter>src\core\lib\transport</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\alpn.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\bin_encoder.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_data.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_goaway.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_ping.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_rst_stream.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_settings.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\frame_window_update.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_encoder.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_parser.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\hpack_table.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\http2_errors.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\huffsyms.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\incoming_metadata.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\internal.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\status_conversion.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\stream_map.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\timeout_encoding.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2\varint.h"> - <Filter>src\core\lib\transport\chttp2</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\chttp2_transport.h"> - <Filter>src\core\lib\transport</Filter> - </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\connectivity_state.h"> <Filter>src\core\lib\transport</Filter> </ClInclude> @@ -875,6 +875,30 @@ <Filter Include="src\core"> <UniqueIdentifier>{88491077-386b-2039-d14c-0c40136b5f7a}</UniqueIdentifier> </Filter> + <Filter Include="src\core\ext"> + <UniqueIdentifier>{82f86e8c-00a4-f566-d235-670fc629798d}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\ext\transport"> + <UniqueIdentifier>{967c89fe-c97c-27e2-aac0-9ba5854cb5fa}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\ext\transport\chttp2"> + <UniqueIdentifier>{702829f0-099e-2ab7-6b44-ed7cff3ec083}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\ext\transport\chttp2\client"> + <UniqueIdentifier>{0d589e16-e470-4968-318c-796af5a33637}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\ext\transport\chttp2\client\insecure"> + <UniqueIdentifier>{34dfdc9b-ab97-47f0-c1e1-b2e7381c3de6}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\ext\transport\chttp2\server"> + <UniqueIdentifier>{81fb55f4-9216-441b-8389-a7120bbcd45e}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\ext\transport\chttp2\server\insecure"> + <UniqueIdentifier>{3f53dcb6-71d7-28ff-1794-26a08e4601fe}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\ext\transport\chttp2\transport"> + <UniqueIdentifier>{45b20f28-376c-9dea-1800-8a0193411946}</UniqueIdentifier> + </Filter> <Filter Include="src\core\lib"> <UniqueIdentifier>{8bd5b461-bff8-6aa8-b5a6-85da2834eb8a}</UniqueIdentifier> </Filter> @@ -929,9 +953,6 @@ <Filter Include="src\core\lib\transport"> <UniqueIdentifier>{6c3394d1-27e9-003e-19ed-8116d210f7cc}</UniqueIdentifier> </Filter> - <Filter Include="src\core\lib\transport\chttp2"> - <UniqueIdentifier>{212a6997-9b9c-3b47-d953-aaff34d608b1}</UniqueIdentifier> - </Filter> <Filter Include="third_party"> <UniqueIdentifier>{025c051e-8eba-125b-67f9-173f95176eb2}</UniqueIdentifier> </Filter> |