Skip to content

Commit

Permalink
Remove assert_all_pending_dns_resolves_ok().
Browse files Browse the repository at this point in the history
It hasn't been used since 2009.
  • Loading branch information
nmathewson committed Feb 19, 2020
1 parent 51b470d commit f739aa7
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 21 deletions.
1 change: 0 additions & 1 deletion src/core/mainloop/mainloop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
19 changes: 0 additions & 19 deletions src/feature/relay/dns.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/feature/relay/dns.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit f739aa7

Please sign in to comment.