[or-cvs] r12401: Also avoid overflow on or_conn->read_bucket (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-11-06 14:54:32 -0500 (Tue, 06 Nov 2007)
New Revision: 12401

Modified:
   tor/trunk/
   tor/trunk/src/or/connection.c
Log:
 r16464@catbus:  nickm | 2007-11-06 14:53:28 -0500
 Also avoid overflow on or_conn->read_bucket



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

Modified: tor/trunk/src/or/connection.c
===================================================================
--- tor/trunk/src/or/connection.c	2007-11-06 19:42:37 UTC (rev 12400)
+++ tor/trunk/src/or/connection.c	2007-11-06 19:54:32 UTC (rev 12401)
@@ -1699,9 +1699,11 @@
     if (connection_speaks_cells(conn)) {
       or_connection_t *or_conn = TO_OR_CONN(conn);
       if (connection_read_bucket_should_increase(or_conn)) {
-        or_conn->read_bucket += or_conn->bandwidthrate*seconds_elapsed;
-        if (or_conn->read_bucket > or_conn->bandwidthburst)
-          or_conn->read_bucket = or_conn->bandwidthburst;
+        connection_bucket_refill_helper(&or_conn->read_bucket,
+                                        or_conn->bandwidthrate,
+                                        or_conn->bandwidthburst,
+                                        seconds_elapsed,
+                                        "or_conn->read_bucket");
         //log_fn(LOG_DEBUG,"Receiver bucket %d now %d.", i,
         //       conn->read_bucket);
       }