[or-cvs] Clients now honor the "guard" flag in the router status when
arma at seul.org
arma at seul.org
Sun Feb 12 03:43:42 UTC 2006
Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or
Modified Files:
circuitbuild.c or.h rendservice.c routerlist.c
Log Message:
Clients now honor the "guard" flag in the router status when
picking entry guards, rather than looking at is_fast or is_stable.
Now dirservers can change how they define it and clients will
automatically use their new definition.
Index: circuitbuild.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -d -r1.214 -r1.215
--- circuitbuild.c 9 Feb 2006 05:46:48 -0000 1.214
+++ circuitbuild.c 12 Feb 2006 03:43:39 -0000 1.215
@@ -1157,13 +1157,13 @@ choose_good_exit_server_general(routerli
// router->nickname, i);
continue; /* skip routers that are known to be down */
}
- if (router_is_unreliable(router, need_uptime, need_capacity)) {
+ if (router_is_unreliable(router, need_uptime, need_capacity, 0)) {
n_supported[i] = -1;
continue; /* skip routers that are not suitable */
}
if (!router->is_verified &&
(!(options->_AllowUnverified & ALLOW_UNVERIFIED_EXIT) ||
- router_is_unreliable(router, 1, 1))) {
+ router_is_unreliable(router, 1, 1, 0))) {
/* if it's unverified, and either we don't want it or it's unsuitable */
n_supported[i] = -1;
// log_fn(LOG_DEBUG,"Skipping node %s (index %d) -- unverified router.",
@@ -1303,14 +1303,14 @@ choose_good_exit_server(uint8_t purpose,
case CIRCUIT_PURPOSE_C_GENERAL:
if (is_internal) /* pick it like a middle hop */
return router_choose_random_node(NULL, get_options()->ExcludeNodes,
- NULL, need_uptime, need_capacity,
+ NULL, need_uptime, need_capacity, 0,
get_options()->_AllowUnverified & ALLOW_UNVERIFIED_MIDDLE, 0);
else
return choose_good_exit_server_general(dir,need_uptime,need_capacity);
case CIRCUIT_PURPOSE_C_ESTABLISH_REND:
return router_choose_random_node(
options->RendNodes, options->RendExcludeNodes,
- NULL, need_uptime, need_capacity,
+ NULL, need_uptime, need_capacity, 0,
options->_AllowUnverified & ALLOW_UNVERIFIED_RENDEZVOUS, 0);
}
warn(LD_BUG,"Bug: unhandled purpose %d", purpose);
@@ -1479,7 +1479,7 @@ choose_good_middle_server(uint8_t purpos
}
choice = router_choose_random_node(
NULL, get_options()->ExcludeNodes, excluded,
- state->need_uptime, state->need_capacity,
+ state->need_uptime, state->need_capacity, 0,
get_options()->_AllowUnverified & ALLOW_UNVERIFIED_MIDDLE, 0);
smartlist_free(excluded);
return choice;
@@ -1529,8 +1529,9 @@ choose_good_entry_server(uint8_t purpose
// but only if there are enough other nodes available.
choice = router_choose_random_node(
NULL, options->ExcludeNodes,
- excluded, state ? state->need_uptime : 1,
- state ? state->need_capacity : 1,
+ excluded, state ? state->need_uptime : 0,
+ state ? state->need_capacity : 0,
+ state ? 0 : 1,
options->_AllowUnverified & ALLOW_UNVERIFIED_ENTRY, 0);
smartlist_free(excluded);
return choice;
@@ -1710,7 +1711,7 @@ entry_is_live(entry_guard_t *e, int need
r = router_get_by_digest(e->identity);
if (!r)
return NULL;
- if (router_is_unreliable(r, need_uptime, need_capacity))
+ if (router_is_unreliable(r, need_uptime, need_capacity, 0))
return NULL;
if (firewall_is_fascist() &&
!fascist_firewall_allows_address(r->addr,r->or_port))
Index: or.h
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.790
retrieving revision 1.791
diff -u -p -d -r1.790 -r1.791
--- or.h 11 Feb 2006 23:15:40 -0000 1.790
+++ or.h 12 Feb 2006 03:43:39 -0000 1.791
@@ -809,6 +809,7 @@ typedef struct {
* us? */
unsigned int is_fast:1; /** Do we think this is a fast OR? */
unsigned int is_stable:1; /** Do we think this is a stable OR? */
+ unsigned int is_possible_guard:1; /**< Do we think this is an OK guard? */
/* The below items are used only by authdirservers for
* reachability testing. */
@@ -2271,12 +2272,13 @@ routerinfo_t *router_find_exact_exit_enc
#define ROUTER_REQUIRED_MIN_BANDWIDTH 10000
int router_is_unreliable(routerinfo_t *router, int need_uptime,
- int need_capacity);
+ int need_capacity, int need_guard);
routerinfo_t *routerlist_sl_choose_by_bandwidth(smartlist_t *sl);
routerinfo_t *router_choose_random_node(const char *preferred,
const char *excluded,
smartlist_t *excludedsmartlist,
int need_uptime, int need_bandwidth,
+ int need_guard,
int allow_unverified, int strict);
routerinfo_t *router_get_by_nickname(const char *nickname,
int warn_if_unnamed);
Index: rendservice.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/rendservice.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -d -r1.153 -r1.154
--- rendservice.c 9 Feb 2006 05:46:49 -0000 1.153
+++ rendservice.c 12 Feb 2006 03:43:39 -0000 1.154
@@ -992,7 +992,7 @@ rend_services_introduce(void)
for (j=prev_intro_nodes; j < NUM_INTRO_POINTS; ++j) {
char *hex_digest;
router = router_choose_random_node(service->intro_prefer_nodes,
- service->intro_exclude_nodes, exclude_routers, 1, 0,
+ service->intro_exclude_nodes, exclude_routers, 1, 0, 0,
get_options()->_AllowUnverified & ALLOW_UNVERIFIED_INTRODUCTION,
0);
if (!router) {
Index: routerlist.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/routerlist.c,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -p -d -r1.442 -r1.443
--- routerlist.c 9 Feb 2006 06:08:59 -0000 1.442
+++ routerlist.c 12 Feb 2006 03:43:39 -0000 1.443
@@ -643,7 +643,8 @@ router_nickname_is_in_list(routerinfo_t
*/
static void
router_add_running_routers_to_smartlist(smartlist_t *sl, int allow_unverified,
- int need_uptime, int need_capacity)
+ int need_uptime, int need_capacity,
+ int need_guard)
{
if (!routerlist)
return;
@@ -653,7 +654,8 @@ router_add_running_routers_to_smartlist(
if (router->is_running &&
(router->is_verified ||
(allow_unverified &&
- !router_is_unreliable(router, need_uptime, need_capacity)))) {
+ !router_is_unreliable(router, need_uptime,
+ need_capacity, need_guard)))) {
/* If it's running, and either it's verified or we're ok picking
* unverified routers and this one is suitable.
*/
@@ -709,25 +711,30 @@ router_find_exact_exit_enclave(const cha
* bandwidth.
*/
int
-router_is_unreliable(routerinfo_t *router, int need_uptime, int need_capacity)
+router_is_unreliable(routerinfo_t *router, int need_uptime,
+ int need_capacity, int need_guard)
{
if (need_uptime && !router->is_stable)
return 1;
if (need_capacity && !router->is_fast)
return 1;
+ if (need_guard && !router->is_possible_guard)
+ return 1;
return 0;
}
-/** Remove from routerlist <b>sl</b> all routers who have a low uptime. */
+/** Remove from routerlist <b>sl</b> all routers that are not
+ * sufficiently stable. */
static void
-routerlist_sl_remove_unreliable_routers(smartlist_t *sl)
+routerlist_sl_remove_unreliable_routers(smartlist_t *sl,
+ int need_uptime, int need_guard)
{
int i;
routerinfo_t *router;
for (i = 0; i < smartlist_len(sl); ++i) {
router = smartlist_get(sl, i);
- if (router_is_unreliable(router, 1, 0)) {
+ if (router_is_unreliable(router, need_uptime, 0, need_guard)) {
// log(LOG_DEBUG, "Router '%s' has insufficient uptime; deleting.",
// router->nickname);
smartlist_del(sl, i--);
@@ -801,6 +808,7 @@ router_choose_random_node(const char *pr
const char *excluded,
smartlist_t *excludedsmartlist,
int need_uptime, int need_capacity,
+ int need_guard,
int allow_unverified, int strict)
{
smartlist_t *sl, *excludednodes;
@@ -809,8 +817,8 @@ router_choose_random_node(const char *pr
excludednodes = smartlist_create();
add_nickname_list_to_smartlist(excludednodes,excluded,0,0,1);
- /* Try the preferred nodes first. Ignore need_uptime and need_capacity,
- * since the user explicitly asked for these nodes. */
+ /* Try the preferred nodes first. Ignore need_uptime and need_capacity
+ * and need_guard, since the user explicitly asked for these nodes. */
if (preferred) {
sl = smartlist_create();
add_nickname_list_to_smartlist(sl,preferred,1,1,1);
@@ -825,25 +833,27 @@ router_choose_random_node(const char *pr
* will do that has the required attributes. */
sl = smartlist_create();
router_add_running_routers_to_smartlist(sl, allow_unverified,
- need_uptime, need_capacity);
+ need_uptime, need_capacity,
+ need_guard);
smartlist_subtract(sl,excludednodes);
if (excludedsmartlist)
smartlist_subtract(sl,excludedsmartlist);
- if (need_uptime)
- routerlist_sl_remove_unreliable_routers(sl);
+ if (need_uptime || need_guard)
+ routerlist_sl_remove_unreliable_routers(sl, need_uptime, need_guard);
if (need_capacity)
choice = routerlist_sl_choose_by_bandwidth(sl);
else
choice = smartlist_choose(sl);
smartlist_free(sl);
- if (!choice && (need_uptime || need_capacity)) {
+ if (!choice && (need_uptime || need_capacity || need_guard)) {
/* try once more -- recurse but with fewer restrictions. */
- info(LD_CIRC, "We couldn't find any live%s%s routers; falling back "
+ info(LD_CIRC, "We couldn't find any live%s%s%s routers; falling back "
"to list of all routers.",
need_capacity?", fast":"",
- need_uptime?", stable":"");
+ need_uptime?", stable":"",
+ need_guard?", guard":"");
choice = router_choose_random_node(
- NULL, excluded, excludedsmartlist, 0, 0, allow_unverified, 0);
+ NULL, excluded, excludedsmartlist, 0, 0, 0, allow_unverified, 0);
}
}
smartlist_free(excludednodes);
@@ -2458,7 +2468,7 @@ router_exit_policy_all_routers_reject(ui
SMARTLIST_FOREACH(routerlist->routers, routerinfo_t *, router,
{
if (router->is_running &&
- !router_is_unreliable(router, need_uptime, 0)) {
+ !router_is_unreliable(router, need_uptime, 0, 0)) {
r = router_compare_addr_to_addr_policy(addr, port, router->exit_policy);
if (r != ADDR_POLICY_REJECTED && r != ADDR_POLICY_PROBABLY_REJECTED)
return 0; /* this one could be ok. good enough. */
@@ -3203,6 +3213,7 @@ routers_update_status_from_networkstatus
router->is_running = rs->status.is_running;
router->is_fast = rs->status.is_fast;
router->is_stable = rs->status.is_stable;
+ router->is_possible_guard = rs->status.is_possible_guard;
}
if (router->is_running && ds) {
ds->n_networkstatus_failures = 0;
More information about the tor-commits
mailing list