Fix a bunch of log messages. Deprecate some routerlist fields; remove others, and status_set_at from routerinfo_t. Compress routerlist.c cleanup functions. Update cached networkstatus mtime when we download the same one twice. Change some interfaces.

svn:r5068

1 files changed, 4 insertions, 5 deletions

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index b445b7d05c..6ccdd47086 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1740,15 +1740,14 @@ helper_nodes_set_status_from_directory(void)
       routerinfo_t *r = router_get_by_digest(helper->identity);
       if (! r) {
         if (! helper->unlisted_since) {
-        /* Watch out for skew here. XXXX */
-          helper->unlisted_since = routers->published_on;
+          helper->unlisted_since = time(NULL);
           ++changed;
-          log_fn(LOG_WARN,"Helper node '%s' is not published in latest directory",
+          log_fn(LOG_WARN,"Helper node '%s' is not listed by directories",
                  helper->nickname);
         }
       } else {
         if (helper->unlisted_since) {
-          log_fn(LOG_WARN,"Helper node '%s' is listed again in latest directory",
+          log_fn(LOG_WARN,"Helper node '%s' is listed again by directories",
                  helper->nickname);
           ++changed;
         }
@@ -1761,7 +1760,7 @@ helper_nodes_set_status_from_directory(void)
           }
         } else {
           if (helper->down_since) {
-            log_fn(LOG_WARN,"Helper node '%s' is up in latest directory",
+            log_fn(LOG_WARN,"Helper node '%s' is up in latest directories",
                    helper->nickname);
             ++changed;
           }