diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-22 17:19:41 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-22 17:19:41 -0500 |
| commit | 491abbc65e535b5308d6c57ab9ab3900ac2dd2d2 (patch) | |
| tree | 63f1dc9a7f92bd931d14cd78aa37fd8ba3a59e81 /src | |
| parent | 7605985b3ff71cee7fabdf023baf298b218d04c1 (diff) | |
| parent | 2392290c1887b732fd2309e57ce04ab71b9b4e69 (diff) | |
| download | tor-491abbc65e535b5308d6c57ab9ab3900ac2dd2d2.tar tor-491abbc65e535b5308d6c57ab9ab3900ac2dd2d2.tar.gz | |
Merge remote branch 'public/bug1859_021' into maint-0.2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/connection_edge.c | 2 | ||||
| -rw-r--r-- | src/or/rendclient.c | 5 | ||||
| -rw-r--r-- | src/or/routerlist.c | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 052aa3706..5609c1df4 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -571,7 +571,7 @@ circuit_discard_optional_exit_enclaves(extend_info_t *info) !edge_conn->chosen_exit_retries) continue; r1 = router_get_by_nickname(edge_conn->chosen_exit_name, 0); - r2 = router_get_by_nickname(info->nickname, 0); + r2 = router_get_by_digest(info->identity_digest); if (!r1 || !r2 || r1 != r2) continue; tor_assert(edge_conn->socks_request); diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 783a66150..af91099fc 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -814,7 +814,10 @@ rend_client_get_random_intro(const rend_data_t *rend_query) intro = smartlist_get(entry->parsed->intro_nodes, i); /* Do we need to look up the router or is the extend info complete? */ if (!intro->extend_info->onion_key) { - router = router_get_by_nickname(intro->extend_info->nickname, 0); + if (tor_digest_is_zero(intro->extend_info->identity_digest)) + router = router_get_by_hexdigest(intro->extend_info->nickname); + else + router = router_get_by_digest(intro->extend_info->identity_digest); if (!router) { log_info(LD_REND, "Unknown router with nickname '%s'; trying another.", intro->extend_info->nickname); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 7c8e36e40..fb8fb8815 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1989,9 +1989,6 @@ router_get_by_nickname(const char *nickname, int warn_if_unnamed) return router_get_by_hexdigest(nickname); if (!strcasecmp(nickname, UNNAMED_ROUTER_NICKNAME)) return NULL; - if (server_mode(get_options()) && - !strcasecmp(nickname, get_options()->Nickname)) - return router_get_my_routerinfo(); maybedigest = (strlen(nickname) >= HEX_DIGEST_LEN) && (base16_decode(digest,DIGEST_LEN,nickname,HEX_DIGEST_LEN) == 0); |