6 files changed, 122 insertions, 97 deletions

diff --git a/toxcore/DHT.h b/toxcore/DHT.h
index 255074b0..ff20c892 100644
--- a/toxcore/DHT.h
+++ b/toxcore/DHT.h
@@ -169,12 +169,12 @@ void DHT_bootstrap(DHT *dht, IP_Port ip_port, uint8_t *public_key);
  * if ipv6enabled is 0 (zero), the resolving sticks STRICTLY to IPv4 addresses
  * if ipv6enabled is not 0 (zero), the resolving looks for IPv6 addresses first,
  *   then IPv4 addresses.
- * 
+ *
  *  returns 1 if the address could be converted into an IP address
  *  returns 0 otherwise
  */
 int DHT_bootstrap_from_address(DHT *dht, const char *address, uint8_t ipv6enabled,
-                                            uint16_t port, uint8_t *public_key);
+                               uint16_t port, uint8_t *public_key);
 
 /* Add nodes to the toping list.
  * All nodes in this list are pinged every TIME_TOPING seconds
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;
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 55b27353..eb18e3a3 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -1225,11 +1225,13 @@ static time_t lastdump = 0;
 static char IDString[CLIENT_ID_SIZE * 2 + 1];
 static char *ID2String(uint8_t *client_id)
 {
-        uint32_t i;
-        for(i = 0; i < CLIENT_ID_SIZE; i++)
-                sprintf(&IDString[i], "%02X", client_id[i]);
-        IDString[CLIENT_ID_SIZE * 2] = 0;
-        return IDString;
+    uint32_t i;
+
+    for (i = 0; i < CLIENT_ID_SIZE; i++)
+        sprintf(&IDString[i], "%02X", client_id[i]);
+
+    IDString[CLIENT_ID_SIZE * 2] = 0;
+    return IDString;
 }
 #endif
 
@@ -1246,73 +1248,85 @@ void doMessenger(Messenger *m)
     LANdiscovery(m);
 
 #ifdef LOGGING
-        if (now() > lastdump + DUMPING_CLIENTS_FRIENDS_EVERY_N_SECONDS) {
-                loglog(" = = = = = = = = \n");
-
-                lastdump = now();
-                uint32_t client, last_pinged;
-                for(client = 0; client < LCLIENT_LIST; client++) {
-                        Client_data *cptr = &m->dht->close_clientlist[client];
-                        if (ip_isset(&cptr->ip_port.ip)) {
-                                last_pinged = lastdump - cptr->last_pinged;
-                                if (last_pinged > 999)
-                                        last_pinged = 999;
-                                snprintf(logbuffer, sizeof(logbuffer), "C[%2u] %s:%u [%3u] %s\n",
-                                                client, ip_ntoa(&cptr->ip_port.ip), ntohs(cptr->ip_port.port),
-                                                last_pinged, ID2String(cptr->client_id));
-                                loglog(logbuffer);
-                        }
-                }
-
-                loglog(" = = = = = = = = \n");
-
-                uint32_t num_friends = MIN(m->numfriends, m->dht->num_friends);
-                if (m->numfriends != m->dht->num_friends) {
-                        sprintf(logbuffer, "Friend num in DHT %u != friend num in msger %u\n",
-                                        m->dht->num_friends, m->numfriends);
-                        loglog(logbuffer);
-                }
-
-                uint32_t friend, ping_lastrecv;
-                for(friend = 0; friend < num_friends; friend++) {
-                        Friend *msgfptr = &m->friendlist[friend];
-                        DHT_Friend *dhtfptr = &m->dht->friends_list[friend];
-                        if (memcmp(msgfptr->client_id, dhtfptr->client_id, CLIENT_ID_SIZE)) {
-                                if (sizeof(logbuffer) > 2 * CLIENT_ID_SIZE + 64) {
-                                        sprintf(logbuffer, "F[%2u] ID(m) %s != ID(d) ", friend,
-                                                                                                        ID2String(msgfptr->client_id));
-                                        strcat(logbuffer + strlen(logbuffer), ID2String(dhtfptr->client_id));
-                                        strcat(logbuffer + strlen(logbuffer), "\n");
-                                }
-                                else
-                                        sprintf(logbuffer, "F[%2u] ID(m) != ID(d) ", friend);
-
-                                loglog(logbuffer);
-                        }
-
-                        ping_lastrecv = lastdump - msgfptr->ping_lastrecv;
-                        if (ping_lastrecv > 999)
-                                ping_lastrecv = 999;
-                        snprintf(logbuffer, sizeof(logbuffer), "F[%2u] <%s> %02u [%03u] %s\n",
-                                        friend, msgfptr->name, msgfptr->crypt_connection_id,
-                                        ping_lastrecv, ID2String(msgfptr->client_id));
-                        loglog(logbuffer);
-
-                        for(client = 0; client < MAX_FRIEND_CLIENTS; client++) {
-                                Client_data *cptr = &dhtfptr->client_list[client];
-                                last_pinged = lastdump - cptr->last_pinged;
-                                if (last_pinged > 999)
-                                        last_pinged = 999;
-                                snprintf(logbuffer, sizeof(logbuffer), "F[%2u] => C[%2u] %s:%u [%3u] %s\n",
-                                                friend, client, ip_ntoa(&cptr->ip_port.ip),
-                                                ntohs(cptr->ip_port.port), last_pinged,
-                                                ID2String(cptr->client_id));
-                                loglog(logbuffer);
-                        }
-                }
-
-                loglog(" = = = = = = = = \n");
-        }
+
+    if (now() > lastdump + DUMPING_CLIENTS_FRIENDS_EVERY_N_SECONDS) {
+        loglog(" = = = = = = = = \n");
+
+        lastdump = now();
+        uint32_t client, last_pinged;
+
+        for (client = 0; client < LCLIENT_LIST; client++) {
+            Client_data *cptr = &m->dht->close_clientlist[client];
+
+            if (ip_isset(&cptr->ip_port.ip)) {
+                last_pinged = lastdump - cptr->last_pinged;
+
+                if (last_pinged > 999)
+                    last_pinged = 999;
+
+                snprintf(logbuffer, sizeof(logbuffer), "C[%2u] %s:%u [%3u] %s\n",
+                         client, ip_ntoa(&cptr->ip_port.ip), ntohs(cptr->ip_port.port),
+                         last_pinged, ID2String(cptr->client_id));
+                loglog(logbuffer);
+            }
+        }
+
+        loglog(" = = = = = = = = \n");
+
+        uint32_t num_friends = MIN(m->numfriends, m->dht->num_friends);
+
+        if (m->numfriends != m->dht->num_friends) {
+            sprintf(logbuffer, "Friend num in DHT %u != friend num in msger %u\n",
+                    m->dht->num_friends, m->numfriends);
+            loglog(logbuffer);
+        }
+
+        uint32_t friend, ping_lastrecv;
+
+        for (friend = 0; friend < num_friends; friend++) {
+            Friend *msgfptr = &m->friendlist[friend];
+            DHT_Friend *dhtfptr = &m->dht->friends_list[friend];
+
+            if (memcmp(msgfptr->client_id, dhtfptr->client_id, CLIENT_ID_SIZE)) {
+                if (sizeof(logbuffer) > 2 * CLIENT_ID_SIZE + 64) {
+                    sprintf(logbuffer, "F[%2u] ID(m) %s != ID(d) ", friend,
+                            ID2String(msgfptr->client_id));
+                    strcat(logbuffer + strlen(logbuffer), ID2String(dhtfptr->client_id));
+                    strcat(logbuffer + strlen(logbuffer), "\n");
+                } else
+                    sprintf(logbuffer, "F[%2u] ID(m) != ID(d) ", friend);
+
+                loglog(logbuffer);
+            }
+
+            ping_lastrecv = lastdump - msgfptr->ping_lastrecv;
+
+            if (ping_lastrecv > 999)
+                ping_lastrecv = 999;
+
+            snprintf(logbuffer, sizeof(logbuffer), "F[%2u] <%s> %02u [%03u] %s\n",
+                     friend, msgfptr->name, msgfptr->crypt_connection_id,
+                     ping_lastrecv, ID2String(msgfptr->client_id));
+            loglog(logbuffer);
+
+            for (client = 0; client < MAX_FRIEND_CLIENTS; client++) {
+                Client_data *cptr = &dhtfptr->client_list[client];
+                last_pinged = lastdump - cptr->last_pinged;
+
+                if (last_pinged > 999)
+                    last_pinged = 999;
+
+                snprintf(logbuffer, sizeof(logbuffer), "F[%2u] => C[%2u] %s:%u [%3u] %s\n",
+                         friend, client, ip_ntoa(&cptr->ip_port.ip),
+                         ntohs(cptr->ip_port.port), last_pinged,
+                         ID2String(cptr->client_id));
+                loglog(logbuffer);
+            }
+        }
+
+        loglog(" = = = = = = = = \n");
+    }
+
 #endif
 }
 
@@ -1410,6 +1424,7 @@ int Messenger_load(Messenger *m, uint8_t *data, uint32_t length)
         memcpy(temp, data, size);
 
         uint32_t i;
+
         for (i = 0; i < num; ++i) {
             if (temp[i].status >= 3) {
                 int fnum = m_addfriend_norequest(m, temp[i].client_id);
diff --git a/toxcore/ping.c b/toxcore/ping.c
index 113702bf..56ce2f59 100644
--- a/toxcore/ping.c
+++ b/toxcore/ping.c
@@ -113,7 +113,7 @@ bool is_pinging(void *ping, IP_Port ipp, uint64_t ping_id)    // O(n) TODO: Repl
 
         /* ping_id = 0 means match any id. */
         if ((!ip_isset(&ipp.ip) || ipport_equal(&png->pings[id].ipp, &ipp)) &&
-                            (png->pings[id].id == ping_id || ping_id == 0)) {
+                (png->pings[id].id == ping_id || ping_id == 0)) {
             return true;
         }
     }
diff --git a/toxcore/tox.c b/toxcore/tox.c
index 68b1e6e9..80d64626 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -450,7 +450,7 @@ void tox_bootstrap_from_ip(void *tox, IP_Port ip_port, uint8_t *public_key)
     DHT_bootstrap(m->dht, ip_port, public_key);
 }
 int tox_bootstrap_from_address(void *tox, const char *address,
-                        uint8_t ipv6enabled, uint16_t port, uint8_t *public_key)
+                               uint8_t ipv6enabled, uint16_t port, uint8_t *public_key)
 {
     Messenger *m = tox;
     return DHT_bootstrap_from_address(m->dht, address, ipv6enabled, port, public_key);
diff --git a/toxcore/tox.h b/toxcore/tox.h
index c52a644f..a15d7ea0 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -409,12 +409,12 @@ void tox_bootstrap_from_ip(Tox *tox, tox_IP_Port ip_port, uint8_t *public_key);
  * if ipv6enabled is 0 (zero), the resolving sticks STRICTLY to IPv4 addresses
  * if ipv6enabled is not 0 (zero), the resolving looks for IPv6 addresses first,
  *   then IPv4 addresses.
- * 
+ *
  *  returns 1 if the address could be converted into an IP address
  *  returns 0 otherwise
  */
 int tox_bootstrap_from_address(Tox *tox, const char *address, uint8_t ipv6enabled,
-                      uint16_t port, uint8_t *public_key);
+                               uint16_t port, uint8_t *public_key);
 
 /*  return 0 if we are not connected to the DHT.
  *  return 1 if we are.