aboutsummaryrefslogtreecommitdiff
path: root/src/or/router.c
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2018-05-02 13:42:24 -0400
committerDavid Goulet <dgoulet@torproject.org>2018-05-02 13:42:24 -0400
commit1f739e9b06974566685c662c3526384efd68ed32 (patch)
treec2fdb73da5441b405518a5cc404e2af2299959eb /src/or/router.c
parent1ef1ed76d864b6c3147c0444d9114ebcc53c18b5 (diff)
downloadtor-1f739e9b06974566685c662c3526384efd68ed32.tar.gz
tor-1f739e9b06974566685c662c3526384efd68ed32.zip
dirauth: Move authdir_mode_v3() to module
This function must return false if the module is not compiled in. In order to do that, we move the authdir_mode_v3() function out of router.c and into the dirauth module new header file named mode.h. It is always returning false if we don't have the module. Closes #25990 Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/router.c')
-rw-r--r--src/or/router.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/or/router.c b/src/or/router.c
index 93b61b69ef..cc1979bcc9 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -35,6 +35,8 @@
#include "transports.h"
#include "routerset.h"
+#include "dirauth/mode.h"
+
/**
* \file router.c
* \brief Miscellaneous relay functionality, including RSA key maintenance,
@@ -1612,14 +1614,6 @@ authdir_mode(const or_options_t *options)
{
return options->AuthoritativeDir != 0;
}
-/** Return true iff we believe ourselves to be a v3 authoritative
- * directory server.
- */
-int
-authdir_mode_v3(const or_options_t *options)
-{
- return authdir_mode(options) && options->V3AuthoritativeDir != 0;
-}
/** Return true iff we are an authoritative directory server that is
* authoritative about receiving and serving descriptors of type
* <b>purpose</b> on its dirport.