diff options
| author |  Muxi Yan <mxyan@google.com> | 2018-10-18 09:38:26 -0700 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2018-10-18 09:38:26 -0700 |
| commit | 62693ec1bd0fe0133a3d382ef2e11ffa935e9904 (patch) | |
| tree | f84b6c168f55ef2f4b8661ab64960fb11b0f7d76 /src/core/ext/transport/inproc/inproc_transport.cc | |
| parent | be4ab30899f6ae91e07f02c33297ca462f778296 (diff) | |
| parent | d2704ecca0b6cc43e8dfde6dd64875b4fb71d6cd (diff) | |
Merge remote-tracking branch 'upstream/master' into config-isolation
Diffstat (limited to 'src/core/ext/transport/inproc/inproc_transport.cc')
| -rw-r--r-- | src/core/ext/transport/inproc/inproc_transport.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc index b0ca7f8207..9dbd095843 100644 --- a/src/core/ext/transport/inproc/inproc_transport.cc +++ b/src/core/ext/transport/inproc/inproc_transport.cc @@ -1256,7 +1256,9 @@ grpc_channel* grpc_inproc_channel_create(grpc_server* server, inproc_transports_create(&server_transport, server_args, &client_transport, client_args); - grpc_server_setup_transport(server, server_transport, nullptr, server_args); + // TODO(ncteisen): design and support channelz GetSocket for inproc. + grpc_server_setup_transport(server, server_transport, nullptr, server_args, + 0); grpc_channel* channel = grpc_channel_create( "inproc", client_args, GRPC_CLIENT_DIRECT_CHANNEL, client_transport); |