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

Merge remote-tracking branch 'public/bug9731b' into maint-0.2.4

Browse Source
This commit is contained in:
Nick Mathewson 2013-10-31 14:08:28 -04:00
commit db2c2a6909
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug9731 Normal file
View File

@ -0,0 +1,3 @@
o Major bugfixes:
- Do not apply connection_consider_empty_read/write_buckets to
cpuworker connections.

6
src/or/connection.c
View File

@ -2483,6 +2483,9 @@ 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 (conn->type == CONN_TYPE_CPUWORKER)
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);
@ -2507,6 +2510,9 @@ connection_consider_empty_write_buckets(connection_t *conn)
} else } else
return; /* all good, no need to stop it */ return; /* all good, no need to stop it */
if (conn->type == CONN_TYPE_CPUWORKER)
return; /* Always okay. */
LOG_FN_CONN(conn, (LOG_DEBUG, LD_NET, "%s", reason)); LOG_FN_CONN(conn, (LOG_DEBUG, LD_NET, "%s", reason));
conn->write_blocked_on_bw = 1; conn->write_blocked_on_bw = 1;
connection_stop_writing(conn); connection_stop_writing(conn);