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 6cb36cb443075724371436219ca19dfca3aca3ea..1d8c09251e341b398b3790792519169a6390fe26 100644 (file)
--- 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 29d27c04373a0c23d929079c12c7396b3b23f7b2..b8aa3df981ca6b819e41fd5e30ab2f51f74bbeae 100644 (file)
--- 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;
     }
   }