[or-cvs] r13047: If we were having problems getting a particular descriptor f (in tor/branches/tor-0_1_2-patches: . src/or)

[arma at seul.org]

Author: arma
Date: 2008-01-07 03:43:52 -0500 (Mon, 07 Jan 2008)
New Revision: 13047

Modified:
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/src/or/routerlist.c
Log:
If we were having problems getting a particular descriptor from the
directory caches, and then we learned about a new descriptor for
that router, we weren't resetting our failure count. Reported
by lodger.


Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2008-01-07 07:54:48 UTC (rev 13046)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2008-01-07 08:43:52 UTC (rev 13047)
@@ -31,6 +31,10 @@
       nonstandard integer types.
     - Don't try to create the datadir when running --verify-config or
       --hash-password. Resolves bug 540.
+    - If we were having problems getting a particular descriptor from the
+      directory caches, and then we learned about a new descriptor for
+      that router, we weren't resetting our failure count. Reported
+      by lodger.
 
 
 Changes in version 0.1.2.18 - 2007-10-28

Modified: tor/branches/tor-0_1_2-patches/src/or/routerlist.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/routerlist.c	2008-01-07 07:54:48 UTC (rev 13046)
+++ tor/branches/tor-0_1_2-patches/src/or/routerlist.c	2008-01-07 08:43:52 UTC (rev 13047)
@@ -3810,7 +3810,7 @@
     memcpy(&rs_out->status, most_recent, sizeof(routerstatus_t));
     /* Copy status info about this router, if we had any before. */
     if ((rs_old = router_get_combined_status_by_digest(lowest))) {
-      if (!memcmp(rs_out->status.descriptor_digest,
+      if (!memcmp(rs_old->status.descriptor_digest,
                   most_recent->descriptor_digest, DIGEST_LEN)) {
         rs_out->n_download_failures = rs_old->n_download_failures;
         rs_out->next_attempt_at = rs_old->next_attempt_at;