summaryrefslogtreecommitdiff
path: root/src/common/address.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-13 10:43:41 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-13 10:43:41 -0400
commit5f2a1a7b4f20be121cd30def95cf7789924ca70a (patch)
treec9545f5af482e1380261a2fe7ba2e73b175b3b66 /src/common/address.h
parente0d5a6e1849673589c5b7f04d89e25194167344d (diff)
parent7f654a6a6fb5e956b996eece36ff95e590a6ad63 (diff)
downloadtor-5f2a1a7b4f20be121cd30def95cf7789924ca70a.tar.gz
tor-5f2a1a7b4f20be121cd30def95cf7789924ca70a.zip
Merge branch 'feature3076_squashed' into maint-0.2.2
Diffstat (limited to 'src/common/address.h')
-rw-r--r--src/common/address.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/common/address.h b/src/common/address.h
index d05a3de2e7..9a7656f69b 100644
--- a/src/common/address.h
+++ b/src/common/address.h
@@ -44,6 +44,7 @@ socklen_t tor_addr_to_sockaddr(const tor_addr_t *a, uint16_t port,
int tor_addr_from_sockaddr(tor_addr_t *a, const struct sockaddr *sa,
uint16_t *port_out);
void tor_addr_make_unspec(tor_addr_t *a);
+char *tor_sockaddr_to_str(const struct sockaddr *sa);
/** Return an in6_addr* equivalent to <b>a</b>, or NULL if <b>a</b> is not
* an IPv6 address. */