From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 14 May 2018 18:12:36 +0000 (-0400)
Subject: Use router_get_my_routerinfo_with_err to implement the old version
X-Git-Tag: tor-0.3.4.1-alpha~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a9ef335c1b220ad632aad1d75f671a2fcd2b0863;p=thirdparty%2Ftor.git

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
---

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