[tor-commits] [tor/master] Make the reachability.c module dirauth-only.

[asn at torproject.org]

commit 996f7c75ba6abd9c4bc884f2c9a3b62889da9134
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 30 11:33:00 2019 -0400

    Make the reachability.c module dirauth-only.
---
 src/core/include.am               | 2 +-
 src/feature/nodelist/routerlist.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/core/include.am b/src/core/include.am
index 8ddbdbc0b..6367b0197 100644
--- a/src/core/include.am
+++ b/src/core/include.am
@@ -154,7 +154,6 @@ LIBTOR_APP_A_SOURCES = 				\
 # the separation is only in the code location.
 LIBTOR_APP_A_SOURCES += 			\
 	src/feature/dirauth/bwauth.c		\
-	src/feature/dirauth/reachability.c	\
 	src/feature/dirauth/voteflags.c
 
 if BUILD_NT_SERVICES
@@ -179,6 +178,7 @@ MODULE_DIRAUTH_SOURCES = 					\
 	src/feature/dirauth/dsigs_parse.c			\
 	src/feature/dirauth/guardfraction.c			\
 	src/feature/dirauth/process_descs.c			\
+	src/feature/dirauth/reachability.c			\
 	src/feature/dirauth/recommend_pkg.c			\
 	src/feature/dirauth/shared_random.c			\
 	src/feature/dirauth/shared_random_state.c
diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c
index 48f448ad1..88a5eeac6 100644
--- a/src/feature/nodelist/routerlist.c
+++ b/src/feature/nodelist/routerlist.c
@@ -1926,6 +1926,8 @@ routerlist_remove_old_routers(void)
 void
 routerlist_descriptors_added(smartlist_t *sl, int from_cache)
 {
+  // XXXX use pubsub mechanism here.
+
   tor_assert(sl);
   control_event_descriptors_changed(sl);
   SMARTLIST_FOREACH_BEGIN(sl, routerinfo_t *, ri) {
@@ -1933,7 +1935,9 @@ routerlist_descriptors_added(smartlist_t *sl, int from_cache)
       learned_bridge_descriptor(ri, from_cache);
     if (ri->needs_retest_if_added) {
       ri->needs_retest_if_added = 0;
+#ifdef HAVE_MODULE_DIRAUTH
       dirserv_single_reachability_test(approx_time(), ri);
+#endif
     }
   } SMARTLIST_FOREACH_END(ri);
 }