summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-05-14 14:12:36 -0400
committerNick Mathewson <nickm@torproject.org>2018-05-14 14:12:36 -0400
commita9ef335c1b220ad632aad1d75f671a2fcd2b0863 (patch)
tree4ea2665a3f839fef1fb5ee9b003df4e445dcbd3e
parentd27fd7ff6bea7f68dfbf89a38219dbb302f45bf1 (diff)
downloadtor-a9ef335c1b220ad632aad1d75f671a2fcd2b0863.tar.gz
tor-a9ef335c1b220ad632aad1d75f671a2fcd2b0863.zip
Use router_get_my_routerinfo_with_err to implement the old version
Having one function implemented in terms of the other should keep them from diverging. follow-up on #25852
-rw-r--r--src/or/router.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/or/router.c b/src/or/router.c
index 47416640d9..ea65977882 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -2076,11 +2076,7 @@ router_is_me(const routerinfo_t *router)
MOCK_IMPL(const routerinfo_t *,
router_get_my_routerinfo,(void))
{
- if (!server_mode(get_options()))
- return NULL;
- if (router_rebuild_descriptor(0))
- return NULL;
- return desc_routerinfo;
+ return router_get_my_routerinfo_with_err(NULL);
}
/** Return routerinfo of this OR. Rebuild it from