summaryrefslogtreecommitdiff
path: root/src/feature/dirauth
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-12-19 09:24:57 -0500
committerNick Mathewson <nickm@torproject.org>2019-12-19 09:24:57 -0500
commit9386b0b28ad7c276eaaf4546a1764c605850dba3 (patch)
tree6a9365a57793ea253244869d8a85794f675c1672 /src/feature/dirauth
parenteedab30a7bd5663984264bb5f9ef43cf57450143 (diff)
downloadtor-9386b0b28ad7c276eaaf4546a1764c605850dba3.tar.gz
tor-9386b0b28ad7c276eaaf4546a1764c605850dba3.zip
Move AuthDirListBadExits to dirauth module.
Diffstat (limited to 'src/feature/dirauth')
-rw-r--r--src/feature/dirauth/dirauth_options.inc4
-rw-r--r--src/feature/dirauth/dirvote.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/feature/dirauth/dirauth_options.inc b/src/feature/dirauth/dirauth_options.inc
index ea1c59e83c..af3a22c8fa 100644
--- a/src/feature/dirauth/dirauth_options.inc
+++ b/src/feature/dirauth/dirauth_options.inc
@@ -23,6 +23,10 @@ CONF_VAR(AuthDirGuardBWGuarantee, MEMUNIT, 0, "2 MB")
/** Boolean: are we on IPv6? */
CONF_VAR(AuthDirHasIPv6Connectivity, BOOL, 0, "0")
+/** True iff we should list bad exits, * and vote for all other exits as
+ * good. */
+CONF_VAR(AuthDirListBadExits, BOOL, 0, "0")
+
/** Do not permit more than this number of servers per IP address. */
CONF_VAR(AuthDirMaxServersPerAddr, POSINT, 0, "2")
diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c
index acb6617178..7caa6bf30d 100644
--- a/src/feature/dirauth/dirvote.c
+++ b/src/feature/dirauth/dirvote.c
@@ -4427,7 +4427,7 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key,
smartlist_t *routers, *routerstatuses;
char identity_digest[DIGEST_LEN];
char signing_key_digest[DIGEST_LEN];
- int listbadexits = options->AuthDirListBadExits;
+ const int listbadexits = d_options->AuthDirListBadExits;
routerlist_t *rl = router_get_routerlist();
time_t now = time(NULL);
time_t cutoff = now - ROUTER_MAX_AGE_TO_PUBLISH;