commit ad97714f22ace023bda9f334687239127a71413a Author: huyvq huyvq.c633@gmail.com Date: Fri Jun 2 23:33:40 2017 +0700
Remove obsolete authdir_mode_any_nonhidserv()
- Replace it with authdir_mode() --- src/or/router.c | 12 ++---------- src/or/router.h | 1 - src/or/routerlist.c | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/src/or/router.c b/src/or/router.c index e12f138..f2052f4 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1596,14 +1596,6 @@ authdir_mode_v3(const or_options_t *options) { return authdir_mode(options) && options->V3AuthoritativeDir != 0; } -/** Return true if we believe ourselves to be any kind of - * authoritative directory beyond just a hidserv authority. */ -int -authdir_mode_any_nonhidserv(const or_options_t *options) -{ - return options->BridgeAuthoritativeDir || - authdir_mode_any_main(options); -} /** 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. Use -1 for "any purpose". */ @@ -1611,7 +1603,7 @@ int authdir_mode_handles_descs(const or_options_t *options, int purpose) { if (purpose < 0) - return authdir_mode_any_nonhidserv(options); + return authdir_mode(options); else if (purpose == ROUTER_PURPOSE_GENERAL) return authdir_mode_v3(options); else if (purpose == ROUTER_PURPOSE_BRIDGE) @@ -1627,7 +1619,7 @@ authdir_mode_publishes_statuses(const or_options_t *options) { if (authdir_mode_bridge(options)) return 0; - return authdir_mode_any_nonhidserv(options); + return authdir_mode(options); } /** Return true iff we are an authoritative directory server that * tests reachability of the descriptors it learns about. diff --git a/src/or/router.h b/src/or/router.h index 2e62185..97f3317 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -54,7 +54,6 @@ int net_is_disabled(void);
int authdir_mode(const or_options_t *options); int authdir_mode_v3(const or_options_t *options); -int authdir_mode_any_nonhidserv(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); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index da072be..8adaaf6 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5033,7 +5033,7 @@ launch_descriptor_downloads(int purpose, } }
- if (!authdir_mode_any_nonhidserv(options)) { + if (!authdir_mode(options)) { /* If we wind up going to the authorities, we want to only open one * connection to each authority at a time, so that we don't overload * them. We do this by setting PDS_NO_EXISTING_SERVERDESC_FETCH