diff options
| author | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2016-01-22 18:05:28 +1100 |
|---|---|---|
| committer | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2016-01-29 07:16:32 +1100 |
| commit | 73fc67bc8906819a42ed44abe33179512f90a883 (patch) | |
| tree | c1a0395b6fa7582520883604662b972707d2db87 /src/or/rendclient.c | |
| parent | 1401117ff2bc5fc90df51d19c3c0d7abc439c34e (diff) | |
| download | tor-73fc67bc8906819a42ed44abe33179512f90a883.tar.gz tor-73fc67bc8906819a42ed44abe33179512f90a883.zip | |
Tor2Web: tell extend_info_from_node intro point connections are direct
Diffstat (limited to 'src/or/rendclient.c')
| -rw-r--r-- | src/or/rendclient.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/or/rendclient.c b/src/or/rendclient.c index d9cea53c04..dc05d6f2ed 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -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 { |