From: Roger Dingledine Date: Sun, 12 Sep 2010 04:20:00 +0000 (-0400) Subject: fix regression introduced by 1a65bdd2 X-Git-Tag: tor-0.2.2.16-alpha~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4942e34352dbe5dc3f3b4e0da22f402a4452ca9;p=thirdparty%2Ftor.git fix regression introduced by 1a65bdd2 noticed while reviewing hoganrobert/bug1138 --- diff --git a/changes/1a65bdd2-regression b/changes/1a65bdd2-regression new file mode 100644 index 0000000000..0a7436d812 --- /dev/null +++ b/changes/1a65bdd2-regression @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Fix a regression introduced in 0.2.2.7-alpha that marked relays + down if a directory fetch fails and you've configured either + bridges or EntryNodes. The intent was to mark the relay as down + _unless_ you're using bridges or EntryNodes, since if you are + then you could quickly run out of entry points. diff --git a/src/or/directory.c b/src/or/directory.c index a3e575ac97..e9fcb5ee17 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -582,7 +582,7 @@ connection_dir_request_failed(dir_connection_t *conn) if (directory_conn_is_self_reachability_test(conn)) { return; /* this was a test fetch. don't retry. */ } - if (entry_list_is_constrained(get_options())) + if (!entry_list_is_constrained(get_options())) router_set_status(conn->identity_digest, 0); /* don't try him again */ if (conn->_base.purpose == DIR_PURPOSE_FETCH_V2_NETWORKSTATUS) { log_info(LD_DIR, "Giving up on directory server at '%s'; retrying",