4 files changed, 9 insertions, 9 deletions

diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index 102abe06..fed12861 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -830,7 +830,7 @@ int addto_lists(DHT *dht, IP_Port ip_port, uint8_t *client_id)
     uint32_t i, used = 0;
 
     /* convert IPv4-in-IPv6 to IPv4 */
-    if ((ip_port.ip.family == AF_INET6) && IN6_IS_ADDR_V4MAPPED(&ip_port.ip.ip6.in6_addr)) {
+    if ((ip_port.ip.family == AF_INET6) && IPV6_IPV4_IN_V6(ip_port.ip.ip6)) {
         ip_port.ip.family = AF_INET;
         ip_port.ip.ip4.uint32 = ip_port.ip.ip6.uint32[3];
     }
@@ -900,7 +900,7 @@ static int returnedip_ports(DHT *dht, IP_Port ip_port, uint8_t *client_id, uint8
     uint32_t used = 0;
 
     /* convert IPv4-in-IPv6 to IPv4 */
-    if ((ip_port.ip.family == AF_INET6) && IN6_IS_ADDR_V4MAPPED(&ip_port.ip.ip6.in6_addr)) {
+    if ((ip_port.ip.family == AF_INET6) && IPV6_IPV4_IN_V6(ip_port.ip.ip6)) {
         ip_port.ip.family = AF_INET;
         ip_port.ip.ip4.uint32 = ip_port.ip.ip6.uint32[3];
     }
diff --git a/toxcore/LAN_discovery.c b/toxcore/LAN_discovery.c
index 9d1f055e..2deeadfd 100644
--- a/toxcore/LAN_discovery.c
+++ b/toxcore/LAN_discovery.c
@@ -192,7 +192,7 @@ int LAN_ip(IP ip)
             return 0;
 
         /* embedded IPv4-in-IPv6 */
-        if (IN6_IS_ADDR_V4MAPPED(&ip.ip6.in6_addr)) {
+        if (IPV6_IPV4_IN_V6(ip.ip6)) {
             IP ip4;
             ip4.family = AF_INET;
             ip4.ip4.uint32 = ip.ip6.uint32[3];
@@ -200,7 +200,7 @@ int LAN_ip(IP ip)
         }
 
         /* localhost in IPv6 (::1) */
-        if (IN6_IS_ADDR_LOOPBACK(&ip.ip6.in6_addr))
+        if (ip.ip6.uint64[0] == 0 && ip.ip6.uint32[2] == 0 && ip.ip6.uint32[3] == htonl(1))
             return 0;
     }
 
diff --git a/toxcore/network.c b/toxcore/network.c
index 647940c3..b71c6ba9 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -386,7 +386,7 @@ static int receivepacket(sock_t sock, IP_Port *ip_port, uint8_t *data, uint32_t
         ip_port->ip.ip6.in6_addr = addr_in6->sin6_addr;
         ip_port->port = addr_in6->sin6_port;
 
-        if (IN6_IS_ADDR_V4MAPPED(&ip_port->ip.ip6.in6_addr)) {
+        if (IPV6_IPV4_IN_V6(ip_port->ip.ip6)) {
             ip_port->ip.family = AF_INET;
             ip_port->ip.ip4.uint32 = ip_port->ip.ip6.uint32[3];
         }
@@ -451,8 +451,6 @@ int networking_at_startup(void)
     if (WSAStartup(MAKEWORD(2, 2), &wsaData) != NO_ERROR)
         return -1;
 
-#else
-    srandom((uint32_t)current_time_actual());
 #endif
     srand((uint32_t)current_time_actual());
     at_startup_ran = 1;
@@ -665,10 +663,10 @@ int ip_equal(IP *a, IP *b)
 
     /* different family: check on the IPv6 one if it is the IPv4 one embedded */
     if ((a->family == AF_INET) && (b->family == AF_INET6)) {
-        if (IN6_IS_ADDR_V4MAPPED(&b->ip6.in6_addr))
+        if (IPV6_IPV4_IN_V6(b->ip6))
             return (a->ip4.in_addr.s_addr == b->ip6.uint32[3]);
     } else if ((a->family == AF_INET6)  && (b->family == AF_INET)) {
-        if (IN6_IS_ADDR_V4MAPPED(&a->ip6.in6_addr))
+        if (IPV6_IPV4_IN_V6(a->ip6))
             return (a->ip6.uint32[3] == b->ip4.in_addr.s_addr);
     }
 
diff --git a/toxcore/network.h b/toxcore/network.h
index bf14f319..e33e111f 100644
--- a/toxcore/network.h
+++ b/toxcore/network.h
@@ -174,6 +174,8 @@ typedef struct __attribute__ ((__packed__)) __attribute__((gcc_struct))
 }
 IP_Port;
 
+/* Does the IP6 struct a contain an IPv4 address in an IPv6 one? */
+#define IPV6_IPV4_IN_V6(a) ((a.uint64[0] == 0) && (a.uint32[2] == htonl (0xffff)))
 
 #define SIZE_IP4 4
 #define SIZE_IP6 16