summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-03-24 21:11:14 +0000
committerRoger Dingledine <arma@torproject.org>2006-03-24 21:11:14 +0000
commitf2abd7a69bdbc81ba7f0ca20007636838a1fd063 (patch)
treebd2ea9b01b8a96b53627c286e5b1a762a4e9678f
parent7edfec2ae615777c05f6cfc0945771450ad47b0e (diff)
downloadtor-f2abd7a69bdbc81ba7f0ca20007636838a1fd063.tar.gz
tor-f2abd7a69bdbc81ba7f0ca20007636838a1fd063.zip
fix a wordo, don't be so quick to yell at servers, and ask a question.
svn:r6235
-rw-r--r--src/or/routerlist.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index da8c0e92c5..1935a0eab0 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1225,7 +1225,7 @@ routerlist_insert_old(routerlist_t *rl, routerinfo_t *ri)
// routerlist_assert_ok(rl);
}
-/** Remove an item <b>ri</b> into the routerlist <b>rl</b>, updating indices
+/** Remove an item <b>ri</b> from the routerlist <b>rl</b>, updating indices
* as needed. If <b>idx</b> is nonnegative and smartlist_get(rl-&gt;routers,
* idx) == ri, we don't need to do a linear search over the list to decide
* which to remove. We fill the gap in rl-&gt;routers with a later element in
@@ -1545,6 +1545,7 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg,
old_router->num_unreachable_notifications;
}
if (authdir && !from_cache && !from_fetch &&
+ router_have_minimum_dir_info() &&
dirserv_thinks_router_is_blatantly_unreachable(router,
time(NULL))) {
if (router->num_unreachable_notifications >= 3) {
@@ -2853,6 +2854,7 @@ routers_update_all_from_networkstatus(void)
}
});
if (n_recent > 2 && n_recommended < n_recent/2) {
+/* XXX Should this be n_recommended <= n_recent/2 ? -RD */
if (consensus == VS_NEW || consensus == VS_NEW_IN_SERIES) {
if (!have_warned_about_new_version) {
char *rec = compute_recommended_versions(now, !is_server);