aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-01-07 08:43:52 +0000
committerRoger Dingledine <arma@torproject.org>2008-01-07 08:43:52 +0000
commit83ac50c2b2ac0e6cf709e19d4e23b1875f73b7f6 (patch)
treebd59c6bc82b4449f13a9df6bea7b3ad989e368ca
parentb5e04c92a927f7b47d22ac4afe4ae55457c0cd97 (diff)
downloadtor-83ac50c2b2ac0e6cf709e19d4e23b1875f73b7f6.tar.gz
tor-83ac50c2b2ac0e6cf709e19d4e23b1875f73b7f6.zip
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. svn:r13047
-rw-r--r--ChangeLog4
-rw-r--r--src/or/routerlist.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 464784b46b..96d1b6cc83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,10 @@ Changes in version 0.1.2.19 - 2008-01-??
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
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 19efac7e90..fe5587522d 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3810,7 +3810,7 @@ routerstatus_list_update_from_networkstatus(time_t now)
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;