From: Roger Dingledine <arma@torproject.org>
Date: Fri, 2 Jan 2009 20:46:32 +0000 (+0000)
Subject: take out my IMPOSSIBLE_TO_DOWNLOAD+1 hack
X-Git-Tag: tor-0.2.1.10-alpha~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89d268848f769f761f9cd128aa401c38ab470c74;p=thirdparty%2Ftor.git

take out my IMPOSSIBLE_TO_DOWNLOAD+1 hack


svn:r17850
---

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 8c64f68f7b..e9b89f0863 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -3050,7 +3050,7 @@ fetch_bridge_descriptors(time_t now)
   SMARTLIST_FOREACH_BEGIN(bridge_list, bridge_info_t *, bridge)
     {
       if (!download_status_is_ready(&bridge->fetch_status, now,
-                                    IMPOSSIBLE_TO_DOWNLOAD+1))
+                                    IMPOSSIBLE_TO_DOWNLOAD))
         continue; /* don't bother, no need to retry yet */
 
       /* schedule another fetch as if this one will fail, in case it does */
diff --git a/src/or/directory.c b/src/or/directory.c
index ed2e859dc8..786b9be7c1 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -3349,8 +3349,7 @@ download_status_increment_failure(download_status_t *dls, int status_code,
 
   if (dls->n_download_failures < schedule_len)
     increment = schedule[dls->n_download_failures];
-  else if (dls->n_download_failures == IMPOSSIBLE_TO_DOWNLOAD &&
-           dls->schedule != DL_SCHED_BRIDGE)
+  else if (dls->n_download_failures == IMPOSSIBLE_TO_DOWNLOAD)
     increment = INT_MAX;
   else
     increment = schedule[schedule_len-1];