astyled everything.

1 files changed, 29 insertions, 19 deletions

diff --git a/toxcore/LAN_discovery.c b/toxcore/LAN_discovery.c
index 92e42e0f..ed8dd229 100644
--- a/toxcore/LAN_discovery.c
+++ b/toxcore/LAN_discovery.c
@@ -35,7 +35,7 @@
  *  return higher than 0 on success.
  *  return 0 on error.
  */
-static uint32_t send_broadcasts(Networking_Core *net, uint16_t port, uint8_t * data, uint16_t length)
+static uint32_t send_broadcasts(Networking_Core *net, uint16_t port, uint8_t *data, uint16_t length)
 {
     /* Not sure how many platforms this will run on,
      * so it's wrapped in __linux for now.
@@ -63,16 +63,17 @@ static uint32_t send_broadcasts(Networking_Core *net, uint16_t port, uint8_t * d
     }
 
     for (i = 0; i < count; i++) {
-            if (ioctl(sock, SIOCGIFBRDADDR, &i_faces[i]) < 0) {
-                return 1;
-            }
-
-            /* Just to clarify where we're getting the values from. */
-            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, ip_port, data, 1 + crypto_box_PUBLICKEYBYTES);
-            }
+        if (ioctl(sock, SIOCGIFBRDADDR, &i_faces[i]) < 0) {
+            return 1;
+        }
+
+        /* Just to clarify where we're getting the values from. */
+        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, ip_port, data, 1 + crypto_box_PUBLICKEYBYTES);
+        }
     }
 
     close(sock);
@@ -87,6 +88,7 @@ static IP broadcast_ip(sa_family_t family_socket, sa_family_t family_broadcast)
     ip_reset(&ip);
 
 #ifdef TOX_ENABLE_IPV6
+
     if (family_socket == AF_INET6) {
         if (family_broadcast == AF_INET6) {
             ip.family = AF_INET6;
@@ -96,25 +98,26 @@ static IP broadcast_ip(sa_family_t family_socket, sa_family_t family_broadcast)
             ip.ip6.s6_addr[ 0] = 0xFF;
             ip.ip6.s6_addr[ 1] = 0x02;
             ip.ip6.s6_addr[15] = 0x01;
-        }
-        else if (family_broadcast == AF_INET) {
+        } 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;
         }
-    }
-    else if (family_socket == AF_INET) {
+    } else if (family_socket == AF_INET) {
         if (family_broadcast == AF_INET) {
             ip.family = AF_INET;
             ip.ip4.uint32 = INADDR_BROADCAST;
         }
     }
+
 #else
+
     if (family_socket == AF_INET)
         if (family_broadcast == AF_INET)
             ip.uint32 = INADDR_BROADCAST;
+
 #endif
 
     return ip;
@@ -126,11 +129,13 @@ static IP broadcast_ip(sa_family_t family_socket, sa_family_t family_broadcast)
 static int LAN_ip(IP ip)
 {
 #ifdef TOX_ENABLE_IPV6
+
     if (ip.family == AF_INET) {
         IP4 ip4 = ip.ip4;
 #else
-        IP4 ip4 = ip;
+    IP4 ip4 = ip;
 #endif
+
         /* Loopback. */
         if (ip4.uint8[0] == 127)
             return 0;
@@ -151,13 +156,14 @@ static int LAN_ip(IP ip)
         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) {
+    } 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)))
+                ((ip.ip6.s6_addr[0] == 0xFE) && ((ip.ip6.s6_addr[1] & 0xC0) == 0x80)))
             return 0;
 
         /* embedded IPv4-in-IPv6 */
@@ -168,6 +174,7 @@ static int LAN_ip(IP ip)
             return LAN_ip(ip4);
         }
     }
+
 #endif
 
     return -1;
@@ -203,9 +210,11 @@ int send_LANdiscovery(uint16_t port, Net_Crypto *c)
     ip_port.port = port;
 
 #ifdef TOX_ENABLE_IPV6
+
     /* IPv6 multicast */
     if (c->lossless_udp->net->family == AF_INET6) {
         ip_port.ip = broadcast_ip(AF_INET6, AF_INET6);
+
         if (ip_isset(&ip_port.ip))
             if (sendpacket(c->lossless_udp->net, ip_port, data, 1 + crypto_box_PUBLICKEYBYTES) > 0)
                 res = 1;
@@ -216,6 +225,7 @@ int send_LANdiscovery(uint16_t port, Net_Crypto *c)
 #else
     ip_port.ip = broadcast_ip(AF_INET, AF_INET);
 #endif
+
     if (ip_isset(&ip_port.ip))
         if (sendpacket(c->lossless_udp->net, ip_port, data, 1 + crypto_box_PUBLICKEYBYTES))
             res = 1;