diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-12-03 13:30:34 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-12-03 13:30:34 -0800 |
| commit | c9614d30031c1ed2d6fbcc292d9428c1cc88a517 (patch) | |
| tree | c6236aae177464fcdd2df7b85bdc07569f4b9f34 /src/core/surface | |
| parent | f48c46f7ecc535f3ae8a06ab67b125e9dcb7aea4 (diff) | |
| parent | d88e1d8f4e42764e17aa2bed3a85b39f68673c03 (diff) | |
Merge pull request #4175 from yang-g/tcp_refactor
Refactor security connector and handshake
Diffstat (limited to 'src/core/surface')
| -rw-r--r-- | src/core/surface/channel_create.c | 4 | ||||
| -rw-r--r-- | src/core/surface/lame_client.c | 3 | ||||
| -rw-r--r-- | src/core/surface/secure_channel_create.c | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/core/surface/channel_create.c b/src/core/surface/channel_create.c index 6d40780497..aceb932742 100644 --- a/src/core/surface/channel_create.c +++ b/src/core/surface/channel_create.c @@ -99,8 +99,8 @@ static void connected(grpc_exec_ctx *exec_ctx, void *arg, int success) { grpc_endpoint_write(exec_ctx, tcp, &c->initial_string_buffer, &c->initial_string_sent); } - c->result->transport = grpc_create_chttp2_transport( - exec_ctx, c->args.channel_args, tcp, 1); + c->result->transport = + grpc_create_chttp2_transport(exec_ctx, c->args.channel_args, tcp, 1); grpc_chttp2_transport_start_reading(exec_ctx, c->result->transport, NULL, 0); GPR_ASSERT(c->result->transport); diff --git a/src/core/surface/lame_client.c b/src/core/surface/lame_client.c index 0247116ebb..4a55544ac1 100644 --- a/src/core/surface/lame_client.c +++ b/src/core/surface/lame_client.c @@ -103,8 +103,7 @@ static void lame_start_transport_op(grpc_exec_ctx *exec_ctx, } static void init_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - grpc_call_element_args *args) { -} + grpc_call_element_args *args) {} static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem) {} diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index 374b44b406..c9a54d9237 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -88,7 +88,6 @@ static void connector_unref(grpc_exec_ctx *exec_ctx, grpc_connector *con) { static void on_secure_handshake_done(grpc_exec_ctx *exec_ctx, void *arg, grpc_security_status status, - grpc_endpoint *wrapped_endpoint, grpc_endpoint *secure_endpoint) { connector *c = arg; grpc_closure *notify; @@ -97,13 +96,11 @@ static void on_secure_handshake_done(grpc_exec_ctx *exec_ctx, void *arg, memset(c->result, 0, sizeof(*c->result)); gpr_mu_unlock(&c->mu); } else if (status != GRPC_SECURITY_OK) { - GPR_ASSERT(c->connecting_endpoint == wrapped_endpoint); gpr_log(GPR_ERROR, "Secure handshake failed with error %d.", status); memset(c->result, 0, sizeof(*c->result)); c->connecting_endpoint = NULL; gpr_mu_unlock(&c->mu); } else { - GPR_ASSERT(c->connecting_endpoint == wrapped_endpoint); c->connecting_endpoint = NULL; gpr_mu_unlock(&c->mu); c->result->transport = grpc_create_chttp2_transport( |