[tor-commits] [tor/master] Tor2Web: tell extend_info_from_node intro point connections are direct

[nickm at torproject.org]

commit 73fc67bc8906819a42ed44abe33179512f90a883
Author: teor (Tim Wilson-Brown) <teor2345 at gmail.com>
Date:   Fri Jan 22 18:05:28 2016 +1100

    Tor2Web: tell extend_info_from_node intro point connections are direct
---
 src/or/rendclient.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index d9cea53..dc05d6f 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 {