Skip to content

Commit

Permalink
Native source sync at revision @32c56c6
Browse files Browse the repository at this point in the history
  • Loading branch information
@dennycd @HannahShiSFB
dennycd authored and HannahShiSFB committed Jan 8, 2025
1 parent 32c56c6 commit 53fa90a
Show file tree
Hide file tree
Showing 105 changed files with 5,802 additions and 5,341 deletions.
18 changes: 6 additions & 12 deletions gRPC-C++.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,8 @@ Pod::Spec.new do |s|
'src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h',
'src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/core/v3/socket_cmsg_headers.upb.h',
'src/core/ext/upb-gen/envoy/config/core/v3/socket_cmsg_headers.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h',
'src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h',
Expand Down Expand Up @@ -468,8 +470,6 @@ Pod::Spec.new do |s|
'src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h',
Expand Down Expand Up @@ -608,8 +608,6 @@ Pod::Spec.new do |s|
'src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h',
'src/core/ext/upb-gen/google/rpc/status.upb.h',
'src/core/ext/upb-gen/google/rpc/status.upb_minitable.h',
'src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h',
'src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h',
'src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h',
'src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h',
'src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h',
Expand Down Expand Up @@ -722,6 +720,7 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_cmsg_headers.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h',
Expand All @@ -745,7 +744,6 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h',
Expand Down Expand Up @@ -810,7 +808,6 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h',
'src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h',
'src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h',
'src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h',
'src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h',
'src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h',
'src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h',
Expand Down Expand Up @@ -1721,6 +1718,8 @@ Pod::Spec.new do |s|
'src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h',
'src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/core/v3/socket_cmsg_headers.upb.h',
'src/core/ext/upb-gen/envoy/config/core/v3/socket_cmsg_headers.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h',
'src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h',
Expand Down Expand Up @@ -1767,8 +1766,6 @@ Pod::Spec.new do |s|
'src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h',
Expand Down Expand Up @@ -1907,8 +1904,6 @@ Pod::Spec.new do |s|
'src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h',
'src/core/ext/upb-gen/google/rpc/status.upb.h',
'src/core/ext/upb-gen/google/rpc/status.upb_minitable.h',
'src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h',
'src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h',
'src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h',
'src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h',
'src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h',
Expand Down Expand Up @@ -2021,6 +2016,7 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_cmsg_headers.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h',
Expand All @@ -2044,7 +2040,6 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h',
Expand Down Expand Up @@ -2109,7 +2104,6 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h',
'src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h',
'src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h',
'src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h',
'src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h',
'src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h',
'src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h',
Expand Down
24 changes: 8 additions & 16 deletions gRPC-Core.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,9 @@ Pod::Spec.new do |s|
'src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h',
'src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c',
'src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/core/v3/socket_cmsg_headers.upb.h',
'src/core/ext/upb-gen/envoy/config/core/v3/socket_cmsg_headers.upb_minitable.c',
'src/core/ext/upb-gen/envoy/config/core/v3/socket_cmsg_headers.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h',
'src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c',
'src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h',
Expand Down Expand Up @@ -574,9 +577,6 @@ Pod::Spec.new do |s|
'src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c',
'src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c',
'src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c',
'src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h',
Expand Down Expand Up @@ -784,9 +784,6 @@ Pod::Spec.new do |s|
'src/core/ext/upb-gen/google/rpc/status.upb.h',
'src/core/ext/upb-gen/google/rpc/status.upb_minitable.c',
'src/core/ext/upb-gen/google/rpc/status.upb_minitable.h',
'src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h',
'src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c',
'src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h',
'src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h',
'src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c',
'src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h',
Expand Down Expand Up @@ -972,6 +969,8 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_cmsg_headers.upbdefs.c',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_cmsg_headers.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c',
Expand Down Expand Up @@ -1018,8 +1017,6 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c',
Expand Down Expand Up @@ -1148,8 +1145,6 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h',
'src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c',
'src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h',
'src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c',
'src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h',
'src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c',
'src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h',
'src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c',
Expand Down Expand Up @@ -2578,6 +2573,8 @@ Pod::Spec.new do |s|
'src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h',
'src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/core/v3/socket_cmsg_headers.upb.h',
'src/core/ext/upb-gen/envoy/config/core/v3/socket_cmsg_headers.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h',
'src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h',
Expand Down Expand Up @@ -2624,8 +2621,6 @@ Pod::Spec.new do |s|
'src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h',
'src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h',
Expand Down Expand Up @@ -2764,8 +2759,6 @@ Pod::Spec.new do |s|
'src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h',
'src/core/ext/upb-gen/google/rpc/status.upb.h',
'src/core/ext/upb-gen/google/rpc/status.upb_minitable.h',
'src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h',
'src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h',
'src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h',
'src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h',
'src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h',
Expand Down Expand Up @@ -2878,6 +2871,7 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_cmsg_headers.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h',
Expand All @@ -2901,7 +2895,6 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h',
'src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h',
Expand Down Expand Up @@ -2966,7 +2959,6 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h',
'src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h',
'src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h',
'src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h',
'src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h',
'src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h',
'src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h',
Expand Down
1 change: 1 addition & 0 deletions src/core/ext/transport/chttp2/transport/chttp2_transport.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,7 @@ static void init_keepalive_pings_if_enabled_locked(

// TODO(alishananda): add unit testing as part of chttp2 promise conversion work
void grpc_chttp2_transport::WriteSecurityFrame(grpc_core::SliceBuffer* data) {
grpc_core::ExecCtx exec_ctx;
combiner->Run(grpc_core::NewClosure(
[transport = Ref(), data](grpc_error_handle) mutable {
transport->WriteSecurityFrameLocked(data);
Expand Down
4 changes: 1 addition & 3 deletions src/core/ext/transport/chttp2/transport/frame_security.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ absl::Status grpc_chttp2_security_frame_parser_parse(void* parser,

grpc_chttp2_security_frame_parser* p =
static_cast<grpc_chttp2_security_frame_parser*>(parser);
p->payload.Append(grpc_core::Slice(slice));
p->payload.Append(grpc_core::Slice(grpc_core::CSliceRef(slice)));

if (is_last) {
// Send security frame payload to endpoint.
Expand All @@ -59,8 +59,6 @@ absl::Status grpc_chttp2_security_frame_parser_begin_frame(
void grpc_chttp2_security_frame_create(grpc_slice_buffer* payload,
uint32_t length,
grpc_slice_buffer* frame) {
// does this frame need padding for security?
// do we need to worry about max frame size? it's 16 bytes
grpc_slice hdr;
uint8_t* p;
static const size_t header_size = 9;
Expand Down
Loading

0 comments on commit 53fa90a

Please sign in to comment.