[or-cvs] r16976: {tor} Backport to 0.2.0.x: Apply rovv's fix for bug 824. (in tor/branches/tor-0_2_0-patches: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-09-26 11:31:21 -0400 (Fri, 26 Sep 2008)
New Revision: 16976

Modified:
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/src/or/connection.c
Log:
Backport to 0.2.0.x: Apply rovv's fix for bug 824.

Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2008-09-26 15:30:26 UTC (rev 16975)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2008-09-26 15:31:21 UTC (rev 16976)
@@ -11,6 +11,11 @@
       port 80, we would previously reject the connection. Now, we assume
       the user knows what they were asking for. Fixes bug 752. Bugfix
       on 0.0.9rc5. Diagnosed by BarkerJr.
+    - 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 (??).
 
 
 Changes in version 0.2.0.31 - 2008-09-03

Modified: tor/branches/tor-0_2_0-patches/src/or/connection.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/connection.c	2008-09-26 15:30:26 UTC (rev 16975)
+++ tor/branches/tor-0_2_0-patches/src/or/connection.c	2008-09-26 15:31:21 UTC (rev 16976)
@@ -1718,7 +1718,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,