Changes to bug1959_part1 on review from arma.

Significant one: we want to say "not enough entry nodes descriptors, so we
can't build circuits" only when we have 0 descriptors.
This commit is contained in:
Nick Mathewson 2010-09-22 01:30:23 -04:00
parent 49c177437b
commit 4ef9ccc883

View File

@ -4779,10 +4779,10 @@ update_router_have_minimum_dir_info(void)
/* Check for entry nodes. */
if (options->EntryNodes) {
count_usable_descriptors(&num_present, &num_usable, consensus, options, now,
options->EntryNodes);
count_usable_descriptors(&num_present, &num_usable, consensus, options,
now, options->EntryNodes);
if (num_usable && (num_present==0 || num_present < num_usable / 4)) {
if (num_usable && (num_present == 0)) {
tor_snprintf(dir_info_status, sizeof(dir_info_status),
"We have only %d/%d usable entry node descriptors.",
num_present, num_usable);