diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-10-10 04:37:38 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-10-10 04:37:38 +0000 |
| commit | cb0dbbcfa593439bee29ff3b125301d58051a095 (patch) | |
| tree | ffca8b383cfda88af54c43faed772a7793250861 /src/or/dns.c | |
| parent | 1f4eafdb9175cf0d472656552875d8eba93d5fef (diff) | |
| download | tor-cb0dbbcfa593439bee29ff3b125301d58051a095.tar tor-cb0dbbcfa593439bee29ff3b125301d58051a095.tar.gz | |
r15621@catbus: nickm | 2007-10-10 00:37:25 -0400
Turns out, Bug 463 was just another "warn about something that is no big deal" thing. Downgrade, comment, and resolve.
svn:r11829
Diffstat (limited to 'src/or/dns.c')
| -rw-r--r-- | src/or/dns.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/or/dns.c b/src/or/dns.c index 64cfcb024..7c52d56f8 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -836,8 +836,15 @@ dns_cancel_pending_resolve(const char *address) return; if (resolve->state != CACHE_STATE_PENDING) { - log_notice(LD_BUG,"Address %s is not pending (state %d). Dropping.", - escaped_safe_str(address), resolve->state); + /* We can get into this state if we never actually created the pending + * resolve, due to finding an earlier cached error or something. Just + * ignore it. */ + if (resolve->pending_connections) { + log_warn(LD_BUG, + "Address %s is not pending but has pending connections!", + escaped_safe_str(address)); + tor_fragile_assert(); + } return; } |