diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-12-16 17:36:04 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-12-16 17:36:04 -0800 |
| commit | 7052ac25e60e137514d9a201a86eeb9b29b03d24 (patch) | |
| tree | 2ce8f32319129e346a27d3b29a9b8d6b440cdd6c /src/core/httpcli/httpcli_security_connector.c | |
| parent | 886b7d19bafbb61e84141e66a040da8c27781c44 (diff) | |
| parent | 788767a18f918131268ca88985b3547a8257e973 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
Diffstat (limited to 'src/core/httpcli/httpcli_security_connector.c')
| -rw-r--r-- | src/core/httpcli/httpcli_security_connector.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/httpcli/httpcli_security_connector.c b/src/core/httpcli/httpcli_security_connector.c index fc6699c918..a5aa551373 100644 --- a/src/core/httpcli/httpcli_security_connector.c +++ b/src/core/httpcli/httpcli_security_connector.c @@ -68,7 +68,7 @@ static void httpcli_ssl_do_handshake(grpc_exec_ctx *exec_ctx, tsi_result result = TSI_OK; tsi_handshaker *handshaker; if (c->handshaker_factory == NULL) { - cb(exec_ctx, user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL); + cb(exec_ctx, user_data, GRPC_SECURITY_ERROR, NULL); return; } result = tsi_ssl_handshaker_factory_create_handshaker( @@ -76,7 +76,7 @@ static void httpcli_ssl_do_handshake(grpc_exec_ctx *exec_ctx, if (result != TSI_OK) { gpr_log(GPR_ERROR, "Handshaker creation failed with error %s.", tsi_result_to_string(result)); - cb(exec_ctx, user_data, GRPC_SECURITY_ERROR, nonsecure_endpoint, NULL); + cb(exec_ctx, user_data, GRPC_SECURITY_ERROR, NULL); } else { grpc_do_security_handshake(exec_ctx, handshaker, sc, nonsecure_endpoint, cb, user_data); @@ -149,7 +149,6 @@ typedef struct { static void on_secure_transport_setup_done(grpc_exec_ctx *exec_ctx, void *rp, grpc_security_status status, - grpc_endpoint *wrapped_endpoint, grpc_endpoint *secure_endpoint) { on_done_closure *c = rp; if (status != GRPC_SECURITY_OK) { |