Browse Source

r14401@tombo: nickm | 2008-02-22 15:33:42 -0500
Fix a really stupid parthensis error noticed by mwenge.


svn:r13681

Nick Mathewson 17 years ago
parent
commit
7589765ae9
2 changed files with 3 additions and 1 deletions
  1. 2 0
      ChangeLog
  2. 1 1
      src/or/dns.c

+ 2 - 0
ChangeLog

@@ -94,6 +94,8 @@ Changes in version 0.2.0.20-?? - 2008-02-??
       as a "close".  Stop calling closes "unexpected closes": existing
       as a "close".  Stop calling closes "unexpected closes": existing
       Tors don't use SSL_close(), so having a connection close without
       Tors don't use SSL_close(), so having a connection close without
       the TLS shutdown handshake is hardly unexpected.
       the TLS shutdown handshake is hardly unexpected.
+    - Send NAMESERVER_STATUS messages for a single failed nameserver
+      correctly.
 
 
   o Code simplifications and refactoring:
   o Code simplifications and refactoring:
     - Remove the tor_strpartition function: its logic was confused,
     - Remove the tor_strpartition function: its logic was confused,

+ 1 - 1
src/or/dns.c

@@ -156,7 +156,7 @@ evdns_log_cb(int warn, const char *msg)
   }
   }
   if (!strcmpstart(msg, "Nameserver ") && (cp=strstr(msg, " has failed: "))) {
   if (!strcmpstart(msg, "Nameserver ") && (cp=strstr(msg, " has failed: "))) {
     char *ns = tor_strndup(msg+11, cp-(msg+11));
     char *ns = tor_strndup(msg+11, cp-(msg+11));
-    const char *err = strchr(cp, ':'+2);
+    const char *err = strchr(cp, ':')+2;
     tor_assert(err);
     tor_assert(err);
     /* Don't warn about a single failed nameserver; we'll warn with 'all
     /* Don't warn about a single failed nameserver; we'll warn with 'all
      * nameservers have failed' if we're completely out of nameservers;
      * nameservers have failed' if we're completely out of nameservers;