mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-11 05:33:47 +01:00
Generalize fmt_addr() to support IPv6 decorations.
This commit is contained in:
parent
458718d497
commit
da6e0993dc
@ -991,11 +991,11 @@ tor_dup_addr(const tor_addr_t *addr)
|
||||
* <b>fmt_addr</b> invalidates the last result of the function. This
|
||||
* function is not thread-safe. */
|
||||
const char *
|
||||
fmt_addr(const tor_addr_t *addr)
|
||||
fmt_addr_impl(const tor_addr_t *addr, int decorate)
|
||||
{
|
||||
static char buf[TOR_ADDR_BUF_LEN];
|
||||
if (!addr) return "<null>";
|
||||
if (tor_addr_to_str(buf, addr, sizeof(buf), 0))
|
||||
if (tor_addr_to_str(buf, addr, sizeof(buf), decorate))
|
||||
return buf;
|
||||
else
|
||||
return "???";
|
||||
|
@ -135,7 +135,9 @@ tor_addr_eq_ipv4h(const tor_addr_t *a, uint32_t u)
|
||||
|
||||
int tor_addr_lookup(const char *name, uint16_t family, tor_addr_t *addr_out);
|
||||
char *tor_dup_addr(const tor_addr_t *addr) ATTR_MALLOC;
|
||||
const char *fmt_addr(const tor_addr_t *addr);
|
||||
#define fmt_addr(a) fmt_addr_impl(a, 0)
|
||||
#define fmt_and_decorate_addr(a) fmt_addr_impl(a, 1)
|
||||
const char *fmt_addr_impl(const tor_addr_t *addr, int decorate);
|
||||
const char * fmt_addr32(uint32_t addr);
|
||||
int get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user