From 09f03e6e3f6651281cf2bf7eb2968d9659a6658d Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 16 Dec 2019 13:20:31 -0500 Subject: Turn authdir_mode_v3() into a non-inline function This change means that authmode.h no longer needs to see or_options_t, and frees us from an ordering dependency. --- src/feature/dirauth/authmode.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/feature/dirauth/authmode.h') diff --git a/src/feature/dirauth/authmode.h b/src/feature/dirauth/authmode.h index 11bc40d8d1..c1134a4c2e 100644 --- a/src/feature/dirauth/authmode.h +++ b/src/feature/dirauth/authmode.h @@ -14,19 +14,12 @@ #ifdef HAVE_MODULE_DIRAUTH int authdir_mode(const or_options_t *options); +int authdir_mode_v3(const or_options_t *options); int authdir_mode_handles_descs(const or_options_t *options, int purpose); int authdir_mode_publishes_statuses(const or_options_t *options); int authdir_mode_tests_reachability(const or_options_t *options); int authdir_mode_bridge(const or_options_t *options); -/* Return true iff we believe ourselves to be a v3 authoritative directory - * server. */ -static inline int -authdir_mode_v3(const or_options_t *options) -{ - return authdir_mode(options) && options->V3AuthoritativeDir != 0; -} - /* Is the dirauth module enabled? */ #define have_module_dirauth() (1) -- cgit v1.2.3-54-g00ecf