Try once again to make BSD compilation happy.

svn:r16474

2 files changed, 9 insertions, 1 deletions

diff --git a/src/common/address.c b/src/common/address.c
index ac4ae041d8..978d11e914 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -635,6 +635,13 @@ tor_addr_from_ipv6_bytes(tor_addr_t *dest, const char *ipv6_bytes)
   memcpy(dest->addr.in6_addr.s6_addr, ipv6_bytes, 16);
 }
 
+/** DOCDOC */
+void
+tor_addr_from_in6(tor_addr_t *dest, const struct in6_addr *in6)
+{
+  tor_addr_from_ipv6_bytes(dest, (const char*)in6->s6_addr);
+}
+
 /** Copy a tor_addr_t from <b>src</b> to <b>dest</b>.
  */
 void
diff --git a/src/common/address.h b/src/common/address.h
index c206bf1445..5f9e01910a 100644
--- a/src/common/address.h
+++ b/src/common/address.h
@@ -127,7 +127,8 @@ void tor_addr_from_ipv4n(tor_addr_t *dest, uint32_t v4addr);
  * order. */
 #define tor_addr_from_ipv4h(dest, v4addr)       \
   tor_addr_from_ipv4n((dest), htonl(v4addr))
-void tor_addr_from_ipv6_bytes(tor_addr_t *dest, const char *byets);
+void tor_addr_from_ipv6_bytes(tor_addr_t *dest, const char *bytes);
+void tor_addr_from_in6(tor_addr_t *dest, const struct in6_addr *in6);
 int tor_addr_is_null(const tor_addr_t *addr);
 int tor_addr_is_loopback(const tor_addr_t *addr);