[tor-commits] [tor/master] Control: getinfo entry-guards report down-since

[nickm at torproject.org]

commit b101f4e98ce811aee729c31f62ec5dd1cfe44e85
Author: David Goulet <dgoulet at ev0ke.net>
Date:   Wed Jan 28 10:52:14 2015 -0500

    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 <dgoulet at ev0ke.net>
---
 changes/bug14184    |    5 +++++
 src/or/entrynodes.c |    3 +++
 2 files changed, 8 insertions(+)

diff --git a/changes/bug14184 b/changes/bug14184
new file mode 100644
index 0000000..ed3d760
--- /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 17cb825..5a12170 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";
         }