From d0218f21b6595bdfc58f3d0bc1ff18b97c934e18 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Mon, 2 Oct 2017 13:49:05 -0700 Subject: [PATCH] Update grpc submodule --- packages/grpc-native-core/binding.gyp | 2 ++ packages/grpc-native-core/deps/grpc | 2 +- packages/grpc-native-core/ext/call_credentials.cc | 11 ++++++++--- packages/grpc-native-core/ext/call_credentials.h | 10 +++++++--- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp index 861ac0af..f35bd619 100644 --- a/packages/grpc-native-core/binding.gyp +++ b/packages/grpc-native-core/binding.gyp @@ -670,6 +670,8 @@ 'deps/grpc/src/core/lib/compression/compression.c', 'deps/grpc/src/core/lib/compression/message_compress.c', 'deps/grpc/src/core/lib/compression/stream_compression.c', + 'deps/grpc/src/core/lib/compression/stream_compression_gzip.c', + 'deps/grpc/src/core/lib/compression/stream_compression_identity.c', 'deps/grpc/src/core/lib/debug/stats.c', 'deps/grpc/src/core/lib/debug/stats_data.c', 'deps/grpc/src/core/lib/http/format_request.c', diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc index cbe93839..8d1dc219 160000 --- a/packages/grpc-native-core/deps/grpc +++ b/packages/grpc-native-core/deps/grpc @@ -1 +1 @@ -Subproject commit cbe93839937e4e6272407ab1b7ae7ef848b64894 +Subproject commit 8d1dc21994b2c8d4600db706b60b300c1a5a24a7 diff --git a/packages/grpc-native-core/ext/call_credentials.cc b/packages/grpc-native-core/ext/call_credentials.cc index 4cf3e565..2b1cb35f 100644 --- a/packages/grpc-native-core/ext/call_credentials.cc +++ b/packages/grpc-native-core/ext/call_credentials.cc @@ -238,9 +238,13 @@ NAUV_WORK_CB(SendPluginCallback) { } } -void plugin_get_metadata(void *state, grpc_auth_metadata_context context, - grpc_credentials_plugin_metadata_cb cb, - void *user_data) { +int plugin_get_metadata( + void *state, grpc_auth_metadata_context context, + grpc_credentials_plugin_metadata_cb cb, + void *user_data, + grpc_metadata creds_md[GRPC_METADATA_CREDENTIALS_PLUGIN_SYNC_MAX], + size_t *num_creds_md, grpc_status_code *status, + const char **error_details) { plugin_state *p_state = reinterpret_cast(state); plugin_callback_data *data = new plugin_callback_data; data->service_url = context.service_url; @@ -252,6 +256,7 @@ void plugin_get_metadata(void *state, grpc_auth_metadata_context context, uv_mutex_unlock(&p_state->plugin_mutex); uv_async_send(&p_state->plugin_async); + return 0; // Async processing. } void plugin_uv_close_cb(uv_handle_t *handle) { diff --git a/packages/grpc-native-core/ext/call_credentials.h b/packages/grpc-native-core/ext/call_credentials.h index adcff845..323eb4f2 100644 --- a/packages/grpc-native-core/ext/call_credentials.h +++ b/packages/grpc-native-core/ext/call_credentials.h @@ -75,9 +75,13 @@ typedef struct plugin_state { uv_async_t plugin_async; } plugin_state; -void plugin_get_metadata(void *state, grpc_auth_metadata_context context, - grpc_credentials_plugin_metadata_cb cb, - void *user_data); +int plugin_get_metadata( + void *state, grpc_auth_metadata_context context, + grpc_credentials_plugin_metadata_cb cb, + void *user_data, + grpc_metadata creds_md[GRPC_METADATA_CREDENTIALS_PLUGIN_SYNC_MAX], + size_t *num_creds_md, grpc_status_code *status, + const char **error_details); void plugin_destroy_state(void *state);