diff options
| author |  Mark D. Roth <roth@google.com> | 2016-08-02 10:07:48 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-08-02 10:07:48 -0700 |
| commit | 3ac6fc1b97924b069e998ad72e0c404d21381cac (patch) | |
| tree | 07edeef1a36558dbbe62e96ebf778f6c6959863a /src/core/lib/security | |
| parent | f9d8e9064ba9aa20c944441f4890866ff3b98141 (diff) | |
| parent | 0ff122e3e55a297643805735986deb7f336c7159 (diff) | |
Merge branch 'filter_call_init_failure' into filter_api
Diffstat (limited to 'src/core/lib/security')
| -rw-r--r-- | src/core/lib/security/transport/client_auth_filter.c | 3 | ||||
| -rw-r--r-- | src/core/lib/security/transport/handshake.c | 5 | ||||
| -rw-r--r-- | src/core/lib/security/transport/server_auth_filter.c | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/core/lib/security/transport/client_auth_filter.c b/src/core/lib/security/transport/client_auth_filter.c index 110d8bf9f0..2a1bf4d4e3 100644 --- a/src/core/lib/security/transport/client_auth_filter.c +++ b/src/core/lib/security/transport/client_auth_filter.c @@ -284,7 +284,8 @@ static void set_pollset_or_pollset_set(grpc_exec_ctx *exec_ctx, /* Destructor for call_data */ static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - const grpc_call_stats *stats, void *ignored) { + const grpc_call_final_info *final_info, + void *ignored) { call_data *calld = elem->call_data; grpc_call_credentials_unref(calld->creds); if (calld->host != NULL) { diff --git a/src/core/lib/security/transport/handshake.c b/src/core/lib/security/transport/handshake.c index b374ca7633..540a17283d 100644 --- a/src/core/lib/security/transport/handshake.c +++ b/src/core/lib/security/transport/handshake.c @@ -357,8 +357,9 @@ void grpc_do_security_handshake( gpr_mu_unlock(&server_connector->mu); } send_handshake_bytes_to_peer(exec_ctx, h); - grpc_timer_init(exec_ctx, &h->timer, deadline, on_timeout, h, - gpr_now(deadline.clock_type)); + grpc_timer_init(exec_ctx, &h->timer, + gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC), + on_timeout, h, gpr_now(GPR_CLOCK_MONOTONIC)); } void grpc_security_handshake_shutdown(grpc_exec_ctx *exec_ctx, diff --git a/src/core/lib/security/transport/server_auth_filter.c b/src/core/lib/security/transport/server_auth_filter.c index 86d4d61637..def16c8229 100644 --- a/src/core/lib/security/transport/server_auth_filter.c +++ b/src/core/lib/security/transport/server_auth_filter.c @@ -229,7 +229,8 @@ static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, /* Destructor for call_data */ static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - const grpc_call_stats *stats, void *ignored) {} + const grpc_call_final_info *final_info, + void *ignored) {} /* Constructor for channel_data */ static void init_channel_elem(grpc_exec_ctx *exec_ctx, |