[tor-commits] [tor/master] Dir: Refactor ns expiry check to remove duplicate code

[nickm@xxxxxxxxxxxxxx]

commit bd29b3531a48b41f6eee5b4a29769a13ef199298
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Thu Nov 29 01:06:19 2018 +1000

    Dir: Refactor ns expiry check to remove duplicate code
    
    Instead of checking NS_EXPIRY_SLOP, use
    networkstatus_consensus_reasonably_live().
    
    Preparation for 28591.
---
 src/core/mainloop/mainloop.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c
index 7eff82fee..af2bc8262 100644
--- a/src/core/mainloop/mainloop.c
+++ b/src/core/mainloop/mainloop.c
@@ -2028,11 +2028,9 @@ check_expired_networkstatus_callback(time_t now, const or_options_t *options)
   (void)options;
   /* Check whether our networkstatus has expired. */
   networkstatus_t *ns = networkstatus_get_latest_consensus();
-  /*XXXX RD: This value needs to be the same as REASONABLY_LIVE_TIME in
-   * networkstatus_get_reasonably_live_consensus(), but that value is way
-   * way too high.  Arma: is the bridge issue there resolved yet? -NM */
-#define NS_EXPIRY_SLOP (24*60*60)
-  if (ns && ns->valid_until < (now - NS_EXPIRY_SLOP) &&
+  /* Use reasonably live consensuses until they are no longer reasonably live.
+   */
+  if (ns && !networkstatus_consensus_reasonably_live(ns, now) &&
       router_have_minimum_dir_info()) {
     router_dir_info_changed();
   }



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits