summaryrefslogtreecommitdiff
path: root/src/or/connection.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-03-20 03:21:51 +0000
committerRoger Dingledine <arma@torproject.org>2007-03-20 03:21:51 +0000
commit93e7627694bc7863d0a1b32e2979bf2f446d3716 (patch)
tree471679b7fbcb7dd89dd0b8f0f97be8203317f049 /src/or/connection.c
parentb4f743562f609792619199007c2d091968f72a71 (diff)
downloadtor-93e7627694bc7863d0a1b32e2979bf2f446d3716.tar.gz
tor-93e7627694bc7863d0a1b32e2979bf2f446d3716.zip
a stopgap measure while we wait for proposal 111: apply the
stricter rate limiting to all OR conns except those that have been touched by local circuits. svn:r9882
Diffstat (limited to 'src/or/connection.c')
-rw-r--r--src/or/connection.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index 41104ba11d..458e39e300 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1119,10 +1119,8 @@ static int write_buckets_empty_last_second = 0;
static int
connection_counts_as_relayed_traffic(connection_t *conn)
{
-#if 0
- if (conn->type == CONN_TYPE_OR && TO_OR_CONN(conn)->bandwidth_class)
+ if (conn->type == CONN_TYPE_OR && !TO_OR_CONN(conn)->client_used)
return 1;
-#endif
if (conn->type == CONN_TYPE_DIR && DIR_CONN_IS_SERVER(conn))
return 1;
return 0;