From: David Goulet Date: Wed, 28 Jan 2015 15:52:14 +0000 (-0500) Subject: Control: getinfo entry-guards report down-since X-Git-Tag: tor-0.2.6.3-alpha~68 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=b101f4e98ce811aee729c31f62ec5dd1cfe44e85;p=thirdparty%2Ftor.git Control: getinfo entry-guards report down-since If the guard unreachable_since variable was set, the status "up" was reported which is wrong. This adds the "down" status followed by the unreachable_since time value. Fixes #14184 Signed-off-by: David Goulet --- diff --git a/changes/bug14184 b/changes/bug14184 new file mode 100644 index 0000000000..ed3d760bf2 --- /dev/null +++ b/changes/bug14184 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - On the control port, the "entry-guards" command was reporting an "up" + status for a relay that was actually down. This fix check if + "unreachable_since" is set and if so reports the "down" status. Fixes + bug 14184. diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 17cb825de3..5a12170b0c 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1666,6 +1666,9 @@ getinfo_helper_entry_guards(control_connection_t *conn, } else if (e->bad_since) { when = e->bad_since; status = "unusable"; + } else if (e->unreachable_since) { + when = e->unreachable_since; + status = "down"; } else { status = "up"; }