nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move #9731 checks to start of their functions

Browse Source 
At arma's suggestion.
This commit is contained in:
Nick Mathewson 2013-10-31 14:10:23 -04:00
parent 702c0502cf
commit 96f92f2062
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/connection.c
View File

@ -2684,6 +2684,9 @@ connection_consider_empty_read_buckets(connection_t *conn)
{ {
const char *reason; const char *reason;
if (!connection_is_rate_limited(conn))
return; /* Always okay. */
if (global_read_bucket <= 0) { if (global_read_bucket <= 0) {
reason = "global read bucket exhausted. Pausing."; reason = "global read bucket exhausted. Pausing.";
} else if (connection_counts_as_relayed_traffic(conn, approx_time()) && } else if (connection_counts_as_relayed_traffic(conn, approx_time()) &&
@ -2696,9 +2699,6 @@ connection_consider_empty_read_buckets(connection_t *conn)
} else } else
return; /* all good, no need to stop it */ return; /* all good, no need to stop it */
if (!connection_is_rate_limited(conn))
return; /* Always okay. */
LOG_FN_CONN(conn, (LOG_DEBUG, LD_NET, "%s", reason)); LOG_FN_CONN(conn, (LOG_DEBUG, LD_NET, "%s", reason));
conn->read_blocked_on_bw = 1; conn->read_blocked_on_bw = 1;
connection_stop_reading(conn); connection_stop_reading(conn);