aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar Mark D. Roth <roth@google.com>2016-07-25 11:27:05 -0700
committerGravatar Mark D. Roth <roth@google.com>2016-07-25 11:27:05 -0700
commite106570dc37f2d590033b89427a2c06d7592264b (patch)
treed5932c1e7b193b4f71abfbeb166f2625ecb7a419 /src/core
parent65c6f2c75d3823cb5993bf906b8b323a4c1ea1a8 (diff)
Update API from merge.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/ext/transport/chttp2/client/insecure/channel_create.c4
-rw-r--r--src/core/ext/transport/chttp2/client/secure/secure_channel_create.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create.c b/src/core/ext/transport/chttp2/client/insecure/channel_create.c
index 8f8da7f5ea..f23f77f10f 100644
--- a/src/core/ext/transport/chttp2/client/insecure/channel_create.c
+++ b/src/core/ext/transport/chttp2/client/insecure/channel_create.c
@@ -193,8 +193,8 @@ static grpc_subchannel *client_channel_factory_create_subchannel(
c->handshake_mgr = grpc_handshake_manager_create();
if (f->http_proxy != NULL) {
grpc_handshake_manager_add(
- grpc_http_connect_handshaker_create(f->http_proxy, args->server_name),
- c->handshake_mgr);
+ c->handshake_mgr,
+ grpc_http_connect_handshaker_create(f->http_proxy, args->server_name));
}
args->args = final_args;
s = grpc_subchannel_create(exec_ctx, &c->base, args);
diff --git a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c
index 863051fea4..f3172f6e68 100644
--- a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c
+++ b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c
@@ -262,8 +262,8 @@ static grpc_subchannel *client_channel_factory_create_subchannel(
c->handshake_mgr = grpc_handshake_manager_create();
if (f->http_proxy != NULL) {
grpc_handshake_manager_add(
- grpc_http_connect_handshaker_create(f->http_proxy, args->server_name),
- c->handshake_mgr);
+ c->handshake_mgr,
+ grpc_http_connect_handshaker_create(f->http_proxy, args->server_name));
}
gpr_mu_init(&c->mu);
gpr_ref_init(&c->refs, 1);