From 4f9ce64f8b5d508afc70f07fc2ad8f2f19a794b5 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Tue, 3 Apr 2018 13:40:27 -0700 Subject: [PATCH] Update master to v1.11.0-dev --- packages/grpc-native-core/binding.gyp | 99 ++++++++++++++++++++------ packages/grpc-native-core/deps/grpc | 2 +- packages/grpc-native-core/package.json | 2 +- 3 files changed, 78 insertions(+), 25 deletions(-) diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp index 8de8a228..d2a41511 100644 --- a/packages/grpc-native-core/binding.gyp +++ b/packages/grpc-native-core/binding.gyp @@ -40,6 +40,7 @@ 'Release': { 'cflags': [ '-O2', + '-Wframe-larger-than=16384', ], 'defines': [ 'NDEBUG', @@ -291,7 +292,6 @@ 'deps/grpc/third_party/boringssl/crypto/cpu-intel.c', 'deps/grpc/third_party/boringssl/crypto/cpu-ppc64le.c', 'deps/grpc/third_party/boringssl/crypto/crypto.c', - 'deps/grpc/third_party/boringssl/crypto/curve25519/curve25519.c', 'deps/grpc/third_party/boringssl/crypto/curve25519/spake25519.c', 'deps/grpc/third_party/boringssl/crypto/curve25519/x25519-x86_64.c', 'deps/grpc/third_party/boringssl/crypto/dh/check.c', @@ -477,6 +477,7 @@ 'deps/grpc/third_party/boringssl/ssl/tls13_server.cc', 'deps/grpc/third_party/boringssl/ssl/tls_method.cc', 'deps/grpc/third_party/boringssl/ssl/tls_record.cc', + 'deps/grpc/third_party/boringssl/third_party/fiat/curve25519.c', ], 'conditions': [ ['OS == "mac"', { @@ -582,9 +583,6 @@ 'deps/grpc/src/core/lib/gpr/sync.cc', 'deps/grpc/src/core/lib/gpr/sync_posix.cc', 'deps/grpc/src/core/lib/gpr/sync_windows.cc', - 'deps/grpc/src/core/lib/gpr/thd.cc', - 'deps/grpc/src/core/lib/gpr/thd_posix.cc', - 'deps/grpc/src/core/lib/gpr/thd_windows.cc', 'deps/grpc/src/core/lib/gpr/time.cc', 'deps/grpc/src/core/lib/gpr/time_posix.cc', 'deps/grpc/src/core/lib/gpr/time_precise.cc', @@ -594,6 +592,8 @@ 'deps/grpc/src/core/lib/gpr/tmpfile_posix.cc', 'deps/grpc/src/core/lib/gpr/tmpfile_windows.cc', 'deps/grpc/src/core/lib/gpr/wrap_memcpy.cc', + 'deps/grpc/src/core/lib/gprpp/thd_posix.cc', + 'deps/grpc/src/core/lib/gprpp/thd_windows.cc', 'deps/grpc/src/core/lib/profiling/basic_timers.cc', 'deps/grpc/src/core/lib/profiling/stap_timers.cc', ], @@ -619,10 +619,13 @@ 'deps/grpc/src/core/lib/channel/channel_args.cc', 'deps/grpc/src/core/lib/channel/channel_stack.cc', 'deps/grpc/src/core/lib/channel/channel_stack_builder.cc', + 'deps/grpc/src/core/lib/channel/channel_trace.cc', + 'deps/grpc/src/core/lib/channel/channel_trace_registry.cc', 'deps/grpc/src/core/lib/channel/connected_channel.cc', 'deps/grpc/src/core/lib/channel/handshaker.cc', 'deps/grpc/src/core/lib/channel/handshaker_factory.cc', 'deps/grpc/src/core/lib/channel/handshaker_registry.cc', + 'deps/grpc/src/core/lib/channel/status_util.cc', 'deps/grpc/src/core/lib/compression/compression.cc', 'deps/grpc/src/core/lib/compression/compression_internal.cc', 'deps/grpc/src/core/lib/compression/message_compress.cc', @@ -656,6 +659,8 @@ 'deps/grpc/src/core/lib/iomgr/gethostname_sysconf.cc', 'deps/grpc/src/core/lib/iomgr/iocp_windows.cc', 'deps/grpc/src/core/lib/iomgr/iomgr.cc', + 'deps/grpc/src/core/lib/iomgr/iomgr_custom.cc', + 'deps/grpc/src/core/lib/iomgr/iomgr_internal.cc', 'deps/grpc/src/core/lib/iomgr/iomgr_posix.cc', 'deps/grpc/src/core/lib/iomgr/iomgr_uv.cc', 'deps/grpc/src/core/lib/iomgr/iomgr_windows.cc', @@ -664,12 +669,16 @@ 'deps/grpc/src/core/lib/iomgr/lockfree_event.cc', 'deps/grpc/src/core/lib/iomgr/network_status_tracker.cc', 'deps/grpc/src/core/lib/iomgr/polling_entity.cc', - 'deps/grpc/src/core/lib/iomgr/pollset_set_uv.cc', + 'deps/grpc/src/core/lib/iomgr/pollset.cc', + 'deps/grpc/src/core/lib/iomgr/pollset_custom.cc', + 'deps/grpc/src/core/lib/iomgr/pollset_set.cc', + 'deps/grpc/src/core/lib/iomgr/pollset_set_custom.cc', 'deps/grpc/src/core/lib/iomgr/pollset_set_windows.cc', 'deps/grpc/src/core/lib/iomgr/pollset_uv.cc', 'deps/grpc/src/core/lib/iomgr/pollset_windows.cc', + 'deps/grpc/src/core/lib/iomgr/resolve_address.cc', + 'deps/grpc/src/core/lib/iomgr/resolve_address_custom.cc', 'deps/grpc/src/core/lib/iomgr/resolve_address_posix.cc', - 'deps/grpc/src/core/lib/iomgr/resolve_address_uv.cc', 'deps/grpc/src/core/lib/iomgr/resolve_address_windows.cc', 'deps/grpc/src/core/lib/iomgr/resource_quota.cc', 'deps/grpc/src/core/lib/iomgr/sockaddr_utils.cc', @@ -681,19 +690,24 @@ 'deps/grpc/src/core/lib/iomgr/socket_utils_uv.cc', 'deps/grpc/src/core/lib/iomgr/socket_utils_windows.cc', 'deps/grpc/src/core/lib/iomgr/socket_windows.cc', + 'deps/grpc/src/core/lib/iomgr/tcp_client.cc', + 'deps/grpc/src/core/lib/iomgr/tcp_client_custom.cc', 'deps/grpc/src/core/lib/iomgr/tcp_client_posix.cc', - 'deps/grpc/src/core/lib/iomgr/tcp_client_uv.cc', 'deps/grpc/src/core/lib/iomgr/tcp_client_windows.cc', + 'deps/grpc/src/core/lib/iomgr/tcp_custom.cc', 'deps/grpc/src/core/lib/iomgr/tcp_posix.cc', + 'deps/grpc/src/core/lib/iomgr/tcp_server.cc', + 'deps/grpc/src/core/lib/iomgr/tcp_server_custom.cc', 'deps/grpc/src/core/lib/iomgr/tcp_server_posix.cc', 'deps/grpc/src/core/lib/iomgr/tcp_server_utils_posix_common.cc', 'deps/grpc/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc', 'deps/grpc/src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc', - 'deps/grpc/src/core/lib/iomgr/tcp_server_uv.cc', 'deps/grpc/src/core/lib/iomgr/tcp_server_windows.cc', 'deps/grpc/src/core/lib/iomgr/tcp_uv.cc', 'deps/grpc/src/core/lib/iomgr/tcp_windows.cc', 'deps/grpc/src/core/lib/iomgr/time_averaged_stats.cc', + 'deps/grpc/src/core/lib/iomgr/timer.cc', + 'deps/grpc/src/core/lib/iomgr/timer_custom.cc', 'deps/grpc/src/core/lib/iomgr/timer_generic.cc', 'deps/grpc/src/core/lib/iomgr/timer_heap.cc', 'deps/grpc/src/core/lib/iomgr/timer_manager.cc', @@ -714,7 +728,6 @@ 'deps/grpc/src/core/lib/slice/percent_encoding.cc', 'deps/grpc/src/core/lib/slice/slice.cc', 'deps/grpc/src/core/lib/slice/slice_buffer.cc', - 'deps/grpc/src/core/lib/slice/slice_hash_table.cc', 'deps/grpc/src/core/lib/slice/slice_intern.cc', 'deps/grpc/src/core/lib/slice/slice_string_helpers.cc', 'deps/grpc/src/core/lib/surface/api_trace.cc', @@ -745,6 +758,7 @@ 'deps/grpc/src/core/lib/transport/service_config.cc', 'deps/grpc/src/core/lib/transport/static_metadata.cc', 'deps/grpc/src/core/lib/transport/status_conversion.cc', + 'deps/grpc/src/core/lib/transport/status_metadata.cc', 'deps/grpc/src/core/lib/transport/timeout_encoding.cc', 'deps/grpc/src/core/lib/transport/transport.cc', 'deps/grpc/src/core/lib/transport/transport_op_string.cc', @@ -779,6 +793,7 @@ 'deps/grpc/src/core/ext/filters/http/server/http_server_filter.cc', 'deps/grpc/src/core/lib/http/httpcli_security_connector.cc', 'deps/grpc/src/core/lib/security/context/security_context.cc', + 'deps/grpc/src/core/lib/security/credentials/alts/alts_credentials.cc', 'deps/grpc/src/core/lib/security/credentials/composite/composite_credentials.cc', 'deps/grpc/src/core/lib/security/credentials/credentials.cc', 'deps/grpc/src/core/lib/security/credentials/credentials_metadata.cc', @@ -792,23 +807,56 @@ 'deps/grpc/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc', 'deps/grpc/src/core/lib/security/credentials/plugin/plugin_credentials.cc', 'deps/grpc/src/core/lib/security/credentials/ssl/ssl_credentials.cc', + 'deps/grpc/src/core/lib/security/security_connector/alts_security_connector.cc', + 'deps/grpc/src/core/lib/security/security_connector/security_connector.cc', 'deps/grpc/src/core/lib/security/transport/client_auth_filter.cc', - 'deps/grpc/src/core/lib/security/transport/lb_targets_info.cc', 'deps/grpc/src/core/lib/security/transport/secure_endpoint.cc', - 'deps/grpc/src/core/lib/security/transport/security_connector.cc', 'deps/grpc/src/core/lib/security/transport/security_handshaker.cc', 'deps/grpc/src/core/lib/security/transport/server_auth_filter.cc', + 'deps/grpc/src/core/lib/security/transport/target_authority_table.cc', 'deps/grpc/src/core/lib/security/transport/tsi_error.cc', 'deps/grpc/src/core/lib/security/util/json_util.cc', 'deps/grpc/src/core/lib/surface/init_secure.cc', - 'deps/grpc/src/core/tsi/alts_transport_security.cc', - 'deps/grpc/src/core/tsi/fake_transport_security.cc', - 'deps/grpc/src/core/tsi/ssl_transport_security.cc', - 'deps/grpc/src/core/tsi/transport_security_grpc.cc', + 'deps/grpc/src/core/tsi/alts/crypt/aes_gcm.cc', + 'deps/grpc/src/core/tsi/alts/crypt/gsec.cc', + 'deps/grpc/src/core/tsi/alts/frame_protector/alts_counter.cc', + 'deps/grpc/src/core/tsi/alts/frame_protector/alts_crypter.cc', + 'deps/grpc/src/core/tsi/alts/frame_protector/alts_frame_protector.cc', + 'deps/grpc/src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.cc', + 'deps/grpc/src/core/tsi/alts/frame_protector/alts_seal_privacy_integrity_crypter.cc', + 'deps/grpc/src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc', + 'deps/grpc/src/core/tsi/alts/frame_protector/frame_handler.cc', + 'deps/grpc/src/core/tsi/alts/handshaker/alts_handshaker_client.cc', + 'deps/grpc/src/core/tsi/alts/handshaker/alts_tsi_event.cc', + 'deps/grpc/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc', + 'deps/grpc/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc', + 'deps/grpc/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc', + 'deps/grpc/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc', + 'deps/grpc/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc', + 'deps/grpc/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc', + 'deps/grpc/src/core/lib/security/credentials/alts/check_gcp_environment.cc', + 'deps/grpc/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc', + 'deps/grpc/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc', + 'deps/grpc/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc', + 'deps/grpc/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc', + 'deps/grpc/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc', + 'deps/grpc/src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc', + 'deps/grpc/src/core/tsi/alts/handshaker/alts_handshaker_service_api.cc', + 'deps/grpc/src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.cc', + 'deps/grpc/src/core/tsi/alts/handshaker/alts_tsi_utils.cc', + 'deps/grpc/src/core/tsi/alts/handshaker/transport_security_common_api.cc', + 'deps/grpc/src/core/tsi/alts/handshaker/altscontext.pb.c', + 'deps/grpc/src/core/tsi/alts/handshaker/handshaker.pb.c', + 'deps/grpc/src/core/tsi/alts/handshaker/transport_security_common.pb.c', + 'deps/grpc/third_party/nanopb/pb_common.c', + 'deps/grpc/third_party/nanopb/pb_decode.c', + 'deps/grpc/third_party/nanopb/pb_encode.c', 'deps/grpc/src/core/tsi/transport_security.cc', 'deps/grpc/src/core/tsi/transport_security_adapter.cc', - 'deps/grpc/src/core/ext/transport/chttp2/server/chttp2_server.cc', - 'deps/grpc/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc', + 'deps/grpc/src/core/ext/transport/chttp2/client/insecure/channel_create.cc', + 'deps/grpc/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc', + 'deps/grpc/src/core/ext/transport/chttp2/client/authority.cc', + 'deps/grpc/src/core/ext/transport/chttp2/client/chttp2_connector.cc', 'deps/grpc/src/core/ext/filters/client_channel/backup_poller.cc', 'deps/grpc/src/core/ext/filters/client_channel/channel_connectivity.cc', 'deps/grpc/src/core/ext/filters/client_channel/client_channel.cc', @@ -820,6 +868,7 @@ 'deps/grpc/src/core/ext/filters/client_channel/lb_policy.cc', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy_factory.cc', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy_registry.cc', + 'deps/grpc/src/core/ext/filters/client_channel/method_params.cc', 'deps/grpc/src/core/ext/filters/client_channel/parse_address.cc', 'deps/grpc/src/core/ext/filters/client_channel/proxy_mapper.cc', 'deps/grpc/src/core/ext/filters/client_channel/proxy_mapper_registry.cc', @@ -830,11 +879,17 @@ 'deps/grpc/src/core/ext/filters/client_channel/subchannel_index.cc', 'deps/grpc/src/core/ext/filters/client_channel/uri_parser.cc', 'deps/grpc/src/core/ext/filters/deadline/deadline_filter.cc', - 'deps/grpc/src/core/ext/transport/chttp2/client/chttp2_connector.cc', + 'deps/grpc/src/core/tsi/alts_transport_security.cc', + 'deps/grpc/src/core/tsi/fake_transport_security.cc', + 'deps/grpc/src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc', + 'deps/grpc/src/core/tsi/ssl/session_cache/ssl_session_cache.cc', + 'deps/grpc/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc', + 'deps/grpc/src/core/tsi/ssl_transport_security.cc', + 'deps/grpc/src/core/tsi/transport_security_grpc.cc', + 'deps/grpc/src/core/ext/transport/chttp2/server/chttp2_server.cc', + 'deps/grpc/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc', 'deps/grpc/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc', 'deps/grpc/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc', - 'deps/grpc/src/core/ext/transport/chttp2/client/insecure/channel_create.cc', - 'deps/grpc/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc', 'deps/grpc/src/core/ext/transport/inproc/inproc_plugin.cc', 'deps/grpc/src/core/ext/transport/inproc/inproc_transport.cc', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc', @@ -843,9 +898,6 @@ 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c', - 'deps/grpc/third_party/nanopb/pb_common.c', - 'deps/grpc/third_party/nanopb/pb_decode.c', - 'deps/grpc/third_party/nanopb/pb_encode.c', 'deps/grpc/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc', @@ -861,6 +913,7 @@ 'deps/grpc/src/core/ext/census/grpc_context.cc', 'deps/grpc/src/core/ext/filters/max_age/max_age_filter.cc', 'deps/grpc/src/core/ext/filters/message_size/message_size_filter.cc', + 'deps/grpc/src/core/ext/filters/http/client_authority_filter.cc', 'deps/grpc/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc', 'deps/grpc/src/core/ext/filters/workarounds/workaround_utils.cc', 'deps/grpc/src/core/plugin_registry/grpc_plugin_registry.cc', diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc index 34e8e0a6..98c1017f 160000 --- a/packages/grpc-native-core/deps/grpc +++ b/packages/grpc-native-core/deps/grpc @@ -1 +1 @@ -Subproject commit 34e8e0a6400d8b529125a3b83ec1facf71acf99b +Subproject commit 98c1017fd9f155aad13c3b86e8f17a456c9512e8 diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index 0a8d3f82..db5fb5a0 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version": "1.10.0-dev", + "version": "1.11.0-dev", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "https://grpc.io/",