be willing to use nodes in excludeexitnodes as directory mirrors

fixes bug 5623.
This commit is contained in:
Roger Dingledine 2012-04-24 11:26:05 -04:00
parent bdd7e2878b
commit 526beb7be6
2 changed files with 12 additions and 2 deletions

6
changes/bug5623 Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes:
- After we pick a directory mirror, we would refuse to use it if
it's in our ExcludeExitNodes list, resulting in mysterious failures
to bootstrap for people who just wanted to avoid exiting from
certain locations. Fixes bug 5623; bugfix on 0.2.2.25-alpha.

View File

@ -3368,8 +3368,12 @@ connection_ap_can_use_exit(const entry_connection_t *conn, const node_t *exit)
}
}
if (conn->socks_request->command == SOCKS_COMMAND_CONNECT &&
!conn->use_begindir) {
if (conn->use_begindir) {
/* Internal directory fetches do not count as exiting. */
return 1;
}
if (conn->socks_request->command == SOCKS_COMMAND_CONNECT) {
struct in_addr in;
tor_addr_t addr, *addrp = NULL;
addr_policy_result_t r;