diff options
author | 2015-12-03 13:09:54 -0800 | |
---|---|---|
committer | 2015-12-03 13:09:54 -0800 | |
commit | 011e79a271d31de91b0f96d355af0ec4990a5000 (patch) | |
tree | 3032b6909db95b262398acd5f72b5aa346a5844b /test/core/bad_client/bad_client.c | |
parent | ff03847182a1fbd3c36cfafd1c69fdfb11f4b3af (diff) | |
parent | 368a304c940e5379935aa828f3f30d17d7a29fbb (diff) |
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
# Conflicts:
# BUILD
# Makefile
# binding.gyp
# build.yaml
# gRPC.podspec
# tools/doxygen/Doxyfile.core.internal
# tools/run_tests/sources_and_headers.json
# vsprojects/vcxproj/grpc/grpc.vcxproj
# vsprojects/vcxproj/grpc/grpc.vcxproj.filters
# vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
# vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
Diffstat (limited to 'test/core/bad_client/bad_client.c')
-rw-r--r-- | test/core/bad_client/bad_client.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c index ed46e7b009..e1a4b8ed90 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.c @@ -64,14 +64,13 @@ static void done_write(grpc_exec_ctx *exec_ctx, void *arg, int success) { gpr_event_set(&a->done_write, (void *)1); } -static void server_setup_transport(void *ts, grpc_transport *transport, - grpc_mdctx *mdctx) { +static void server_setup_transport(void *ts, grpc_transport *transport) { thd_args *a = ts; static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter}; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_server_setup_transport(&exec_ctx, a->server, transport, extra_filters, - GPR_ARRAY_SIZE(extra_filters), mdctx, + GPR_ARRAY_SIZE(extra_filters), grpc_server_get_channel_args(a->server)); grpc_exec_ctx_finish(&exec_ctx); } @@ -84,7 +83,6 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, gpr_thd_id id; char *hex; grpc_transport *transport; - grpc_mdctx *mdctx = grpc_mdctx_create(); gpr_slice slice = gpr_slice_from_copied_buffer(client_payload, client_payload_length); gpr_slice_buffer outgoing; @@ -113,9 +111,8 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, a.validator = validator; grpc_server_register_completion_queue(a.server, a.cq, NULL); grpc_server_start(a.server); - transport = - grpc_create_chttp2_transport(&exec_ctx, NULL, sfd.server, mdctx, 0); - server_setup_transport(&a, transport, mdctx); + transport = grpc_create_chttp2_transport(&exec_ctx, NULL, sfd.server, 0); + server_setup_transport(&a, transport); grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL, 0); grpc_exec_ctx_finish(&exec_ctx); |