diff options
author | 2016-06-21 16:32:13 -0700 | |
---|---|---|
committer | 2016-06-21 16:32:13 -0700 | |
commit | 1d9b1e964064207e986320de1e29fef42c3201c1 (patch) | |
tree | 4c639ddadb343e7e88cafa3b178167d595c66290 /src/core/lib/security/transport/handshake.h | |
parent | b9df2760ed15930429305f01407914db106510d5 (diff) | |
parent | 176a55729ee38a663ee98dd6f76c2b35936e8c64 (diff) |
Merge branch 'master' into async_stream_doc
Diffstat (limited to 'src/core/lib/security/transport/handshake.h')
-rw-r--r-- | src/core/lib/security/transport/handshake.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/core/lib/security/transport/handshake.h b/src/core/lib/security/transport/handshake.h index 6ed850b315..c0906dd6af 100644 --- a/src/core/lib/security/transport/handshake.h +++ b/src/core/lib/security/transport/handshake.h @@ -38,13 +38,11 @@ #include "src/core/lib/security/transport/security_connector.h" /* Calls the callback upon completion. Takes owership of handshaker. */ -void grpc_do_security_handshake(grpc_exec_ctx *exec_ctx, - tsi_handshaker *handshaker, - grpc_security_connector *connector, - bool is_client_side, - grpc_endpoint *nonsecure_endpoint, - grpc_security_handshake_done_cb cb, - void *user_data); +void grpc_do_security_handshake( + grpc_exec_ctx *exec_ctx, tsi_handshaker *handshaker, + grpc_security_connector *connector, bool is_client_side, + grpc_endpoint *nonsecure_endpoint, gpr_timespec deadline, + grpc_security_handshake_done_cb cb, void *user_data); void grpc_security_handshake_shutdown(grpc_exec_ctx *exec_ctx, void *handshake); |