Revert "Switch between fallback and authority when auth cert fetch fails"

This reverts commit 92d7ee08b8c51b4b29f68c6d00ca4aa91ea5a66b.

diff --git a/changes/bug18816 b/changes/bug18816
index 05455120c0717628bee7f544ecaba4a0938cf2f8..7265f5ab3f2fd8bd4a2960b1da59870fc7e1eb29 100644 (file)
--- a/changes/bug18816
+++ b/changes/bug18816
@@ -1,6 +1,4 @@
   o Minor bugfix (bootstrap):
     - Consistently use the consensus download schedule for
       authority certificates.
-    - When downloading authority certificates fails, switch from
-      using a fallback to using an authority.
       Resolves ticket 18816; fix on fddb814fe in 0.2.4.13-alpha.

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 31693437e1182fdf86e4ee3b8ece19de3bd7f669..85e9e7d83470e78a1186bd3e443bacce582a9a0f 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -912,14 +912,11 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now)
     } SMARTLIST_FOREACH_END(d);
 
     if (smartlist_len(fps) > 1) {
-      static int want_auth = 0;
       resource = smartlist_join_strings(fps, "", 0, NULL);
+      /* XXX - do we want certs from authorities or mirrors? - teor */
       directory_get_from_dirserver(DIR_PURPOSE_FETCH_CERTIFICATE, 0,
                                    resource, PDS_RETRY_IF_NO_SERVERS,
-                                   want_auth ? DL_WANT_AUTHORITY
-                                             : DL_WANT_ANY_DIRSERVER);
-      /* on failure, swap between using fallbacks and authorities */
-      want_auth = !want_auth;
+                                   DL_WANT_ANY_DIRSERVER);
       tor_free(resource);
     }
     /* else we didn't add any: they were all pending */
@@ -961,14 +958,11 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now)
     } SMARTLIST_FOREACH_END(d);
 
     if (smartlist_len(fp_pairs) > 1) {
-      static int want_auth = 0;
       resource = smartlist_join_strings(fp_pairs, "", 0, NULL);
+      /* XXX - do we want certs from authorities or mirrors? - teor */
       directory_get_from_dirserver(DIR_PURPOSE_FETCH_CERTIFICATE, 0,
                                    resource, PDS_RETRY_IF_NO_SERVERS,
-                                   want_auth ? DL_WANT_AUTHORITY
-                                             : DL_WANT_ANY_DIRSERVER);
-      /* on failure, swap between using fallbacks and authorities */
-      want_auth = !want_auth;
+                                   DL_WANT_ANY_DIRSERVER);
       tor_free(resource);
     }
     /* else they were all pending */