summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-04-30 11:33:00 -0400
committerNick Mathewson <nickm@torproject.org>2019-04-30 15:00:08 -0400
commit996f7c75ba6abd9c4bc884f2c9a3b62889da9134 (patch)
tree401e1773db882347f277e5f3962f18d31c8a7f42
parent339ac4dc67af912e3c8608627e436fb866714538 (diff)
downloadtor-996f7c75ba6abd9c4bc884f2c9a3b62889da9134.tar.gz
tor-996f7c75ba6abd9c4bc884f2c9a3b62889da9134.zip
Make the reachability.c module dirauth-only.
-rw-r--r--src/core/include.am2
-rw-r--r--src/feature/nodelist/routerlist.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/core/include.am b/src/core/include.am
index 8ddbdbc0b7..6367b01978 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 48f448ad1e..88a5eeac6a 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);
}