Make HSDir depend on Running/Valid again.

When we removed Running/Valid checks from Fast and Stable in 8712, I
removed them from HSDir too, which apparently wasn't a good idea.

Reverts part of a65e835800b1af2c2a4c215b.  Fixes bug 16524. Bugfix
on 0.2.7.2-alpha.

diff --git a/changes/bug16524 b/changes/bug16524
new file mode 100644 (file)
index 0000000..1268fe8
--- /dev/null
+++ b/changes/bug16524
@@ -0,0 +1,3 @@
+  o Minor bugfixes (authority):
+    - Don't assign "HSDir" to a router if it isn't Valid and Running.
+      Fixes bug 16524; bugfix on 0.2.7.2-alpha.
\ No newline at end of file

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 072a3390dac868f0307fcfef48cfecc5f6593920..e70b1b422d1b8e39294e674049205cee126d6e8f 100644 (file)
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1373,7 +1373,8 @@ dirserv_thinks_router_is_hs_dir(const routerinfo_t *router,
 
   return (router->wants_to_be_hs_dir && router->dir_port &&
           node->is_stable &&
-          uptime >= get_options()->MinUptimeHidServDirectoryV2);
+          uptime >= get_options()->MinUptimeHidServDirectoryV2 &&
+          router_is_active(router, node, now));
 }
 
 /** Don't consider routers with less bandwidth than this when computing