From da6e0993dc4a0037933a522e2f578c145f6538cc Mon Sep 17 00:00:00 2001 From: George Kadianakis Date: Sat, 31 Mar 2012 13:48:20 +0200 Subject: Generalize fmt_addr() to support IPv6 decorations. --- src/common/address.c | 4 ++-- src/common/address.h | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index 676c48589..62cf16c03 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -991,11 +991,11 @@ tor_dup_addr(const tor_addr_t *addr) * fmt_addr 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 ""; - if (tor_addr_to_str(buf, addr, sizeof(buf), 0)) + if (tor_addr_to_str(buf, addr, sizeof(buf), decorate)) return buf; else return "???"; diff --git a/src/common/address.h b/src/common/address.h index ede035d64..bdb14eb39 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -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); -- cgit v1.2.3