[or-cvs] r11860: Resolve some more voting-related XXXXs. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-10-10 20:13:03 -0400 (Wed, 10 Oct 2007)
New Revision: 11860

Modified:
   tor/trunk/
   tor/trunk/src/or/directory.c
   tor/trunk/src/or/networkstatus.c
   tor/trunk/src/or/routerlist.c
Log:
 r15663 at catbus:  nickm | 2007-10-10 16:35:58 -0400
 Resolve some more voting-related XXXXs.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r15663] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2007-10-11 00:13:00 UTC (rev 11859)
+++ tor/trunk/src/or/directory.c	2007-10-11 00:13:03 UTC (rev 11860)
@@ -499,7 +499,7 @@
              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 @@
   }
 
   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 @@
       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.");

Modified: tor/trunk/src/or/networkstatus.c
===================================================================
--- tor/trunk/src/or/networkstatus.c	2007-10-11 00:13:00 UTC (rev 11859)
+++ tor/trunk/src/or/networkstatus.c	2007-10-11 00:13:03 UTC (rev 11860)
@@ -989,6 +989,7 @@
         }
         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 @@
     }
   }
 
+  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 @@
 void
 networkstatus_free_all(void)
 {
-  /* XXXX !!!! CALLME */
   if (networkstatus_list) {
     SMARTLIST_FOREACH(networkstatus_list, networkstatus_t *, ns,
                       networkstatus_free(ns));

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2007-10-11 00:13:00 UTC (rev 11859)
+++ tor/trunk/src/or/routerlist.c	2007-10-11 00:13:03 UTC (rev 11860)
@@ -1009,7 +1009,6 @@
       }
     });
   }
-  // last_networkstatus_download_attempted = 0; // XXXX !!!!
   router_dir_info_changed();
 }