[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] allow the middle hop of the testing circuit to be running
- To: or-cvs@xxxxxxxxxxxxx
- Subject: [or-cvs] allow the middle hop of the testing circuit to be running
- From: arma@xxxxxxxx (Roger Dingledine)
- Date: Tue, 17 May 2005 15:46:45 -0400 (EDT)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Tue, 17 May 2005 15:47:04 -0400
- Reply-to: or-dev@xxxxxxxxxxxxx
- Sender: owner-or-cvs@xxxxxxxxxxxxx
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:
allow the middle hop of the testing circuit to be running
any version, now that most of them have the bugfix to let
them connect to unknown servers.
Index: circuitbuild.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- circuitbuild.c 15 May 2005 05:00:24 -0000 1.114
+++ circuitbuild.c 17 May 2005 19:46:43 -0000 1.115
@@ -1293,24 +1293,6 @@
}
}
-/** Add to sl all routers with platform version less than cutoff. */
-static void
-excluded_add_obsolete(smartlist_t *sl, const char *atleast, const char *nomore) {
- routerlist_t *rl;
- int i;
- routerinfo_t *router;
-
- router_get_routerlist(&rl);
- if (!rl) return;
-
- 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, atleast) ||
- tor_version_as_new_as(router->platform, nomore))
- smartlist_add(sl, router);
- }
-}
-
static routerinfo_t *choose_good_middle_server(uint8_t purpose,
cpath_build_state_t *state,
crypt_path_t *head,
@@ -1337,8 +1319,6 @@
routerlist_add_family(excluded, r);
}
}
- if (purpose == CIRCUIT_PURPOSE_TESTING)
- 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);