[tor-commits] [tor/master] entrynodes: Move guard dirinfo check below path dirinfo check.

[nickm at torproject.org]

commit f2231306ba58cc5d9a5addb41eb7f287e3802746
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Oct 3 14:16:49 2017 +0300

    entrynodes: Move guard dirinfo check below path dirinfo check.
    
    We do that because we want to use the path fraction dirinfo data in case
    we are missing primary guard dirinfo.
---
 src/or/nodelist.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 93dd43f3c..ff26065ff 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -2300,16 +2300,6 @@ update_router_have_minimum_dir_info(void)
 
   using_md = consensus->flavor == FLAV_MICRODESC;
 
-  { /* Check entry guard dirinfo status */
-    char *guard_error = entry_guards_get_dir_info_status_str();
-    if (guard_error) {
-      strlcpy(dir_info_status, guard_error, sizeof(dir_info_status));
-      tor_free(guard_error);
-      res = 0;
-      goto done;
-    }
-  }
-
   /* Check fraction of available paths */
   {
     char *status = NULL;
@@ -2334,6 +2324,17 @@ update_router_have_minimum_dir_info(void)
     res = 1;
   }
 
+  { /* Check entry guard dirinfo status */
+    char *guard_error = entry_guards_get_dir_info_status_str();
+    if (guard_error) {
+      strlcpy(dir_info_status, guard_error, sizeof(dir_info_status));
+      tor_free(guard_error);
+      res = 0;
+      goto done;
+    }
+  }
+
+
  done:
 
   /* If paths have just become available in this update. */