[or-cvs] r16975: {tor} Apply rovv's fix for bug 824. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-09-26 11:30:26 -0400 (Fri, 26 Sep 2008)
New Revision: 16975

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/connection.c
Log:
Apply rovv's fix for bug 824.

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-09-26 09:31:59 UTC (rev 16974)
+++ tor/trunk/ChangeLog	2008-09-26 15:30:26 UTC (rev 16975)
@@ -6,7 +6,7 @@
       unable to send INTRODUCE cells to the service, or even (depending
       on the type of authentication) to learn introduction points.  This
       feature raises the bar for certain kinds of active attacks against
-      hidden services.
+      hidden services.  Code by Karsten Loesing.
     - Relays now store and serve v2 hidden service descriptors by default
       (i.e. new default value for HidServDirectoryV2 is 1). This is the
       last step in proposal 114, which aims to make hidden service
@@ -61,6 +61,11 @@
       on 0.0.9rc5. Diagnosed by BarkerJr.
     - If we are not using BEGIN_DIR cells, don't attempt to contact hidden
       service directories with non-open dir port. Bugfix on 0.2.0.10-alpha.
+    - If we overrun our per-second write limits a little, count this as
+      having used up our write allocation for the second, and choke outgoing
+      directory writes.  Previously, we had only counted this when we
+      had met our limits precisely. Fixes bug 824. Patch from by rovv.
+      Bugfix on 0.2.0.x (??).
 
   o Minor features:
     - Update to the "September 1 2008" ip-to-country file.

Modified: tor/trunk/src/or/connection.c
===================================================================
--- tor/trunk/src/or/connection.c	2008-09-26 09:31:59 UTC (rev 16974)
+++ tor/trunk/src/or/connection.c	2008-09-26 15:30:26 UTC (rev 16975)
@@ -1827,7 +1827,7 @@
   tor_assert(seconds_elapsed >= 0);
 
   write_buckets_empty_last_second =
-    global_relayed_write_bucket == 0 || global_write_bucket == 0;
+    global_relayed_write_bucket <= 0 || global_write_bucket <= 0;
 
   /* refill the global buckets */
   connection_bucket_refill_helper(&global_read_bucket,