add a TODO item and some comment changes.

svn:r2904

diff --git a/doc/TODO b/doc/TODO
index 400c4c27755fac314fbd69255c2ed3ac6baa963d..1cdb6f3907e823770c49240dc047c4bf69fae1b2 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -50,7 +50,8 @@ N  . Test hibernation a lot.
 Beyond 0.0.9:
    - controller should have 'getinfo' command to query about rephist,
      about rendezvous status, etc.
-   - weasel wants to say 50GB rather than 50000000 in config ints.
+   - Weasel wants to say 50GB rather than 50000000 in config ints.
+   - Nick wants to say "1 hour" instead of 3600 in config ints.
    - Better hibernation flexibility
      - Add hibernation intervals for weeks, days.
      - Start at a time other than 0:00 GMT.

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 2e7c66b74fa0e06993d9ac8544dde74f4c3ac007..a98bca273fd295ffd29fb49e9274919b86a1007e 100644 (file)
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -422,8 +422,7 @@ int circuit_send_next_onion_skin(circuit_t *circ) {
       if(!has_completed_circuit) {
         has_completed_circuit=1;
         log_fn(LOG_NOTICE,"Tor has successfully opened a circuit. Looks like it's working.");
-        /* XXX009 put a count of known routers here */
-        /* XXXX "Put?" Do you mean log, or something else? -NM */
+        /* XXX009 Log a count of known routers here */
       }
       circuit_rep_hist_note_result(circ);
       circuit_has_opened(circ); /* do other actions as necessary */

diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index f9724792465b0990f0337e3783921cdeb8d82cbf..7bff2934d877f6de7ce16bef4837246b1bebb576 100644 (file)
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -206,12 +206,14 @@ update_expected_bandwidth(void)
 {
   uint64_t used;
   uint32_t max_configured = (get_options()->BandwidthRateBytes * 60);
-  /* XXX max_configured will be false if it exceeds
-   * get_options()->AccountingMaxKB*1000, right? -RD
-   * XXX Huh? Why? How? -NM
-   */
 
   if (n_seconds_active_in_interval < 1800) {
+    /* If we haven't gotten enough data last interval, guess that
+     * we'll be used at our maximum capacity.  This is unlikely to be
+     * so, but it will give us an okay first estimate, and we'll stay
+     * up until we send MaxKB kilobytes.  Next interval, we'll choose
+     * our starting time based on how much we sent this interval.
+     */
     expected_bandwidth_usage = max_configured;
   } else {
     used = n_bytes_written_in_interval < n_bytes_read_in_interval ?