diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-09-23 22:41:01 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-09-28 19:10:23 -0400 |
| commit | bb22360bad4d19483ff488c9e4a0eae8616fcd81 (patch) | |
| tree | 005c37780ec6ac7f0702e223f2a28ed71c25aea1 /src/or/circuituse.c | |
| parent | 8bac1885729ba995397f673575ed58bbb0d698a8 (diff) | |
| download | tor-bb22360bad4d19483ff488c9e4a0eae8616fcd81.tar.gz tor-bb22360bad4d19483ff488c9e4a0eae8616fcd81.zip | |
optimistically retry EntryNodes on socks request
We used to mark all our known bridges up when they're all down and we
get a new socks request. Now do that when we've set EntryNodes too.
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index e9335b18d6..ee1705b4c9 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1192,11 +1192,13 @@ circuit_get_open_circ_or_launch(edge_connection_t *conn, int severity = LOG_NOTICE; /* FFFF if this is a tunneled directory fetch, don't yell * as loudly. the user doesn't even know it's happening. */ - if (options->UseBridges && bridges_known_but_down()) { + if (entry_list_is_constrained(options) && + entries_known_but_down(options)) { log_fn(severity, LD_APP|LD_DIR, "Application request when we haven't used client functionality " - "lately. Optimistically trying known bridges again."); - bridges_retry_all(); + "lately. Optimistically trying known %s again.", + options->UseBridges ? "bridges" : "entrynodes"); + entries_retry_all(options); } else if (!options->UseBridges || any_bridge_descriptors_known()) { log_fn(severity, LD_APP|LD_DIR, "Application request when we haven't used client functionality " |