aboutsummaryrefslogtreecommitdiff
path: root/src/or/router.c
diff options
context:
space:
mode:
authorhuyvq <huyvq.c633@gmail.com>2017-06-02 23:32:41 +0700
committerNick Mathewson <nickm@torproject.org>2017-06-21 13:49:17 -0400
commit18cd1993ca852b25a18b266ae7d8dcecf573525a (patch)
treec81f07b8ed0b2fa8bc49b5169ef7e8c1512e3d29 /src/or/router.c
parentd92b999757336249bcff15c5c498e6e5353d38c4 (diff)
downloadtor-18cd1993ca852b25a18b266ae7d8dcecf573525a.tar.gz
tor-18cd1993ca852b25a18b266ae7d8dcecf573525a.zip
Convert authdir_mode_handles_descs() to alternative wrappers
-authdir_mode_handles_descs(options, ROUTER_PURPOSE_BRIDGE) to authdir_mode_bridge(options). - authdir_mode_handles_descs(options, ROUTER_PURPOSE_GENERAL) to authdir_mode_v3(options).
Diffstat (limited to 'src/or/router.c')
-rw-r--r--src/or/router.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/router.c b/src/or/router.c
index a264af1551..e12f13865d 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1065,7 +1065,7 @@ init_keys(void)
/* 4. Build our router descriptor. */
/* Must be called after keys are initialized. */
mydesc = router_get_my_descriptor();
- if (authdir_mode_handles_descs(options, ROUTER_PURPOSE_GENERAL)) {
+ if (authdir_mode_v3(options)) {
const char *m = NULL;
routerinfo_t *ri;
/* We need to add our own fingerprint so it gets recognized. */
@@ -1615,7 +1615,7 @@ authdir_mode_handles_descs(const or_options_t *options, int purpose)
else if (purpose == ROUTER_PURPOSE_GENERAL)
return authdir_mode_v3(options);
else if (purpose == ROUTER_PURPOSE_BRIDGE)
- return (options->BridgeAuthoritativeDir);
+ return authdir_mode_bridge(options);
else
return 0;
}