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
This commit is contained in:
Nick Mathewson 2007-02-25 16:22:36 +00:00
parent 8884ef44d6
commit 938de88e3b
2 changed files with 4 additions and 2 deletions

View File

@ -59,6 +59,8 @@ Changes in version 0.1.2.8-rc - 2007-02-??
DNS request. DNS request.
- Build with recent libevents on platforms that do not define the - Build with recent libevents on platforms that do not define the
nonstandard types "u_int8_t" and friends. nonstandard types "u_int8_t" and friends.
- Correctly detect whether hidden service descriptor downloads are
in-progress. (Fixes bug 399.)
o Minor features (controller): o Minor features (controller):
- Warn the user when an application uses the obsolete binary v0 - Warn the user when an application uses the obsolete binary v0

View File

@ -2062,10 +2062,10 @@ connection_get_by_type_state_rendquery(int type, int state,
!conn->marked_for_close && !conn->marked_for_close &&
(!state || state == conn->state)) { (!state || state == conn->state)) {
if (type == CONN_TYPE_DIR && 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; return conn;
else if (CONN_IS_EDGE(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; return conn;
} }
} }