diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-09-28 22:32:38 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-09-28 22:32:38 -0400 |
| commit | 9997676802c140aceddb849090c7b3795fc83361 (patch) | |
| tree | 66cdff441b840e2405f146bc6b32a37cce35849a /src/or/main.c | |
| parent | 7de1caa33f025db5474dba5f7e256d28c5ab4969 (diff) | |
| download | tor-9997676802c140aceddb849090c7b3795fc83361.tar.gz tor-9997676802c140aceddb849090c7b3795fc83361.zip | |
handle ugly edge case in retrying entrynodes
Specifically, a circ attempt that we'd launched while the network was
down could timeout after we've marked our entrynodes up, marking them
back down again. The fix is to annotate as bad the OR conns that were
around before we did the retry, so if a circuit that's attached to them
times out we don't do anything about it.
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c index b59351cf09..582a1c287b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1173,7 +1173,7 @@ run_scheduled_events(time_t now) circuit_expire_old_circuits_serverside(now); /** 5. We do housekeeping for each connection... */ - connection_or_set_bad_connections(); + connection_or_set_bad_connections(NULL, 0); for (i=0;i<smartlist_len(connection_array);i++) { run_connection_housekeeping(i, now); } |