Discard router descriptors as we load them if they are more than

five days old. Otherwise if Tor is off for a long time and then
starts with cached descriptors, it will try to use the onion
keys in those obsolete descriptors when building circuits. Bugfix
on 0.2.0.x. Fixes bug 887.

svn:r17993

diff --git a/ChangeLog b/ChangeLog
index 1138d042572ddb0cac0343579d78768470217d5b..7b09d1904ae32e700b02d5900f42ed3c5fe0d03e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
 Changes in version 0.2.1.11-alpha - 2009-01-??
+  o Major bugfixes:
+    - Discard router descriptors as we load them if they are more than
+      five days old. Otherwise if Tor is off for a long time and then
+      starts with cached descriptors, it will try to use the onion
+      keys in those obsolete descriptors when building circuits. Bugfix
+      on 0.2.0.x. Fixes bug 887.
+
   o Minor bugfixes:
     - Make outbound DNS packets respect the OutboundBindAddress setting.
       Fixes the bug part of bug 798. Bugfix on 0.1.2.2-alpha.

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 4aa129c6454c2d40efa56cd9ed298c43a7e02620..b08d506dbeea0f32e4779871fd4e70f31462bf2b 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3060,6 +3060,12 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg,
     }
   }
 
+  if (!in_consensus && from_cache &&
+      router->cache_info.published_on < time(NULL) - OLD_ROUTER_DESC_MAX_AGE) {
+    *msg = "Router descriptor was really old.";
+    return ROUTER_WAS_NOT_NEW;
+  }
+
   /* We haven't seen a router with this identity before. Add it to the end of
    * the list. */
   routerlist_insert(routerlist, router);