Fixed portablity problems.

struct in6_addr member names can differ per platform.

1 files changed, 10 insertions, 10 deletions

diff --git a/toxcore/LAN_discovery.c b/toxcore/LAN_discovery.c
index c7afb991..db07755d 100644
--- a/toxcore/LAN_discovery.c
+++ b/toxcore/LAN_discovery.c
@@ -99,15 +99,15 @@ static IP broadcast_ip(sa_family_t family_socket, sa_family_t family_broadcast)
             /* 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;
+            ip.ip6.uint8[ 0] = 0xFF;
+            ip.ip6.uint8[ 1] = 0x02;
+            ip.ip6.uint8[15] = 0x01;
         } else if (family_broadcast == AF_INET) {
             ip.family = AF_INET6;
-            ip.ip6.s6_addr32[0] = 0;
-            ip.ip6.s6_addr32[1] = 0;
-            ip.ip6.s6_addr32[2] = htonl(0xFFFF);
-            ip.ip6.s6_addr32[3] = INADDR_BROADCAST;
+            ip.ip6.uint32[0] = 0;
+            ip.ip6.uint32[1] = 0;
+            ip.ip6.uint32[2] = htonl(0xFFFF);
+            ip.ip6.uint32[3] = INADDR_BROADCAST;
         }
     } else if (family_socket == AF_INET) {
         if (family_broadcast == AF_INET) {
@@ -166,15 +166,15 @@ static int LAN_ip(IP ip)
     {
         /* 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)))
+        if (((ip.ip6.uint8[0] == 0xFF) && (ip.ip6.uint8[1] < 3) && (ip.ip6.uint8[15] == 1)) ||
+                ((ip.ip6.uint8[0] == 0xFE) && ((ip.ip6.uint8[1] & 0xC0) == 0x80)))
             return 0;
 
         /* embedded IPv4-in-IPv6 */
         if (IN6_IS_ADDR_V4MAPPED(&ip.ip6)) {
             IP ip4;
             ip4.family = AF_INET;
-            ip4.ip4.uint32 = ip.ip6.s6_addr32[3];
+            ip4.ip4.uint32 = ip.ip6.uint32[3];
             return LAN_ip(ip4);
         }
     }