|
|
|
@ -74,7 +74,7 @@ typedef struct { |
|
|
|
|
grpc_handshake_manager *handshake_mgr; |
|
|
|
|
|
|
|
|
|
// TODO(roth): Remove once we eliminate on_secure_handshake_done().
|
|
|
|
|
grpc_channel_args* tmp_args; |
|
|
|
|
grpc_channel_args *tmp_args; |
|
|
|
|
} connector; |
|
|
|
|
|
|
|
|
|
static void connector_ref(grpc_connector *con) { |
|
|
|
@ -117,8 +117,8 @@ static void on_secure_handshake_done(grpc_exec_ctx *exec_ctx, void *arg, |
|
|
|
|
grpc_chttp2_transport_start_reading(exec_ctx, c->result->transport, NULL, |
|
|
|
|
0); |
|
|
|
|
auth_context_arg = grpc_auth_context_to_arg(auth_context); |
|
|
|
|
c->result->channel_args = grpc_channel_args_copy_and_add( |
|
|
|
|
c->tmp_args, &auth_context_arg, 1); |
|
|
|
|
c->result->channel_args = |
|
|
|
|
grpc_channel_args_copy_and_add(c->tmp_args, &auth_context_arg, 1); |
|
|
|
|
} |
|
|
|
|
grpc_closure *notify = c->notify; |
|
|
|
|
c->notify = NULL; |
|
|
|
@ -126,7 +126,7 @@ static void on_secure_handshake_done(grpc_exec_ctx *exec_ctx, void *arg, |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static void on_handshake_done(grpc_exec_ctx *exec_ctx, grpc_endpoint *endpoint, |
|
|
|
|
grpc_channel_args* args, void *user_data) { |
|
|
|
|
grpc_channel_args *args, void *user_data) { |
|
|
|
|
connector *c = user_data; |
|
|
|
|
// TODO(roth, jboeuf): Convert security connector handshaking to use new
|
|
|
|
|
// handshake API, and then move the code from on_secure_handshake_done()
|
|
|
|
@ -140,10 +140,9 @@ static void on_handshake_done(grpc_exec_ctx *exec_ctx, grpc_endpoint *endpoint, |
|
|
|
|
static void on_initial_connect_string_sent(grpc_exec_ctx *exec_ctx, void *arg, |
|
|
|
|
grpc_error *error) { |
|
|
|
|
connector *c = arg; |
|
|
|
|
grpc_handshake_manager_do_handshake(exec_ctx, c->handshake_mgr, |
|
|
|
|
c->connecting_endpoint, |
|
|
|
|
c->args.channel_args, c->args.deadline, |
|
|
|
|
on_handshake_done, c); |
|
|
|
|
grpc_handshake_manager_do_handshake( |
|
|
|
|
exec_ctx, c->handshake_mgr, c->connecting_endpoint, c->args.channel_args, |
|
|
|
|
c->args.deadline, on_handshake_done, c); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static void connected(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { |
|
|
|
@ -163,10 +162,9 @@ static void connected(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { |
|
|
|
|
grpc_endpoint_write(exec_ctx, tcp, &c->initial_string_buffer, |
|
|
|
|
&c->initial_string_sent); |
|
|
|
|
} else { |
|
|
|
|
grpc_handshake_manager_do_handshake(exec_ctx, c->handshake_mgr, tcp, |
|
|
|
|
c->args.channel_args, |
|
|
|
|
c->args.deadline, on_handshake_done, |
|
|
|
|
c); |
|
|
|
|
grpc_handshake_manager_do_handshake( |
|
|
|
|
exec_ctx, c->handshake_mgr, tcp, c->args.channel_args, |
|
|
|
|
c->args.deadline, on_handshake_done, c); |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
memset(c->result, 0, sizeof(*c->result)); |
|
|
|
|