get_interface_addr6(), and by extension get_interface_addr(), were pretty borked...

svn:r17789

diff --git a/ChangeLog b/ChangeLog
index c8adac3a30065bf32b00f6043c38163d8be346fc..36fd7073119a12575444840c6485fd5f09b610be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Changes in version 0.2.1.10-alpha - 2009-??-??
+  o Minor bugfixes
+    - Make get_interface_address() function work properly again; stop
+      guessing the wrong parts of our address as our address.
+
+
 Changes in version 0.2.1.9-alpha - 2008-12-25
   o New directory authorities:
     - gabelmoo (the authority run by Karsten Loesing) now has a new

diff --git a/src/common/address.c b/src/common/address.c
index 2156ed227b4cf2d88f98de814d150025fc9b3fc7..7ae36d4e8b00e302fa13119c1d4eeb4831eac69f 100644 (file)
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -1088,7 +1088,7 @@ get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr)
     goto err;
   }
 
-  memcpy(addr, &my_addr, sizeof(tor_addr_t));
+  tor_addr_from_sockaddr(addr, (struct sockaddr*)&my_addr, NULL);
   r=0;
  err:
   if (sock >= 0)