diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-07-21 22:02:58 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-07-21 22:02:58 +0000 |
| commit | 370608cc1edb8f9a11d70a0e8556c61aff73ea05 (patch) | |
| tree | c00c9ee78ecc56d67e4f3e25989ff127479181ee | |
| parent | 5b85b474068b1de034e76ade846cc77030b3554b (diff) | |
| download | tor-370608cc1edb8f9a11d70a0e8556c61aff73ea05.tar.gz tor-370608cc1edb8f9a11d70a0e8556c61aff73ea05.zip | |
These asserts will either cause spurious crashes or help debug the pend->conn->s == -1 issue.
svn:r6803
| -rw-r--r-- | trunk/src/or/dns.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/trunk/src/or/dns.c b/trunk/src/or/dns.c index fe02811695..d0545f19e9 100644 --- a/trunk/src/or/dns.c +++ b/trunk/src/or/dns.c @@ -551,6 +551,7 @@ dns_cancel_pending_resolve(char *address) pend = resolve->pending_connections; pend->conn->state = EXIT_CONN_STATE_RESOLVEFAILED; pendconn = pend->conn; + assert_connection_ok(pendconn, 0); tor_assert(pendconn->s == -1); if (!pendconn->marked_for_close) { connection_edge_end(pendconn, END_STREAM_REASON_RESOURCELIMIT, @@ -726,6 +727,7 @@ assign_to_dnsworker(connection_t *exitconn) unsigned char len; tor_assert(exitconn->state == EXIT_CONN_STATE_RESOLVING); + assert_connection_ok(exitconn, 0); tor_assert(exitconn->s == -1); /* respawn here, to be sure there are enough */ @@ -1200,7 +1202,6 @@ assert_resolve_ok(cached_resolve_t *resolve) tor_assert(resolve->magic == CACHED_RESOLVE_MAGIC); tor_assert(strlen(resolve->address) < MAX_ADDRESSLEN); tor_assert(! resolve->next || resolve->next->magic == CACHED_RESOLVE_MAGIC); - } static void |