We were ignoring our RelayBandwidthRate for the first 30 seconds

after opening a circuit -- even relayed circuits. Bugfix on
0.2.0.3-alpha.

svn:r12638

diff --git a/ChangeLog b/ChangeLog
index d3e6db878fbba62e0f45c01546e74113cd8714fd..d8f5f8e11054d258102ebf1951189e912b6d976b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,8 +5,12 @@ Changes in version 0.2.0.13-alpha - 2007-12-??
       two new guards on startup (bugfix on 0.2.0.9-alpha), and it was
       causing us to discard all our guards on startup if we hadn't been
       running for a few weeks (bugfix on 0.1.2.x). Fixes bug 448.
-    - Start purging old entries from the "rephist" database, and the
-      hidden service descriptor databases, even when DirPort is zero.
+    - Purge old entries from the "rephist" database and the hidden
+      service descriptor databases even when DirPort is zero. Bugfix
+      on 0.1.2.x.
+    - We were ignoring our RelayBandwidthRate for the first 30 seconds
+      after opening a circuit -- even relayed circuits. Bugfix on
+      0.2.0.3-alpha.
 
   o Minor bugfixes:
     - The fix in 0.2.0.12-alpha cleared the "hsdir" flag in v3 network

diff --git a/doc/TODO b/doc/TODO
index 042b8d139068d8862a43f387369685a9516bceb9..7c82600dad555ce02686c2302a62c1cf61b579a4 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -107,7 +107,7 @@ Things we'd like to do in 0.2.0.x:
           it couldn't fetch any network statuses, and never tried again
           even when the network came back and arma clicked on things.
           also 0.2.0.
-        - phobos says relaybandwidth* sometimes don't do what we expect.
+        o phobos says relaybandwidth* sometimes don't do what we expect.
           http://interloper.org/tmp/2007-06-bw-usage.png
           I believe this is the result of confusion about whether to use
           relaybandwidth or bandwidthrate to control bandwidth usage for 

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index a83d43e8f8bd8665c6b8ed3e634907a278b656d5..1f1018a51a94c8bb3fdeba56c5e0e50875009535 100644 (file)
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -506,8 +506,10 @@ circuit_deliver_create_cell(circuit_t *circ, uint8_t cell_type,
   memcpy(cell.payload, payload, ONIONSKIN_CHALLENGE_LEN);
   append_cell_to_circuit_queue(circ, circ->n_conn, &cell, CELL_DIRECTION_OUT);
 
-  /* mark it so it gets better rate limiting treatment. */
-  circ->n_conn->client_used = time(NULL);
+  if (CIRCUIT_IS_ORIGIN(circ)) {
+    /* mark it so it gets better rate limiting treatment. */
+    circ->n_conn->client_used = time(NULL);
+  }
 
   return 0;
 }