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

Generalize fmt_addr() to support IPv6 decorations.

Browse Source
This commit is contained in:
George Kadianakis 2012-03-31 13:48:20 +02:00
parent 458718d497
commit da6e0993dc
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/address.c
View File

@ -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 "???";

4
src/common/address.h
View File

@ -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);