diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-07 17:08:42 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-07 17:08:42 -0700 |
| commit | eb36437e85dbc35624102a0414ad9166046ba173 (patch) | |
| tree | 24fe8219be5a701b914837e3f3a0f73a96d17097 /src/core/lib/surface/lame_client.cc | |
| parent | d2f1aa0275bbf7fbb5cc342198baf3cb25e5045f (diff) | |
| parent | 4c40161d7597644b91cc8d225f09b139c7c7f22b (diff) | |
Merge github.com:grpc/grpc into c++lame
Diffstat (limited to 'src/core/lib/surface/lame_client.cc')
| -rw-r--r-- | src/core/lib/surface/lame_client.cc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc index 251b24d670..4616fc5830 100644 --- a/src/core/lib/surface/lame_client.cc +++ b/src/core/lib/surface/lame_client.cc @@ -90,15 +90,17 @@ static void fill_metadata(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, mdb->deadline = gpr_inf_future(GPR_CLOCK_REALTIME); } -static void lame_start_transport_stream_op(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, - grpc_transport_stream_op *op) { - if (op->recv_initial_metadata != NULL) { - fill_metadata(exec_ctx, elem, op->recv_initial_metadata); - } else if (op->recv_trailing_metadata != NULL) { - fill_metadata(exec_ctx, elem, op->recv_trailing_metadata); +static void lame_start_transport_stream_op_batch( + grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + grpc_transport_stream_op_batch *op) { + if (op->recv_initial_metadata) { + fill_metadata(exec_ctx, elem, + op->payload->recv_initial_metadata.recv_initial_metadata); + } else if (op->recv_trailing_metadata) { + fill_metadata(exec_ctx, elem, + op->payload->recv_trailing_metadata.recv_trailing_metadata); } - grpc_transport_stream_op_finish_with_failure( + grpc_transport_stream_op_batch_finish_with_failure( exec_ctx, op, GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel")); } @@ -159,7 +161,7 @@ static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, } // namespace grpc_core extern "C" const grpc_channel_filter grpc_lame_filter = { - grpc_core::lame_start_transport_stream_op, + grpc_core::lame_start_transport_stream_op_batch, grpc_core::lame_start_transport_op, sizeof(grpc_core::CallData), grpc_core::init_call_elem, |