From: Roger Dingledine <arma@torproject.org>
Date: Sun, 4 Nov 2007 02:06:09 +0000 (+0000)
Subject: avoid sending a request for "keys/fp" (for which we'll get a 400 bad
X-Git-Tag: tor-0.2.0.10-alpha~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5bf61633e3c44ad65a91d90c4002475ddd5ef8e4;p=thirdparty%2Ftor.git

avoid sending a request for "keys/fp" (for which we'll get a 400 bad
request) if we need more v3 certs but we've already got pending requests
for all of them.


svn:r12370
---

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 95e048cb77..93369e157e 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -367,6 +367,12 @@ authority_certs_fetch_missing(networkstatus_vote_t *status, time_t now)
         fp[HEX_DIGEST_LEN+1] = '\0';
         smartlist_add(fps, fp);
       });
+    if (smartlist_len(fps) == 1) {
+      /* we didn't add any: they were all pending */
+      SMARTLIST_FOREACH(fps, char *, cp, tor_free(cp));
+      smartlist_free(fps);
+      goto done;
+    }
     resource = smartlist_join_strings(fps, "", 0, NULL);
     resource[strlen(resource)-1] = '\0';
     SMARTLIST_FOREACH(fps, char *, cp, tor_free(cp));