r15663@catbus: nickm | 2007-10-10 16:35:58 -0400

 Resolve some more voting-related XXXXs.

svn:r11860

diff --git a/src/or/directory.c b/src/or/directory.c
index f41513ca6ddb98cf63ac62be2f2420dc3e225e2f..4ebfa336b37e691f318e34705fd8b90fd58caa3b 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -499,7 +499,7 @@ connection_dir_request_failed(dir_connection_t *conn)
              conn->_base.address);
     connection_dir_download_routerdesc_failed(conn);
   } else if (conn->_base.purpose == DIR_PURPOSE_FETCH_CONSENSUS) {
-    /* XXXX020 NMNM */
+    networkstatus_consensus_download_failed(0);
   } else if (conn->_base.purpose == DIR_PURPOSE_FETCH_CERTIFICATE) {
     log_info(LD_DIR, "Giving up on directory server at '%s'; retrying",
              conn->_base.address);
@@ -1403,7 +1403,6 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
   }
 
   if (conn->_base.purpose == DIR_PURPOSE_FETCH_CONSENSUS) {
-    /* XXXX020 NMNM */;
     if (status_code != 200) {
       log_fn(status_code == 403 ? LOG_INFO : LOG_WARN, LD_DIR,
           "Received http status code %d (%s) from server "
@@ -1420,7 +1419,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
       log_warn(LD_DIR, "Unable to load consensus directory dowloaded from "
                "server '%s:%d'", conn->_base.address, conn->_base.port);
       tor_free(body); tor_free(headers); tor_free(reason);
-      /* XXXX020 NMNM retry. */
+      networkstatus_consensus_download_failed(0);
       return -1;
     }
     log_info(LD_DIR, "Successfully loaded consensus.");

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index ebec20839b48f075abd0242f5f128ee41018fcf2..b10400c3eb5799eb81ef4c8f37c219d3143a52bb 100644 (file)
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -989,6 +989,7 @@ networkstatus_set_current_consensus(const char *consensus, int from_cache,
         }
         authority_certs_fetch_missing(c, now);
       }
+      download_status_reset(&consensus_dl_status); /*XXXX020 not quite right.*/
       return 0;
     } else {
       if (!was_waiting_for_certs)
@@ -999,6 +1000,8 @@ networkstatus_set_current_consensus(const char *consensus, int from_cache,
     }
   }
 
+  download_status_reset(&consensus_dl_status); /*XXXX020 not quite right.*/
+
   /* Are we missing any certificates at all? */
   if (r != 1)
     authority_certs_fetch_missing(c, now);
@@ -1679,7 +1682,6 @@ getinfo_helper_networkstatus(control_connection_t *conn,
 void
 networkstatus_free_all(void)
 {
-  /* XXXX !!!! CALLME */
   if (networkstatus_list) {
     SMARTLIST_FOREACH(networkstatus_list, networkstatus_t *, ns,
                       networkstatus_free(ns));

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 9f5158a918ad1720b1dd8be4569297fd8deeaf21..b0914db54ef5be25f6134d6c90b6081ce9bcdaf4 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1009,7 +1009,6 @@ mark_all_trusteddirservers_up(void)
       }
     });
   }
-  // last_networkstatus_download_attempted = 0; // XXXX !!!!
   router_dir_info_changed();
 }