tor

commit 08d452b38c84c6522b9ec4b0ebae29c5bba6c83d
parent db7d067ab178e90163bd013c3892ca707a846433
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue,  9 Nov 2021 08:54:11 -0500

Stop using published_on in rs to decide whether to download a routerdesc.

The consensus voters shouldn't actually include such old routers in
the consensus anyway, so this logic shouldn't come up...

but if a client _does_ download something it wouldn't use, it won't
retry infinitely: see checks for WRA_NEVER_DOWNLOADABLE.

Diffstat:
M
src/feature/nodelist/networkstatus.c
 | 
5
+----

1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c
@@ -2615,15 +2615,12 @@ networkstatus_parse_flavor_name(const char *flavname)
 int
 client_would_use_router(const routerstatus_t *rs, time_t now)
 {
+  (void) now;
   if (!rs->is_flagged_running) {
     /* If we had this router descriptor, we wouldn't even bother using it.
      * (Fetching and storing depends on by we_want_to_fetch_flavor().) */
     return 0;
   }
-  if (rs->published_on + OLD_ROUTER_DESC_MAX_AGE < now) {
-    /* We'd drop it immediately for being too old. */
-    return 0;
-  }
   if (!routerstatus_version_supports_extend2_cells(rs, 1)) {
     /* We'd ignore it because it doesn't support EXTEND2 cells.
      * If we don't know the version, download the descriptor so we can