[or-cvs] an entry guard that is "unlisted", as well as not known to ...

[arma at seul.org]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv20121

Modified Files:
	circuitbuild.c 
Log Message:
an entry guard that is "unlisted", as well as not known to be "down", is
not therefore "up".


Index: circuitbuild.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -p -d -r1.256 -r1.257
--- circuitbuild.c	20 Jul 2006 23:45:26 -0000	1.256
+++ circuitbuild.c	21 Jul 2006 07:06:18 -0000	1.257
@@ -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(v
       }
       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");
     });