[tor-commits] [tor/master] control: GETINFO address/ use new find address API

[nickm at torproject.org]

commit 75a2e7fcb7092790c81db91861f526208612fa2a
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Jul 14 13:02:21 2020 -0400

    control: GETINFO address/ use new find address API
    
    At the moment, this command only returns the IPv4. Do so by using the new
    relay_find_addr_to_publish().
    
    New commands to return IPv4 and IPv6 will be done with the work in tor#40039.
    
    Related to #40025
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/feature/control/control_getinfo.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/feature/control/control_getinfo.c b/src/feature/control/control_getinfo.c
index daf71f04c9..c489dfa865 100644
--- a/src/feature/control/control_getinfo.c
+++ b/src/feature/control/control_getinfo.c
@@ -132,12 +132,12 @@ getinfo_helper_misc(control_connection_t *conn, const char *question,
   } else if (!strcmp(question, "features/names")) {
     *answer = tor_strdup("VERBOSE_NAMES EXTENDED_EVENTS");
   } else if (!strcmp(question, "address")) {
-    uint32_t addr;
-    if (router_pick_published_address(get_options(), &addr, 0) < 0) {
+    tor_addr_t addr;
+    if (!relay_find_addr_to_publish(get_options(), AF_INET, false, &addr)) {
       *errmsg = "Address unknown";
       return -1;
     }
-    *answer = tor_dup_ip(addr);
+    *answer = tor_addr_to_str_dup(&addr);
     tor_assert_nonfatal(*answer);
   } else if (!strcmp(question, "traffic/read")) {
     tor_asprintf(answer, "%"PRIu64, (get_bytes_read()));