r16665@catbus: nickm | 2007-11-14 13:36:11 -0500

 Fix bug spotted by karsten: when we have no consensus, do not try to continue finding directories for a hidden service.

svn:r12493

diff --git a/ChangeLog b/ChangeLog
index 07bd516195ce79221be255d6c6813cdc1374b08c..c7cd26d2cc767b50003d8260d7c843396fd31173 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@ Changes in version 0.2.0.12-alpha - 2007-11-??
     - Make it build on OpenBSD again. Patch from tup.
     - Substitute BINDIR and LOCALSTATEDIR in scripts.  Fixes packaging.
 
+  o Minor bugfixes:
+    - When we're lacking a consensus, don't try to perform rendezvous
+      operations.  (Bug spotted by Karsten)
+
+
 Changes in version 0.2.0.11-alpha - 2007-11-12
   o Security fixes:
     - Exit policies now reject connections that are addressed to a

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 8a630b50450e47dfc76bdd6e95236c31a6cf6c3d..d9b84dbd8d2fb3ac9cbe4277fd0189b57b045c86 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4472,6 +4472,7 @@ hid_serv_get_responsible_directories(smartlist_t *responsible_dirs,
   if (!c || !smartlist_len(c->routerstatus_list)) {
     log_warn(LD_REND, "We don't have a consensus, so we can't perform v2 "
              "rendezvous operations.");
+    return -1;
   }
   tor_assert(id);
   start = networkstatus_vote_find_entry_idx(c, id, &found);