[or-cvs] Only check versions from versioning authdirs.

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv25730/src/or

Modified Files:
	routerlist.c routerparse.c 
Log Message:
Only check versions from versioning authdirs.

Index: routerlist.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/routerlist.c,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -d -r1.305 -r1.306
--- routerlist.c	21 Sep 2005 00:41:06 -0000	1.305
+++ routerlist.c	21 Sep 2005 02:38:51 -0000	1.306
@@ -2042,8 +2042,8 @@
     SMARTLIST_FOREACH(networkstatus_list, networkstatus_t *, ns,
     {
       version_status_t vs;
-      if (ns->received_on + SELF_OPINION_INTERVAL < now )
-        // XXXX NM enable this! || !ns->recommends_versions)
+      if (!ns->recommends_versions ||
+          ns->received_on + SELF_OPINION_INTERVAL < now )
         continue;
       vs = tor_version_is_obsolete(
               VERSION, is_server ? ns->server_versions : ns->client_versions);
@@ -2070,7 +2070,7 @@
         have_warned_about_old_version = 1;
       }
     } else {
-      log_fn(LOG_NOTICE, "%d/%d recent directories think my version is ok.",
+      log_fn(LOG_INFO, "%d/%d recent directories think my version is ok.",
              n_recommended, n_recent);
     }
   }

Index: routerparse.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/routerparse.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- routerparse.c	21 Sep 2005 00:41:06 -0000	1.147
+++ routerparse.c	21 Sep 2005 02:38:51 -0000	1.148
@@ -1077,7 +1077,6 @@
     log_fn(LOG_WARN, "Couldn't find network-status-version keyword");
     goto err;
   }
-  /* XXXX011 do something with the version! NM */
 
   if (!(tok = find_first_by_keyword(tokens, K_DIR_SOURCE))) {
     log_fn(LOG_WARN, "Couldn't find dir-source keyword");
@@ -1144,7 +1143,7 @@
     }
   }
 
-  if (ns->recommends_versions || 1) { //XXXX NM re-enable conditional.
+  if (ns->recommends_versions) {
     if (!(tok = find_first_by_keyword(tokens, K_CLIENT_VERSIONS)) ||
         tok->n_args<1) {
       log_fn(LOG_WARN, "Missing client-versions");