From: Roger Dingledine <arma@torproject.org>
Date: Sat, 5 Apr 2003 19:53:45 +0000 (+0000)
Subject: make servers tolerate the dns bug.
X-Git-Tag: tor-0.0.2pre8~245
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=afa95ca47c06232f7395af0f7197eab61e1d91c3;p=thirdparty%2Ftor.git

make servers tolerate the dns bug.


svn:r223
---

diff --git a/src/or/dns.c b/src/or/dns.c
index 362afce16d..0de83775f5 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -540,7 +540,15 @@ static int dns_found_answer(char *question, uint32_t answer, uint32_t valid) {
     return 0;
   }
 
-  assert(resolve->state == CACHE_STATE_PENDING);
+//  assert(resolve->state == CACHE_STATE_PENDING);
+  /* XXX this is a bug which hasn't been found yet. Probably something
+   * about slaves answering questions when they're not supposed to, and
+   * reusing the old question.
+   */
+  if(resolve->state != CACHE_STATE_PENDING) {
+    log(LOG_ERR,"dns_found_answer(): BUG: resolve '%s' in state %d (not pending). Dropping.",question, resolve->state);
+    return 0;
+  }
 
   resolve->answer = ntohl(answer);
   if(valid)