[tor-commits] [tor/master] Remove assert_all_pending_dns_resolves_ok().

[nickm at torproject.org]

commit f739aa79620ad47051c4fd5f7e576899da7e80b5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 19 12:27:49 2020 -0500

    Remove assert_all_pending_dns_resolves_ok().
    
    It hasn't been used since 2009.
---
 src/core/mainloop/mainloop.c |  1 -
 src/feature/relay/dns.c      | 19 -------------------
 src/feature/relay/dns.h      |  1 -
 3 files changed, 21 deletions(-)

diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c
index 260de181e..e4e17f6b7 100644
--- a/src/core/mainloop/mainloop.c
+++ b/src/core/mainloop/mainloop.c
@@ -966,7 +966,6 @@ conn_close_if_marked(int i)
     return 0; /* nothing to see here, move along */
   now = time(NULL);
   assert_connection_ok(conn, now);
-  /* assert_all_pending_dns_resolves_ok(); */
 
   log_debug(LD_NET,"Cleaning up connection (fd "TOR_SOCKET_T_FORMAT").",
             conn->s);
diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c
index 5f4bddab9..3ff1378df 100644
--- a/src/feature/relay/dns.c
+++ b/src/feature/relay/dns.c
@@ -971,25 +971,6 @@ assert_connection_edge_not_dns_pending(edge_connection_t *conn)
 #endif /* 1 */
 }
 
-/** Log an error and abort if any connection waiting for a DNS resolve is
- * corrupted. */
-void
-assert_all_pending_dns_resolves_ok(void)
-{
-  pending_connection_t *pend;
-  cached_resolve_t **resolve;
-
-  HT_FOREACH(resolve, cache_map, &cache_root) {
-    for (pend = (*resolve)->pending_connections;
-         pend;
-         pend = pend->next) {
-      assert_connection_ok(TO_CONN(pend->conn), 0);
-      tor_assert(!SOCKET_OK(pend->conn->base_.s));
-      tor_assert(!connection_in_array(TO_CONN(pend->conn)));
-    }
-  }
-}
-
 /** Remove <b>conn</b> from the list of connections waiting for conn-\>address.
  */
 void
diff --git a/src/feature/relay/dns.h b/src/feature/relay/dns.h
index 70abaf138..462cc6361 100644
--- a/src/feature/relay/dns.h
+++ b/src/feature/relay/dns.h
@@ -19,7 +19,6 @@ int has_dns_init_failed(void);
 int dns_reset(void);
 void connection_dns_remove(edge_connection_t *conn);
 void assert_connection_edge_not_dns_pending(edge_connection_t *conn);
-void assert_all_pending_dns_resolves_ok(void);
 MOCK_DECL(void,dns_cancel_pending_resolve,(const char *question));
 int dns_resolve(edge_connection_t *exitconn);
 int dns_seems_to_be_broken(void);