[tor-commits] [tor/master] tab-man returneth (this time using the name 'rob')

arma at torproject.org arma at torproject.org
Fri Jun 15 07:28:47 UTC 2012


commit 5625812f9abc5f13dbaa12e89553ac636e23794d
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri Jun 15 03:28:18 2012 -0400

    tab-man returneth (this time using the name 'rob')
---
 src/or/main.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/or/main.c b/src/or/main.c
index 5c5dbf1..d9d64ce 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -849,11 +849,12 @@ conn_close_if_marked(int i)
                            (int)conn->s));
         conn->timestamp_lastwritten = now; /* reset so we can flush more */
       } else if (sz == 0) { /* retval is also 0 */
-    	/* Connection must flush before closing, but it's being rate-limited.
-    	   Let's remove from Libevent, and mark it as blocked on bandwidth so it
-    	   will be re-added on next token bucket refill. Prevents busy Libevent
-    	   loops where we keep ending up here and returning 0 until we are no
-    	   longer blocked on bandwidth. */
+        /* Connection must flush before closing, but it's being rate-limited.
+         * Let's remove from Libevent, and mark it as blocked on bandwidth
+         * so it will be re-added on next token bucket refill. Prevents
+         * busy Libevent loops where we keep ending up here and returning
+         * 0 until we are no longer blocked on bandwidth.
+         */
         if (connection_is_writing(conn)) {
           conn->write_blocked_on_bw = 1;
           connection_stop_writing(conn);



More information about the tor-commits mailing list