diff options
author | 2017-01-17 14:05:25 -0800 | |
---|---|---|
committer | 2017-01-17 14:05:25 -0800 | |
commit | c0d7d67dfbe4f7d539e64365c4111b748285668f (patch) | |
tree | 6055fd71411bf6ac25b235b7a777bf79c13ddfd3 /src/core/ext/transport/chttp2/client | |
parent | c16080c31069b34a4608a9b522cb5252f0d488a7 (diff) | |
parent | 31f2dd43e22f41c89cfdd3d25002972247d01954 (diff) |
Merge pull request #9318 from markdroth/subchannel_addr_channel_arg
Store subchannel address in a channel arg.
Diffstat (limited to 'src/core/ext/transport/chttp2/client')
-rw-r--r-- | src/core/ext/transport/chttp2/client/chttp2_connector.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.c b/src/core/ext/transport/chttp2/client/chttp2_connector.c index 2c5dfaea60..013c96dc70 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.c +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.c @@ -43,6 +43,7 @@ #include "src/core/ext/client_channel/connector.h" #include "src/core/ext/client_channel/http_connect_handshaker.h" +#include "src/core/ext/client_channel/subchannel.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/handshaker.h" @@ -220,6 +221,8 @@ static void chttp2_connector_connect(grpc_exec_ctx *exec_ctx, grpc_connect_out_args *result, grpc_closure *notify) { chttp2_connector *c = (chttp2_connector *)con; + grpc_resolved_address addr; + grpc_get_subchannel_address_arg(args->channel_args, &addr); gpr_mu_lock(&c->mu); GPR_ASSERT(c->notify == NULL); c->notify = notify; @@ -231,8 +234,8 @@ static void chttp2_connector_connect(grpc_exec_ctx *exec_ctx, GPR_ASSERT(!c->connecting); c->connecting = true; grpc_tcp_client_connect(exec_ctx, &c->connected, &c->endpoint, - args->interested_parties, args->channel_args, - args->addr, args->deadline); + args->interested_parties, args->channel_args, &addr, + args->deadline); gpr_mu_unlock(&c->mu); } |