From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 25 Feb 2007 16:22:36 +0000 (+0000)
Subject:  r11942@catbus:  nickm | 2007-02-25 11:22:12 -0500
X-Git-Tag: tor-0.1.2.8-beta~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=938de88e3bc259535856c1571003ad0c9e00e897;p=thirdparty%2Ftor.git

 r11942@catbus:  nickm | 2007-02-25 11:22:12 -0500
 Fix connection_get_by_type_state_rendquery(): This has been bogus for most of 0.1.2.x.  Thanks to Karsten Loesing for finding the bug; fixes bug 399.


svn:r9651
---

diff --git a/ChangeLog b/ChangeLog
index 6cb36cb443..1d8c09251e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,6 +59,8 @@ Changes in version 0.1.2.8-rc - 2007-02-??
       DNS request.
     - Build with recent libevents on platforms that do not define the
       nonstandard types "u_int8_t" and friends.
+    - Correctly detect whether hidden service descriptor downloads are
+      in-progress. (Fixes bug 399.)
 
   o Minor features (controller):
     - Warn the user when an application uses the obsolete binary v0
diff --git a/src/or/connection.c b/src/or/connection.c
index 29d27c0437..b8aa3df981 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -2062,10 +2062,10 @@ connection_get_by_type_state_rendquery(int type, int state,
         !conn->marked_for_close &&
         (!state || state == conn->state)) {
       if (type == CONN_TYPE_DIR &&
-          rend_cmp_service_ids(rendquery, TO_DIR_CONN(conn)->rend_query))
+          !rend_cmp_service_ids(rendquery, TO_DIR_CONN(conn)->rend_query))
         return conn;
       else if (CONN_IS_EDGE(conn) &&
-               rend_cmp_service_ids(rendquery, TO_EDGE_CONN(conn)->rend_query))
+              !rend_cmp_service_ids(rendquery, TO_EDGE_CONN(conn)->rend_query))
         return conn;
     }
   }