[tor-commits] [tor/master] Fix bootstrapping with bridges by making is_dir_cache is set on them.

nickm at torproject.org nickm at torproject.org
Fri Mar 1 14:55:45 UTC 2013


commit c0b1f05fe717ab30dc344c8ea3c32022725dcf2c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 28 17:20:46 2013 -0500

    Fix bootstrapping with bridges by making is_dir_cache is set on them.
    
    This fixes bug 8367, introduced in d7089ff228227259137b5a8b. Not in
    any released Tor.
---
 src/or/entrynodes.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 51c3a56..e89eabc 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -133,6 +133,8 @@ entry_guard_set_status(entry_guard_t *e, const node_t *node,
   if (node) {
     int is_dir = node_is_dir(node) && node->rs &&
       node->rs->version_supports_microdesc_cache;
+    if (options->UseBridges && node_is_a_configured_bridge(node))
+      is_dir = 1;
     if (e->is_dir_cache != is_dir) {
       e->is_dir_cache = is_dir;
       changed = 1;
@@ -354,6 +356,8 @@ add_an_entry_guard(const node_t *chosen, int reset_status, int prepend,
       }
       entry->is_dir_cache = node->rs &&
         node->rs->version_supports_microdesc_cache;
+      if (get_options()->UseBridges && node_is_a_configured_bridge(node))
+        entry->is_dir_cache = 1;
       return NULL;
     }
   } else if (!for_directory) {





More information about the tor-commits mailing list