diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-09-13 13:37:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-09-13 13:37:53 -0400 |
| commit | 9205552daab22aaa5178f2abbe169bb79f0cf8e3 (patch) | |
| tree | e857bc96370ccfe372647969e3837fdc82ee9944 /src/or/connection.c | |
| parent | 2c877d2da4a989639311de11e4ada8dd03bc8187 (diff) | |
| download | tor-9205552daab22aaa5178f2abbe169bb79f0cf8e3.tar.gz tor-9205552daab22aaa5178f2abbe169bb79f0cf8e3.zip | |
Don't apply read/write buckets to non-limited connections
Fixes bug 9731
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 6e754a0f7a..30ee427e10 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2483,6 +2483,9 @@ connection_consider_empty_read_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->read_blocked_on_bw = 1; connection_stop_reading(conn); @@ -2507,6 +2510,9 @@ 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); |