diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-07-21 07:06:18 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-07-21 07:06:18 +0000 |
| commit | fda47492d07aedcb7d4b2895272c3dd9b379e286 (patch) | |
| tree | 4d92eb41fa3fede997774a0412f455e99611d0b5 /trunk | |
| parent | 04c4a3349035f673619816ba453a062d592fae2d (diff) | |
| download | tor-fda47492d07aedcb7d4b2895272c3dd9b379e286.tar.gz tor-fda47492d07aedcb7d4b2895272c3dd9b379e286.zip | |
an entry guard that is "unlisted", as well as not known to be "down", is
not therefore "up".
svn:r6798
Diffstat (limited to 'trunk')
| -rw-r--r-- | trunk/src/or/circuitbuild.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/trunk/src/or/circuitbuild.c b/trunk/src/or/circuitbuild.c index e95d29fdad..85d2759f83 100644 --- a/trunk/src/or/circuitbuild.c +++ b/trunk/src/or/circuitbuild.c @@ -1835,7 +1835,7 @@ log_entry_guards(int severity) { tor_snprintf(buf, sizeof(buf), "%s (%s%s%s)", e->nickname, - e->down_since ? "down " : "up ", + (e->down_since || e->unlisted_since) ? "down " : "up ", e->unlisted_since ? "unlisted " : "listed ", e->made_contact ? "made-contact" : "never-contacted"); smartlist_add(elements, tor_strdup(buf)); @@ -2022,7 +2022,7 @@ entry_guards_set_status_from_directory(void) } log_info(LD_CIRC, "Summary: Entry '%s' is %s, %s, and %s.", entry->nickname, - entry->down_since ? "down" : "up", + (entry->down_since || entry->unlisted_since) ? "down" : "up", entry->unlisted_since ? "unlisted" : "listed", entry_is_live(entry, 0, 1) ? "live" : "not live"); }); |