[or-cvs] require exactly 0.0.9.7 for middle hops of testing circs, f...

[arma@xxxxxxxx (Roger Dingledine)]

Update of /home2/or/cvsroot/tor/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/tor/src/or

Modified Files:
	circuitbuild.c 
Log Message:
require exactly 0.0.9.7 for middle hops of testing circs, for now


Index: circuitbuild.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- circuitbuild.c	1 Apr 2005 08:42:26 -0000	1.101
+++ circuitbuild.c	1 Apr 2005 09:23:51 -0000	1.102
@@ -1258,7 +1258,7 @@
 
 /** Add to sl all routers with platform version less than cutoff. */
 static void
-excluded_add_obsolete(smartlist_t *sl, const char *cutoff) {
+excluded_add_obsolete(smartlist_t *sl, const char *atleast, const char *nomore) {
   routerlist_t *rl;
   int i;
   routerinfo_t *router;
@@ -1268,7 +1268,8 @@
 
   for (i = 0; i < smartlist_len(rl->routers); ++i) { /* iterate over routers */
     router = smartlist_get(rl->routers, i);
-    if (!tor_version_as_new_as(router->platform,cutoff))
+    if (!tor_version_as_new_as(router->platform, atleast) ||
+        tor_version_as_new_as(router->platform, nomore))
       smartlist_add(sl, router);
   }
 }
@@ -1300,7 +1301,7 @@
     }
   }
   if (purpose == CIRCUIT_PURPOSE_TESTING)
-    excluded_add_obsolete(excluded, "0.0.9.7");
+    excluded_add_obsolete(excluded, "0.0.9.7", "0.0.9.10");
   choice = router_choose_random_node(NULL, get_options()->ExcludeNodes, excluded,
            state->need_uptime, state->need_capacity,
            get_options()->_AllowUnverified & ALLOW_UNVERIFIED_MIDDLE, 0);