1 files changed, 65 insertions, 20 deletions

diff --git a/toxcore/LAN_discovery.c b/toxcore/LAN_discovery.c
index 1980cd93..4cbe3177 100644
--- a/toxcore/LAN_discovery.c
+++ b/toxcore/LAN_discovery.c
@@ -71,7 +71,7 @@ static uint32_t send_broadcasts(Networking_Core *net, uint16_t port, uint8_t * d
             sock_holder = (struct sockaddr_in *)&i_faces[i].ifr_broadaddr;
             if (sock_holder != NULL) {
                 IP_Port ip_port = {{{{sock_holder->sin_addr.s_addr}}, port, 0}};
-                sendpacket(net->sock, ip_port, data, 1 + crypto_box_PUBLICKEYBYTES);
+                sendpacket(net, ip_port, data, 1 + crypto_box_PUBLICKEYBYTES);
             }
     }
 
@@ -81,10 +81,32 @@ static uint32_t send_broadcasts(Networking_Core *net, uint16_t port, uint8_t * d
 #endif
 
 /* Return the broadcast ip. */
-static IP broadcast_ip(void)
+static IP broadcast_ip(sa_family_t sa_family)
 {
     IP ip;
-    ip.uint32 = ~0;
+    ip_reset(&ip);
+
+#ifdef TOX_ENABLE_IPV6
+    if (sa_family == AF_INET)
+    {
+        ip.family = AF_INET;
+        ip.ip4.uint32 = INADDR_BROADCAST;
+    }
+
+    if (sa_family == AF_INET6)
+    {
+        ip.family = AF_INET6;
+        /* FF02::1 is - according to RFC 4291 - multicast all-nodes link-local */
+        /* FE80::*: MUST be exact, for that we would need to look over all
+         * interfaces and check in which status they are */
+        ip.ip6.s6_addr[ 0] = 0xFF;
+        ip.ip6.s6_addr[ 1] = 0x02;
+        ip.ip6.s6_addr[15] = 0x01;
+    }
+#else
+    ip.uint32 = INADDR_BROADCAST;
+#endif
+
     return ip;
 }
 
@@ -93,21 +115,42 @@ static IP broadcast_ip(void)
  */
 static int LAN_ip(IP ip)
 {
-    if (ip.uint8[0] == 127) /* Loopback. */
-        return 0;
-
-    if (ip.uint8[0] == 10) /* 10.0.0.0 to 10.255.255.255 range. */
-        return 0;
-
-    if (ip.uint8[0] == 172 && ip.uint8[1] >= 16 && ip.uint8[1] <= 31) /* 172.16.0.0 to 172.31.255.255 range. */
-        return 0;
-
-    if (ip.uint8[0] == 192 && ip.uint8[1] == 168) /* 192.168.0.0 to 192.168.255.255 range. */
-        return 0;
-
-    if (ip.uint8[0] == 169 && ip.uint8[1] == 254 && ip.uint8[2] != 0
-            && ip.uint8[2] != 255)/* 169.254.1.0 to 169.254.254.255 range. */
-        return 0;
+#ifdef TOX_ENABLE_IPV6
+    if (ip.family == AF_INET) {
+        IP4 ip4 = ip.ip4;
+#else
+        IP4 ip4 = ip;
+#endif
+        /* Loopback. */
+        if (ip4.uint8[0] == 127)
+            return 0;
+
+        /* 10.0.0.0 to 10.255.255.255 range. */
+        if (ip4.uint8[0] == 10)
+            return 0;
+
+        /* 172.16.0.0 to 172.31.255.255 range. */
+        if (ip4.uint8[0] == 172 && ip4.uint8[1] >= 16 && ip4.uint8[1] <= 31)
+            return 0;
+
+        /* 192.168.0.0 to 192.168.255.255 range. */
+        if (ip4.uint8[0] == 192 && ip4.uint8[1] == 168)
+            return 0;
+
+        /* 169.254.1.0 to 169.254.254.255 range. */
+        if (ip4.uint8[0] == 169 && ip4.uint8[1] == 254 && ip4.uint8[2] != 0
+                && ip4.uint8[2] != 255)
+            return 0;
+#ifdef TOX_ENABLE_IPV6
+    }
+    else if (ip.family == AF_INET6) {
+        /* autogenerated for each interface: FE80::* (up to FEBF::*)
+        /* FF02::1 is - according to RFC 4291 - multicast all-nodes link-local */
+        if (((ip.ip6.s6_addr[0] == 0xFF) && (ip.ip6.s6_addr[1] < 3) && (ip.ip6.s6_addr[15] == 1)) ||
+             ((ip.ip6.s6_addr[0] == 0xFE) && ((ip.ip6.s6_addr[1] & 0xC0) == 0x80)))
+            return 0;
+    }
+#endif
 
     return -1;
 }
@@ -135,8 +178,10 @@ int send_LANdiscovery(uint16_t port, Net_Crypto *c)
 #ifdef __linux
     send_broadcasts(c->lossless_udp->net, port, data, 1 + crypto_box_PUBLICKEYBYTES);
 #endif
-    IP_Port ip_port = {{broadcast_ip(), port, 0}};
-    return sendpacket(c->lossless_udp->net->sock, ip_port, data, 1 + crypto_box_PUBLICKEYBYTES);
+    IP_Port ip_port;
+    ip_port.ip = broadcast_ip(c->lossless_udp->net->family);
+    ip_port.port = port;
+    return sendpacket(c->lossless_udp->net, ip_port, data, 1 + crypto_box_PUBLICKEYBYTES);
 }