torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add more asserts in dns_found_answer. This may confirm my theory that dns_purge_resolve is the culprit.

Browse Source 
svn:r6922
This commit is contained in:
Nick Mathewson
2006-07-27 17:16:10 +00:00
parent 5227395aba
commit dc2b7e9af0
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/dns.c
+7 -3
View File
@@ -633,9 +633,11 @@ dns_found_answer(const char *address, uint32_t addr, char outcome,
resolve->addr = addr;
resolve->expire = time(NULL) + dns_get_expiry_ttl(ttl);
resolve->ttl = ttl;
assert_resolve_ok(resolve);
insert_resolve(resolve);
return;
}
assert_resolve_ok(resolve);
if (resolve->state != CACHE_STATE_PENDING) {
/* XXXX Maybe update addr? or check addr for consistency? Or let
@@ -661,11 +663,11 @@ dns_found_answer(const char *address, uint32_t addr, char outcome,
while (resolve->pending_connections) {
pend = resolve->pending_connections;
assert_connection_ok(TO_CONN(pend->conn),time(NULL));
pend->conn->_base.addr = resolve->addr;
pend->conn->address_ttl = resolve->ttl;
pendconn = pend->conn; /* don't pass complex things to the
connection_mark_for_close macro */
assert_connection_ok(TO_CONN(pendconn),time(NULL));
pendconn->_base.addr = resolve->addr;
pendconn->address_ttl = resolve->ttl;
if (resolve->state == CACHE_STATE_FAILED) {
/* prevent double-remove. */
@@ -711,6 +713,8 @@ dns_found_answer(const char *address, uint32_t addr, char outcome,
resolve->pending_connections = pend->next;
tor_free(pend);
}
assert_resolve_ok(resolve);
assert_cache_ok();
if (outcome == DNS_RESOLVE_FAILED_TRANSIENT) { /* remove from cache */
dns_purge_resolve(resolve);