diff options
| author |  Yihua Zhang <yihuaz@google.com> | 2018-10-12 16:05:51 -0700 |
|---|---|---|
| committer | Yihua Zhang <yihuaz@google.com> | 2018-10-12 16:05:51 -0700 |
| commit | bed575c8b1d88f13464bc65822d62810569063d0 (patch) | |
| tree | 15c39cf7a06c66a45e4390cdb771e11124d2c4d5 /src/core/ext/transport/chttp2 | |
| parent | 57d37ca70fe4f3d9745c161d11dbc30467823eae (diff) | |
Do not pass interested_parties during handshake
Diffstat (limited to 'src/core/ext/transport/chttp2')
| -rw-r--r-- | src/core/ext/transport/chttp2/client/chttp2_connector.cc | 5 | ||||
| -rw-r--r-- | src/core/ext/transport/chttp2/server/chttp2_server.cc | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.cc b/src/core/ext/transport/chttp2/client/chttp2_connector.cc index 5229304fa4..1e9c5ee4d7 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.cc +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.cc @@ -163,9 +163,8 @@ static void start_handshake_locked(chttp2_connector* c) { c->args.interested_parties, c->handshake_mgr); grpc_endpoint_add_to_pollset_set(c->endpoint, c->args.interested_parties); grpc_handshake_manager_do_handshake( - c->handshake_mgr, c->args.interested_parties, c->endpoint, - c->args.channel_args, c->args.deadline, nullptr /* acceptor */, - on_handshake_done, c); + c->handshake_mgr, c->endpoint, c->args.channel_args, c->args.deadline, + nullptr /* acceptor */, on_handshake_done, c); c->endpoint = nullptr; // Endpoint handed off to handshake manager. } diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index 6ed88dfb5e..07b304b320 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -208,10 +208,10 @@ static void on_accept(void* arg, grpc_endpoint* tcp, grpc_core::ExecCtx::Get()->Now() + grpc_channel_arg_get_integer(timeout_arg, {120 * GPR_MS_PER_SEC, 1, INT_MAX}); - grpc_handshake_manager_do_handshake( - connection_state->handshake_mgr, nullptr /* interested_parties */, tcp, - state->args, connection_state->deadline, acceptor, on_handshake_done, - connection_state); + grpc_handshake_manager_do_handshake(connection_state->handshake_mgr, tcp, + state->args, connection_state->deadline, + acceptor, on_handshake_done, + connection_state); } /* Server callback: start listening on our ports */ |