Browse Source

fix regression introduced by 1a65bdd2

noticed while reviewing hoganrobert/bug1138
Roger Dingledine 14 years ago
parent
commit
b4942e3435
2 changed files with 7 additions and 1 deletions
  1. 6 0
      changes/1a65bdd2-regression
  2. 1 1
      src/or/directory.c

+ 6 - 0
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.

+ 1 - 1
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",