[or-cvs] r9358: Answer questions from r9348. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-01-15 16:44:59 -0500 (Mon, 15 Jan 2007)
New Revision: 9358

Modified:
   tor/trunk/
   tor/trunk/src/or/dns.c
Log:
 r11973 at Kushana:  nickm | 2007-01-15 16:43:25 -0500
 Answer questions from r9348.



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

Modified: tor/trunk/src/or/dns.c
===================================================================
--- tor/trunk/src/or/dns.c	2007-01-15 21:21:21 UTC (rev 9357)
+++ tor/trunk/src/or/dns.c	2007-01-15 21:44:59 UTC (rev 9358)
@@ -193,9 +193,7 @@
   } else if (!strcmpstart(msg, "Nameserver ") &&
              (cp=strstr(msg, " is back up"))) {
     char *ns = tor_strndup(msg+11, cp-(msg+11));
-    /* XXX012 we should set warn=0 if some nameservers were
-     * already up -- so we only shout when we actually change
-     * a meaningful state. */
+    warn = 0; /* It's never a warning when a nameserver comes back up. */
     control_event_server_status(LOG_NOTICE,
                                 "NAMESERVER_STATUS NS=%s STATUS=UP", ns);
     tor_free(ns);
@@ -1692,6 +1690,9 @@
     /* XXX012 the above warning triggers sometimes on my exit
      * node, with "error 1". Is there anything the user can do to
      * resolve this? -RD */
+    /* XXX012 Are you sure I didn't fix that in version r9336 with
+     * ServerDNSAllowNonRFC953Addreesses? If it's still not working,
+     * let me know which addresses are breaking. -NM */
     if (exitconn->_base.purpose == EXIT_PURPOSE_RESOLVE) {
       if (evdns_err_is_transient(r))
         send_resolved_cell(exitconn, circ, RESOLVED_TYPE_ERROR_TRANSIENT);