diff options
| author |  yihuaz <yihuaz@google.com> | 2018-10-11 14:49:05 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-10-11 14:49:05 -0700 |
| commit | a382824726cf910ecaeb6fd30a9415ad9ddcb89c (patch) | |
| tree | 1b067c22a1ae356a8356dd053b413488bff54b81 /src/core/ext/transport/chttp2/server | |
| parent | 0be291351c3d4608718c43c58a7253ce48f06660 (diff) | |
| parent | 70a6c790b97401eca66050d7463880efb7412296 (diff) | |
Merge pull request #16792 from grpc/revert-16791-revert-16695-pass_pollset_set_tsi_handshaker
Revert "Revert "Create and pass pollset_set to ALTS TSI handshaker""
Diffstat (limited to 'src/core/ext/transport/chttp2/server')
| -rw-r--r-- | src/core/ext/transport/chttp2/server/chttp2_server.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index a5fc6062aa..6ed88dfb5e 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -69,6 +69,7 @@ typedef struct { grpc_timer timer; grpc_closure on_timeout; grpc_closure on_receive_settings; + grpc_pollset_set* interested_parties; } server_connection_state; static void server_connection_state_unref( @@ -78,6 +79,9 @@ static void server_connection_state_unref( GRPC_CHTTP2_UNREF_TRANSPORT(connection_state->transport, "receive settings timeout"); } + grpc_pollset_set_del_pollset(connection_state->interested_parties, + connection_state->accepting_pollset); + grpc_pollset_set_destroy(connection_state->interested_parties); gpr_free(connection_state); } } @@ -192,7 +196,11 @@ static void on_accept(void* arg, grpc_endpoint* tcp, connection_state->accepting_pollset = accepting_pollset; connection_state->acceptor = acceptor; connection_state->handshake_mgr = handshake_mgr; + connection_state->interested_parties = grpc_pollset_set_create(); + grpc_pollset_set_add_pollset(connection_state->interested_parties, + connection_state->accepting_pollset); grpc_handshakers_add(HANDSHAKER_SERVER, state->args, + connection_state->interested_parties, connection_state->handshake_mgr); const grpc_arg* timeout_arg = grpc_channel_args_find(state->args, GRPC_ARG_SERVER_HANDSHAKE_TIMEOUT_MS); |