1 files changed, 49 insertions, 65 deletions

diff --git a/src/or/directory.c b/src/or/directory.c
index 3752367c4..12c5b189f 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -747,7 +747,7 @@ connection_dir_request_failed(dir_connection_t *conn)
              conn->base_.address);
   } else if (conn->base_.purpose == DIR_PURPOSE_FETCH_MICRODESC) {
     log_info(LD_DIR, "Giving up on downloading microdescriptors from "
-             " directory server at '%s'; will retry", conn->base_.address);
+             "directory server at '%s'; will retry", conn->base_.address);
     connection_dir_download_routerdesc_failed(conn);
   }
 }
@@ -1387,7 +1387,7 @@ directory_send_command(dir_connection_t *conn,
  * so it does. Return 0.
  * Otherwise, return -1.
  */
-static int
+STATIC int
 parse_http_url(const char *headers, char **url)
 {
   char *s, *start, *tmp;
@@ -1416,6 +1416,19 @@ parse_http_url(const char *headers, char **url)
     }
   }
 
+  /* Check if the header is well formed (next sequence
+   * should be HTTP/1.X\r\n). Assumes we're supporting 1.0? */
+  {
+    unsigned minor_ver;
+    char ch;
+    char *e = (char *)eat_whitespace_no_nl(s);
+    if (2 != tor_sscanf(e, "HTTP/1.%u%c", &minor_ver, &ch)) {
+      return -1;
+    }
+    if (ch != '\r')
+      return -1;
+  }
+
   if (s-start < 5 || strcmpstart(start,"/tor/")) { /* need to rewrite it */
     *url = tor_malloc(s - start + 5);
     strlcpy(*url,"/tor", s-start+5);
@@ -1626,8 +1639,9 @@ load_downloaded_routers(const char *body, smartlist_t *which,
 
   added = router_load_routers_from_string(body, NULL, SAVED_NOWHERE, which,
                                   descriptor_digests, buf);
-  control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS,
-                          count_loading_descriptors_progress());
+  if (general)
+    control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS,
+                            count_loading_descriptors_progress());
   return added;
 }
 
@@ -2968,7 +2982,9 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
       tor_addr_t addr;
       if (tor_inet_aton((TO_CONN(conn))->address, &in)) {
         tor_addr_from_ipv4h(&addr, ntohl(in.s_addr));
-        geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, &addr, time(NULL));
+        geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS,
+                               &addr, NULL,
+                               time(NULL));
         geoip_note_ns_response(GEOIP_SUCCESS);
         /* Note that a request for a network status has started, so that we
          * can measure the download time later on. */
@@ -3725,57 +3741,27 @@ dir_networkstatus_download_failed(smartlist_t *failed, int status_code)
   } SMARTLIST_FOREACH_END(fp);
 }
 
-/** Schedule for when servers should download things in general. */
-static const int server_dl_schedule[] = {
-  0, 0, 0, 60, 60, 60*2, 60*5, 60*15, INT_MAX
-};
-/** Schedule for when clients should download things in general. */
-static const int client_dl_schedule[] = {
-  0, 0, 60, 60*5, 60*10, INT_MAX
-};
-/** Schedule for when servers should download consensuses. */
-static const int server_consensus_dl_schedule[] = {
-  0, 0, 60, 60*5, 60*10, 60*30, 60*30, 60*30, 60*30, 60*30, 60*60, 60*60*2
-};
-/** Schedule for when clients should download consensuses. */
-static const int client_consensus_dl_schedule[] = {
-  0, 0, 60, 60*5, 60*10, 60*30, 60*60, 60*60, 60*60, 60*60*3, 60*60*6, 60*60*12
-};
-/** Schedule for when clients should download bridge descriptors. */
-static const int bridge_dl_schedule[] = {
-  60*60, 15*60, 15*60, 60*60
-};
-
-/** Decide which download schedule we want to use, and then return a
- * pointer to it along with a pointer to its length. Helper function for
- * download_status_increment_failure() and download_status_reset(). */
-static void
-find_dl_schedule_and_len(download_status_t *dls, int server,
-                         const int **schedule, size_t *schedule_len)
+/** Decide which download schedule we want to use based on descriptor type
+ * in <b>dls</b> and whether we are acting as directory <b>server</b>, and
+ * then return a list of int pointers defining download delays in seconds.
+ * Helper function for download_status_increment_failure() and
+ * download_status_reset(). */
+static const smartlist_t *
+find_dl_schedule_and_len(download_status_t *dls, int server)
 {
   switch (dls->schedule) {
     case DL_SCHED_GENERIC:
-      if (server) {
-        *schedule = server_dl_schedule;
-        *schedule_len = sizeof(server_dl_schedule)/sizeof(int);
-      } else {
-        *schedule = client_dl_schedule;
-        *schedule_len = sizeof(client_dl_schedule)/sizeof(int);
-      }
-      break;
+      if (server)
+        return get_options()->TestingServerDownloadSchedule;
+      else
+        return get_options()->TestingClientDownloadSchedule;
     case DL_SCHED_CONSENSUS:
-      if (server) {
-        *schedule = server_consensus_dl_schedule;
-        *schedule_len = sizeof(server_consensus_dl_schedule)/sizeof(int);
-      } else {
-        *schedule = client_consensus_dl_schedule;
-        *schedule_len = sizeof(client_consensus_dl_schedule)/sizeof(int);
-      }
-      break;
+      if (server)
+        return get_options()->TestingServerConsensusDownloadSchedule;
+      else
+        return get_options()->TestingClientConsensusDownloadSchedule;
     case DL_SCHED_BRIDGE:
-      *schedule = bridge_dl_schedule;
-      *schedule_len = sizeof(bridge_dl_schedule)/sizeof(int);
-      break;
+      return get_options()->TestingBridgeDownloadSchedule;
     default:
       tor_assert(0);
   }
@@ -3789,8 +3775,7 @@ time_t
 download_status_increment_failure(download_status_t *dls, int status_code,
                                   const char *item, int server, time_t now)
 {
-  const int *schedule;
-  size_t schedule_len;
+  const smartlist_t *schedule;
   int increment;
   tor_assert(dls);
   if (status_code != 503 || server) {
@@ -3798,14 +3783,14 @@ download_status_increment_failure(download_status_t *dls, int status_code,
       ++dls->n_download_failures;
   }
 
-  find_dl_schedule_and_len(dls, server, &schedule, &schedule_len);
+  schedule = find_dl_schedule_and_len(dls, server);
 
-  if (dls->n_download_failures < schedule_len)
-    increment = schedule[dls->n_download_failures];
+  if (dls->n_download_failures < smartlist_len(schedule))
+    increment = *(int *)smartlist_get(schedule, dls->n_download_failures);
   else if (dls->n_download_failures == IMPOSSIBLE_TO_DOWNLOAD)
     increment = INT_MAX;
   else
-    increment = schedule[schedule_len-1];
+    increment = *(int *)smartlist_get(schedule, smartlist_len(schedule) - 1);
 
   if (increment < INT_MAX)
     dls->next_attempt_at = now+increment;
@@ -3838,14 +3823,11 @@ download_status_increment_failure(download_status_t *dls, int status_code,
 void
 download_status_reset(download_status_t *dls)
 {
-  const int *schedule;
-  size_t schedule_len;
-
-  find_dl_schedule_and_len(dls, get_options()->DirPort_set,
-                           &schedule, &schedule_len);
+  const smartlist_t *schedule = find_dl_schedule_and_len(
+                          dls, get_options()->DirPort_set);
 
   dls->n_download_failures = 0;
-  dls->next_attempt_at = time(NULL) + schedule[0];
+  dls->next_attempt_at = time(NULL) + *(int *)smartlist_get(schedule, 0);
 }
 
 /** Return the number of failures on <b>dls</b> since the last success (if
@@ -3890,7 +3872,8 @@ dir_routerdesc_download_failed(smartlist_t *failed, int status_code,
     } else {
       dls = router_get_dl_status_by_descriptor_digest(digest);
     }
-    if (!dls || dls->n_download_failures >= MAX_ROUTERDESC_DOWNLOAD_FAILURES)
+    if (!dls || dls->n_download_failures >=
+                get_options()->TestingDescriptorMaxDownloadTries)
       continue;
     download_status_increment_failure(dls, status_code, cp, server, now);
   } SMARTLIST_FOREACH_END(cp);
@@ -3921,7 +3904,8 @@ dir_microdesc_download_failed(smartlist_t *failed,
     if (!rs)
       continue;
     dls = &rs->dl_status;
-    if (dls->n_download_failures >= MAX_MICRODESC_DOWNLOAD_FAILURES)
+    if (dls->n_download_failures >=
+        get_options()->TestingMicrodescMaxDownloadTries)
       continue;
     {
       char buf[BASE64_DIGEST256_LEN+1];