diff options
| author |  Yuchen Zeng <zyc@google.com> | 2017-06-04 01:41:15 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2017-06-04 01:41:15 -0700 |
| commit | 3b4bed273cd38964d097cb110f894c9963137af2 (patch) | |
| tree | cdbd3532bb9b90793daea4753004a7a2a1d79649 /test | |
| parent | 24e3bc5510bfee61d9f62feac95fbe32b1267b85 (diff) | |
Cancel the dns lookup in dns_ares_shutdown
Diffstat (limited to 'test')
| -rw-r--r-- | test/core/client_channel/resolvers/dns_resolver_connectivity_test.c | 11 | ||||
| -rw-r--r-- | test/core/end2end/fuzzers/api_fuzzer.c | 10 |
2 files changed, 10 insertions, 11 deletions
diff --git a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c index 35b73a355c..df7a693287 100644 --- a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c +++ b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c @@ -72,12 +72,10 @@ static void my_resolve_address(grpc_exec_ctx *exec_ctx, const char *addr, grpc_closure_sched(exec_ctx, on_done, error); } -static void my_dns_lookup_ares(grpc_exec_ctx *exec_ctx, const char *dns_server, - const char *addr, const char *default_port, - grpc_pollset_set *interested_parties, - grpc_closure *on_done, - grpc_lb_addresses **lb_addrs, - bool check_grpclb) { +static grpc_ares_request *my_dns_lookup_ares( + grpc_exec_ctx *exec_ctx, const char *dns_server, const char *addr, + const char *default_port, grpc_pollset_set *interested_parties, + grpc_closure *on_done, grpc_lb_addresses **lb_addrs, bool check_grpclb) { gpr_mu_lock(&g_mu); GPR_ASSERT(0 == strcmp("test", addr)); grpc_error *error = GRPC_ERROR_NONE; @@ -91,6 +89,7 @@ static void my_dns_lookup_ares(grpc_exec_ctx *exec_ctx, const char *dns_server, grpc_lb_addresses_set_address(*lb_addrs, 0, NULL, 0, NULL, NULL, NULL); } grpc_closure_sched(exec_ctx, on_done, error); + return NULL; } static grpc_resolver *create_resolver(grpc_exec_ctx *exec_ctx, diff --git a/test/core/end2end/fuzzers/api_fuzzer.c b/test/core/end2end/fuzzers/api_fuzzer.c index 32f75f6b7d..c81ff19d76 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.c +++ b/test/core/end2end/fuzzers/api_fuzzer.c @@ -426,11 +426,10 @@ void my_resolve_address(grpc_exec_ctx *exec_ctx, const char *addr, gpr_now(GPR_CLOCK_MONOTONIC)); } -void my_dns_lookup_ares(grpc_exec_ctx *exec_ctx, const char *dns_server, - const char *addr, const char *default_port, - grpc_pollset_set *interested_parties, - grpc_closure *on_done, grpc_lb_addresses **lb_addrs, - bool check_grpclb) { +grpc_ares_request *my_dns_lookup_ares( + grpc_exec_ctx *exec_ctx, const char *dns_server, const char *addr, + const char *default_port, grpc_pollset_set *interested_parties, + grpc_closure *on_done, grpc_lb_addresses **lb_addrs, bool check_grpclb) { addr_req *r = gpr_malloc(sizeof(*r)); r->addr = gpr_strdup(addr); r->on_done = on_done; @@ -441,6 +440,7 @@ void my_dns_lookup_ares(grpc_exec_ctx *exec_ctx, const char *dns_server, gpr_time_from_seconds(1, GPR_TIMESPAN)), grpc_closure_create(finish_resolve, r, grpc_schedule_on_exec_ctx), gpr_now(GPR_CLOCK_MONOTONIC)); + return NULL; } //////////////////////////////////////////////////////////////////////////////// |