From 8f793c38fbcd885d40adf8312ef1767e172e1be4 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 31 Oct 2013 14:10:23 -0400 Subject: [PATCH] Move other #9731 check to start of its functions At arma's suggestion. Looks like I missed this one. --- src/or/connection.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 210c6582bb..1f6e11fac1 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2711,6 +2711,9 @@ connection_consider_empty_write_buckets(connection_t *conn) { const char *reason; + if (!connection_is_rate_limited(conn)) + return; /* Always okay. */ + if (global_write_bucket <= 0) { reason = "global write bucket exhausted. Pausing."; } else if (connection_counts_as_relayed_traffic(conn, approx_time()) && @@ -2723,9 +2726,6 @@ connection_consider_empty_write_buckets(connection_t *conn) } else 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)); conn->write_blocked_on_bw = 1; connection_stop_writing(conn);