[or-cvs] r9201: Partial solution to 326: downgrade single-nameserver failure (in tor/trunk: . doc src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2006-12-28 16:29:26 -0500 (Thu, 28 Dec 2006)
New Revision: 9201

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/doc/TODO
   tor/trunk/src/or/dns.c
Log:
 r11725@Kushana:  nickm | 2006-12-28 14:44:56 -0500
 Partial solution to 326: downgrade single-nameserver failures to INFO.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r11725] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2006-12-28 21:29:20 UTC (rev 9200)
+++ tor/trunk/ChangeLog	2006-12-28 21:29:26 UTC (rev 9201)
@@ -121,6 +121,8 @@
       Edman.
     - Removed the supposedly misleading error message mentioned in Bug #294.
       Patch from Matt Edman.
+    - Stop warning when a single nameserver fails: only warn when _all_ of
+      our nameservers have failed.  (Part of a solution to bug #326.)
 
   o Controller features:
     - Have GETINFO dir/status/* work on hosts with DirPort disabled.

Modified: tor/trunk/doc/TODO
===================================================================
--- tor/trunk/doc/TODO	2006-12-28 21:29:20 UTC (rev 9200)
+++ tor/trunk/doc/TODO	2006-12-28 21:29:26 UTC (rev 9201)
@@ -100,7 +100,7 @@
         o Cache answers client-side
         o Add to Tor-resolve.py
         o Add to tor-resolve
-d   - Be a DNS proxy.
+    D Be a DNS proxy.
     o Check for invalid characters in hostnames before trying to resolve
       them.  (This will help catch attempts do to mean things to our DNS
       server, and bad software that tries to do DNS lookups on whole URLs.)
@@ -113,15 +113,16 @@
     o Bug 363: Warn and die if we can't find a nameserver and we're running a
       server; don't fall back to 127.0.0.1.
     o Re-check dns when we change IP addresses, rather than every 12 hours
-    - Bug 326: Give fewer error messages from nameservers. 
-      - Only warn when _all_ nameservers are down; otherwise info.
+    . Bug 326: Give fewer error messages from nameservers.
+      o Only warn when _all_ nameservers are down; otherwise info.
       - Increase timeout; what's industry standard?
         - Alternatively, raise timeout when nameserver dies but comes back
           quickly?
       - Don't believe that our sole nameserver is dead?  or, not until more
         failures than it would take to think one of several nameservers was
         dead?
-      - Possibly, don't warn until second retry of a nameserver gets no
+        - easy: adjust global_max_nameserver_timeout / global_timeout.
+      X Possibly, don't warn until second retry of a nameserver gets no
         answer?
       - warn if all of your nameservers go down and stay down for like
         5 minutes.
@@ -410,8 +411,6 @@
       - Allow EXTENDCIRCUIT to unknown server.
       - We need some way to adjust server status, and to tell tor not to
         download directories/network-status, and a way to force a download.
-      - It would be nice to request address lookups from the controller
-        without using SOCKS.
       - Make everything work with hidden services
   - Directory system improvements
     - config option to publish what ports you listen on, beyond
@@ -419,6 +418,12 @@
       - Parse this.
       - Relay this in networkstatus.
 
+  - Be a DNS proxy.
+    - Need a way to request address lookups (and allocate a stream ID for
+      them) without having a corresponding client socket.
+      - Once this is done, it would be nice to have a way to request address
+        lookups from the controller without using SOCKS.
+
 Future version:
   - Configuration format really wants sections.
   - Good RBL substitute.

Modified: tor/trunk/src/or/dns.c
===================================================================
--- tor/trunk/src/or/dns.c	2006-12-28 21:29:20 UTC (rev 9200)
+++ tor/trunk/src/or/dns.c	2006-12-28 21:29:26 UTC (rev 9201)
@@ -178,6 +178,12 @@
   } else if (!strcmpstart(msg, "Search: ")) {
     return;
   }
+  if (!strcmpstart(msg, "Nameserver ") && strstr(msg, " has failed: ")) {
+    /* Don't warn about a single failed nameserver; we'll warn with 'all
+     * nameservers have failed' if we're completely out of nameservers;
+     * otherwise, the situation is tolerable. */
+    warn = 0;
+  }
   log(warn?LOG_WARN:LOG_INFO, LD_EXIT, "eventdns: %s", msg);
 }
 #endif