[tor-commits] [tor/master] Use router_get_my_routerinfo_with_err to implement the old version

[nickm@xxxxxxxxxxxxxx]

commit a9ef335c1b220ad632aad1d75f671a2fcd2b0863
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon May 14 14:12:36 2018 -0400

    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
---
 src/or/router.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/or/router.c b/src/or/router.c
index 47416640d..ea6597788 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

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits