diff options
| author |  kpayson64 <kpayson@google.com> | 2016-07-26 10:31:57 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-07-26 10:31:57 -0700 |
| commit | 5d9d2465e1138328eeef9dbd6dd43ed07b19d00d (patch) | |
| tree | 9d874a3d236a650168d914c188f40b1ef58bffd8 /src | |
| parent | 7b104cd1c23a3e6ee3cb0809f39617ceda5e2575 (diff) | |
| parent | 13958b3be1b3ec65f54dc295e794079336aa67c9 (diff) | |
Merge pull request #7477 from yang-g/monotonic
Convert deadline clock type in security handshake timer
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/lib/security/transport/handshake.c | 5 |
1 files changed, 3 insertions, 2 deletions
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, |