diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-08-01 14:52:02 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-08-01 14:52:02 -0700 |
| commit | 62105352beec527b28313ad055264731461b5b61 (patch) | |
| tree | 71ceefebcc7d36eccf34cf61cec164748802e39a /src/core/lib/security/transport | |
| parent | 5dde14ce433ebfb6444e49d31764138a855ac997 (diff) | |
| parent | 2507fef7379aa54cbced074f1b1e7ba3b53eae26 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into lr_july_16
Diffstat (limited to 'src/core/lib/security/transport')
| -rw-r--r-- | src/core/lib/security/transport/handshake.c | 5 | ||||
| -rw-r--r-- | src/core/lib/security/transport/secure_endpoint.c | 18 |
2 files changed, 16 insertions, 7 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, diff --git a/src/core/lib/security/transport/secure_endpoint.c b/src/core/lib/security/transport/secure_endpoint.c index 7650d68e89..bc50f9d1b0 100644 --- a/src/core/lib/security/transport/secure_endpoint.c +++ b/src/core/lib/security/transport/secure_endpoint.c @@ -360,11 +360,19 @@ static char *endpoint_get_peer(grpc_endpoint *secure_ep) { return grpc_endpoint_get_peer(ep->wrapped_ep); } -static const grpc_endpoint_vtable vtable = { - endpoint_read, endpoint_write, - endpoint_add_to_pollset, endpoint_add_to_pollset_set, - endpoint_shutdown, endpoint_destroy, - endpoint_get_peer}; +static grpc_workqueue *endpoint_get_workqueue(grpc_endpoint *secure_ep) { + secure_endpoint *ep = (secure_endpoint *)secure_ep; + return grpc_endpoint_get_workqueue(ep->wrapped_ep); +} + +static const grpc_endpoint_vtable vtable = {endpoint_read, + endpoint_write, + endpoint_get_workqueue, + endpoint_add_to_pollset, + endpoint_add_to_pollset_set, + endpoint_shutdown, + endpoint_destroy, + endpoint_get_peer}; grpc_endpoint *grpc_secure_endpoint_create( struct tsi_frame_protector *protector, grpc_endpoint *transport, |