archive-gh-me/grpc-node
1
0
Fork 0
mirror of https://github.com/grpc/grpc-node.git synced 2025-12-08 18:23:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #55 from murgatroid99/submodule_update_creds_fix

Browse Source 
Update grpc submodule
This commit is contained in:
Michael Lumish 2017-10-02 14:25:26 -07:00 committed by GitHub
commit 2cc053ef8f
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grpc-native-core/binding.gyp
View File

@ -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',

2
packages/grpc-native-core/deps/grpc

@ -1 +1 @@
Subproject commit cbe93839937e4e6272407ab1b7ae7ef848b64894
Subproject commit 8d1dc21994b2c8d4600db706b60b300c1a5a24a7

11
packages/grpc-native-core/ext/call_credentials.cc
View File

@ -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<plugin_state *>(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) {

10
packages/grpc-native-core/ext/call_credentials.h
View File

@ -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);