[or-cvs] r12493: Fix bug spotted by karsten: when we have no consensus, do no (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-11-14 13:39:15 -0500 (Wed, 14 Nov 2007)
New Revision: 12493

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/routerlist.c
Log:
 r16665 at 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.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r16665] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-11-14 10:39:40 UTC (rev 12492)
+++ tor/trunk/ChangeLog	2007-11-14 18:39:15 UTC (rev 12493)
@@ -3,6 +3,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

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2007-11-14 10:39:40 UTC (rev 12492)
+++ tor/trunk/src/or/routerlist.c	2007-11-14 18:39:15 UTC (rev 12493)
@@ -4472,6 +4472,7 @@
   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);