Skip to content

Commit 2cc053e

Browse files
authored
Merge pull request #55 from murgatroid99/submodule_update_creds_fix
Update grpc submodule
2 parents 2b538ca + d0218f2 commit 2cc053e

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

packages/grpc-native-core/binding.gyp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -670,6 +670,8 @@
670670
'deps/grpc/src/core/lib/compression/compression.c',
671671
'deps/grpc/src/core/lib/compression/message_compress.c',
672672
'deps/grpc/src/core/lib/compression/stream_compression.c',
673+
'deps/grpc/src/core/lib/compression/stream_compression_gzip.c',
674+
'deps/grpc/src/core/lib/compression/stream_compression_identity.c',
673675
'deps/grpc/src/core/lib/debug/stats.c',
674676
'deps/grpc/src/core/lib/debug/stats_data.c',
675677
'deps/grpc/src/core/lib/http/format_request.c',
Submodule grpc updated 459 files

packages/grpc-native-core/ext/call_credentials.cc

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,13 @@ NAUV_WORK_CB(SendPluginCallback) {
238238
}
239239
}
240240

241-
void plugin_get_metadata(void *state, grpc_auth_metadata_context context,
242-
grpc_credentials_plugin_metadata_cb cb,
243-
void *user_data) {
241+
int plugin_get_metadata(
242+
void *state, grpc_auth_metadata_context context,
243+
grpc_credentials_plugin_metadata_cb cb,
244+
void *user_data,
245+
grpc_metadata creds_md[GRPC_METADATA_CREDENTIALS_PLUGIN_SYNC_MAX],
246+
size_t *num_creds_md, grpc_status_code *status,
247+
const char **error_details) {
244248
plugin_state *p_state = reinterpret_cast<plugin_state *>(state);
245249
plugin_callback_data *data = new plugin_callback_data;
246250
data->service_url = context.service_url;
@@ -252,6 +256,7 @@ void plugin_get_metadata(void *state, grpc_auth_metadata_context context,
252256
uv_mutex_unlock(&p_state->plugin_mutex);
253257

254258
uv_async_send(&p_state->plugin_async);
259+
return 0; // Async processing.
255260
}
256261

257262
void plugin_uv_close_cb(uv_handle_t *handle) {

packages/grpc-native-core/ext/call_credentials.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,13 @@ typedef struct plugin_state {
7575
uv_async_t plugin_async;
7676
} plugin_state;
7777

78-
void plugin_get_metadata(void *state, grpc_auth_metadata_context context,
79-
grpc_credentials_plugin_metadata_cb cb,
80-
void *user_data);
78+
int plugin_get_metadata(
79+
void *state, grpc_auth_metadata_context context,
80+
grpc_credentials_plugin_metadata_cb cb,
81+
void *user_data,
82+
grpc_metadata creds_md[GRPC_METADATA_CREDENTIALS_PLUGIN_SYNC_MAX],
83+
size_t *num_creds_md, grpc_status_code *status,
84+
const char **error_details);
8185

8286
void plugin_destroy_state(void *state);
8387

0 commit comments

Comments
 (0)