[or-cvs] r17850: {tor} take out my IMPOSSIBLE_TO_DOWNLOAD+1 hack (tor/trunk/src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2009-01-02 15:46:32 -0500 (Fri, 02 Jan 2009)
New Revision: 17850

Modified:
   tor/trunk/src/or/circuitbuild.c
   tor/trunk/src/or/directory.c
Log:
take out my IMPOSSIBLE_TO_DOWNLOAD+1 hack


Modified: tor/trunk/src/or/circuitbuild.c
===================================================================
--- tor/trunk/src/or/circuitbuild.c	2009-01-02 20:39:38 UTC (rev 17849)
+++ tor/trunk/src/or/circuitbuild.c	2009-01-02 20:46:32 UTC (rev 17850)
@@ -3050,7 +3050,7 @@
   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 */

Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2009-01-02 20:39:38 UTC (rev 17849)
+++ tor/trunk/src/or/directory.c	2009-01-02 20:46:32 UTC (rev 17850)
@@ -3349,8 +3349,7 @@
 
   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];