nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 13:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

control: GETINFO address/ use new find address API

Browse Source 
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@torproject.org>
This commit is contained in:
David Goulet 2020-07-14 13:02:21 -04:00
parent 1a347b4790
commit 75a2e7fcb7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/feature/control/control_getinfo.c
View File

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