clean up

include/grpc/impl/codegen/port_platform.h

@@ -360,8 +360,6 @@ typedef unsigned __int64 uint64_t;
    power of two */
 #define GPR_MAX_ALIGNMENT 16
 
-/* #define GRPC_ARES 0 */
-
 #ifndef GRPC_ARES
 #ifdef GPR_WINDOWS
 #define GRPC_ARES 0

src/core/ext/resolver/dns/c_ares/grpc_ares_wrapper.c

@@ -200,18 +200,11 @@ void grpc_resolve_address_ares_impl(grpc_exec_ctx *exec_ctx, const char *name,
                                     grpc_pollset_set *interested_parties,
                                     grpc_closure *on_done,
                                     grpc_resolved_addresses **addrs) {
-  grpc_error *err;
-  if (grpc_customized_resolve_address(name, default_port, addrs, &err) != 0) {
-    grpc_exec_ctx_sched(exec_ctx, on_done, err, NULL);
-    return;
-  }
-  GRPC_ERROR_UNREF(err);
-  err = GRPC_ERROR_NONE;
-
   /* parse name, splitting it into host and port parts */
   char *host;
   char *port;
   gpr_split_host_port(name, &host, &port);
+  grpc_error *err = GRPC_ERROR_NONE;
   if (host == NULL) {
     err = grpc_error_set_str(GRPC_ERROR_CREATE("unparseable host:port"),
                              GRPC_ERROR_STR_TARGET_ADDRESS, name);

src/core/lib/iomgr/resolve_address.h

@@ -67,11 +67,4 @@ extern grpc_error *(*grpc_blocking_resolve_address)(
     const char *name, const char *default_port,
     grpc_resolved_addresses **addresses);
 
-/* Returns 0 by default. If it's overriden and returns value other than 0,
-   grpc_resolve_address will use its result. Result must be freed with
-   grpc_resolved_addresses_destroy. */
-extern int (*grpc_customized_resolve_address)(
-    const char *name, const char *default_port,
-    grpc_resolved_addresses **addresses, grpc_error **error);
-
 #endif /* GRPC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_H */

src/core/lib/iomgr/resolve_address_posix.c

@@ -149,18 +149,6 @@ grpc_error *(*grpc_blocking_resolve_address)(
     const char *name, const char *default_port,
     grpc_resolved_addresses **addresses) = blocking_resolve_address_impl;
 
-static int default_customized_resolve_address_impl(
-    const char *name, const char *default_port,
-    grpc_resolved_addresses **addresses, grpc_error **error) {
-  *error = GRPC_ERROR_NONE;
-  return 0;
-}
-
-int (*grpc_customized_resolve_address)(
-    const char *name, const char *default_port,
-    grpc_resolved_addresses **addresses,
-    grpc_error **error) = default_customized_resolve_address_impl;
-
 typedef struct {
   char *name;
   char *default_port;
@@ -196,15 +184,7 @@ static void resolve_address_impl(grpc_exec_ctx *exec_ctx, const char *name,
                                  grpc_pollset_set *interested_parties,
                                  grpc_closure *on_done,
                                  grpc_resolved_addresses **addrs) {
-  request *r;
-  grpc_error *err;
-
-  if (grpc_customized_resolve_address(name, default_port, addrs, &err) != 0) {
-    grpc_exec_ctx_sched(exec_ctx, on_done, err, NULL);
-    return;
-  }
-
-  r = gpr_malloc(sizeof(request));
+  request *r = gpr_malloc(sizeof(request));
   grpc_closure_init(&r->request_closure, do_request_thread, r);
   r->name = gpr_strdup(name);
   r->default_port = gpr_strdup(default_port);

src/core/lib/iomgr/resolve_address_windows.c

@@ -143,19 +143,6 @@ grpc_error *(*grpc_blocking_resolve_address)(
     const char *name, const char *default_port,
     grpc_resolved_addresses **addresses) = blocking_resolve_address_impl;
 
-static int default_customized_resolve_address_impl(
-    const char *name, const char *default_port,
-    grpc_resolved_addresses **addresses, grpc_error **error) {
-  *addresses = NULL;
-  *error = GRPC_ERROR_CANCELLED;
-  return 0;
-}
-
-int (*grpc_customized_resolve_address)(
-    const char *name, const char *default_port,
-    grpc_resolved_addresses **addresses,
-    grpc_error **error) = default_customized_resolve_address_impl;
-
 /* Callback to be passed to grpc_executor to asynch-ify
  * grpc_blocking_resolve_address */
 static void do_request_thread(grpc_exec_ctx *exec_ctx, void *rp,
@@ -184,16 +171,7 @@ static void resolve_address_impl(grpc_exec_ctx *exec_ctx, const char *name,
                                  const char *default_port,
                                  grpc_closure *on_done,
                                  grpc_resolved_addresses **addresses) {
-  request *r;
-  grpc_error *err;
-
-  if (grpc_customized_resolve_address(name, default_port, addresses, &err) !=
-      0) {
-    grpc_exec_ctx_sched(exec_ctx, on_done, err, NULL);
-    return;
-  }
-
-  r = gpr_malloc(sizeof(request));
+  request *r = gpr_malloc(sizeof(request));
   grpc_closure_init(&r->request_closure, do_request_thread, r);
   r->name = gpr_strdup(name);
   r->default_port = gpr_strdup(default_port);

test/core/client_channel/resolvers/dns_resolver_connectivity_test.c

@@ -45,26 +45,6 @@
 static gpr_mu g_mu;
 static bool g_fail_resolution = true;
 
-// static int my_resolve_address(const char *name, const char *addr,
-//                               grpc_resolved_addresses **addrs,
-//                               grpc_error **error) {
-//   gpr_mu_lock(&g_mu);
-//   GPR_ASSERT(0 == strcmp("test", name));
-//   if (g_fail_resolution) {
-//     g_fail_resolution = false;
-//     gpr_mu_unlock(&g_mu);
-//     *error = GRPC_ERROR_CREATE("Forced Failure");
-//   } else {
-//     gpr_mu_unlock(&g_mu);
-//     *addrs = gpr_malloc(sizeof(**addrs));
-//     (*addrs)->naddrs = 1;
-//     (*addrs)->addrs = gpr_malloc(sizeof(*(*addrs)->addrs));
-//     (*addrs)->addrs[0].len = 123;
-//     *error = GRPC_ERROR_NONE;
-//   }
-//   return 1;
-// }
-
 static void my_resolve_address(grpc_exec_ctx *exec_ctx, const char *addr,
                                const char *default_port,
                                grpc_pollset_set *interested_parties,