nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 13:34:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tor2Web: tell extend_info_from_node intro point connections are direct

Browse Source
This commit is contained in:
teor (Tim Wilson-Brown) 2016-01-22 18:05:28 +11:00
parent 1401117ff2
commit 73fc67bc89
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/rendclient.c
View File

@ -1366,11 +1366,19 @@ rend_client_get_random_intro_impl(const rend_cache_entry_t *entry,
smartlist_del(usable_nodes, i);
goto again;
}
#ifdef ENABLE_TOR2WEB_MODE
new_extend_info = extend_info_from_node(node, options->Tor2webMode);
#else
new_extend_info = extend_info_from_node(node, 0);
#endif
if (!new_extend_info) {
const char *alternate_reason = "";
#ifdef ENABLE_TOR2WEB_MODE
alternate_reason = ", or we cannot connect directly to it";
#endif
log_info(LD_REND, "We don't have a descriptor for the intro-point relay "
"'%s'; trying another.",
extend_info_describe(intro->extend_info));
"'%s'%s; trying another.",
extend_info_describe(intro->extend_info), alternate_reason);
smartlist_del(usable_nodes, i);
goto again;
} else {