|
@@ -1293,24 +1293,6 @@ void onion_append_to_cpath(crypt_path_t **head_ptr, crypt_path_t *new_hop)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-/** 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,
|
|
static routerinfo_t *choose_good_middle_server(uint8_t purpose,
|
|
cpath_build_state_t *state,
|
|
cpath_build_state_t *state,
|
|
crypt_path_t *head,
|
|
crypt_path_t *head,
|
|
@@ -1337,8 +1319,6 @@ static routerinfo_t *choose_good_middle_server(uint8_t purpose,
|
|
routerlist_add_family(excluded, r);
|
|
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,
|
|
choice = router_choose_random_node(NULL, get_options()->ExcludeNodes, excluded,
|
|
state->need_uptime, state->need_capacity,
|
|
state->need_uptime, state->need_capacity,
|
|
get_options()->_AllowUnverified & ALLOW_UNVERIFIED_MIDDLE, 0);
|
|
get_options()->_AllowUnverified & ALLOW_UNVERIFIED_MIDDLE, 0);
|