1 files changed, 155 insertions, 212 deletions

diff --git a/core/DHT.c b/core/DHT.c
index 857ac5e8..9c2245c7 100644
--- a/core/DHT.c
+++ b/core/DHT.c
@@ -23,8 +23,7 @@
 
 #include "DHT.h"
 
-typedef struct
-{
+typedef struct {
     uint8_t client_id[CLIENT_ID_SIZE];
     IP_Port ip_port;
     uint32_t timestamp;
@@ -32,13 +31,12 @@ typedef struct
     IP_Port ret_ip_port;/* The ip_port returned by this node for the friend 
                            (for nodes in friends_list) or us (for nodes in close_clientlist) */
     uint32_t ret_timestamp;                       
-}Client_data;
+} Client_data;
 
 /* maximum number of clients stored per friend. */
 #define MAX_FRIEND_CLIENTS 8
 
-typedef struct
-{
+typedef struct {
     uint8_t client_id[CLIENT_ID_SIZE];
     Client_data client_list[MAX_FRIEND_CLIENTS];
     uint32_t lastgetnode; /* time at which the last get_nodes request was sent. */
@@ -49,21 +47,19 @@ typedef struct
     uint32_t punching_timestamp;
     uint64_t NATping_id;
     uint32_t NATping_timestamp;
-}Friend;
+} Friend;
 
-typedef struct
-{
+typedef struct {
     uint8_t client_id[CLIENT_ID_SIZE];
     IP_Port ip_port;
-}Node_format;
+} Node_format;
 
-typedef struct
-{
+typedef struct {
     IP_Port ip_port;
     uint64_t ping_id;
     uint32_t timestamp;
     
-}Pinged;
+} Pinged;
 
 /* Our client id/public key */
 uint8_t self_public_key[CLIENT_ID_SIZE];
@@ -74,7 +70,7 @@ uint8_t self_secret_key[crypto_box_SECRETKEYBYTES];
 #define LCLIENT_LIST 32
 static Client_data close_clientlist[LCLIENT_LIST];
 
-static Friend * friends_list;
+static Friend *friends_list;
 static uint16_t num_friends;
 
 /* The list of ip ports along with the ping_id of what we sent them and a timestamp */
@@ -90,19 +86,16 @@ static Pinged send_nodes[LSEND_NODES_ARRAY];
    return 0 if both are same distance
    return 1 if client_id1 is closer
    return 2 if client_id2 is closer */
-int id_closest(uint8_t * client_id, uint8_t * client_id1, uint8_t * client_id2) /* tested */
+int id_closest(uint8_t *client_id, uint8_t *client_id1, uint8_t *client_id2) /* tested */
 {
     uint32_t i;
-    for(i = 0; i < CLIENT_ID_SIZE; ++i) {
-        if(abs(client_id[i] ^ client_id1[i]) < abs(client_id[i] ^ client_id2[i])) {
+    for (i = 0; i < CLIENT_ID_SIZE; ++i) {
+        if(abs(client_id[i] ^ client_id1[i]) < abs(client_id[i] ^ client_id2[i]))
             return 1;
-        } else if(abs(client_id[i] ^ client_id1[i]) > abs(client_id[i] ^ client_id2[i])) {
+        else if(abs(client_id[i] ^ client_id1[i]) > abs(client_id[i] ^ client_id2[i]))
             return 2;
-        }
     }
-    
     return 0;
-    
 }
 
 /* check if client with client_id is already in list of length length.
@@ -110,15 +103,16 @@ int id_closest(uint8_t * client_id, uint8_t * client_id1, uint8_t * client_id2)
    if the id is already in the list with a different ip_port, update it.
    return True(1) or False(0)
    TODO: maybe optimize this. */
-int client_in_list(Client_data * list, uint32_t length, uint8_t * client_id, IP_Port ip_port)
+int client_in_list(Client_data *list, uint32_t length, uint8_t *client_id, IP_Port ip_port)
 {
     uint32_t i;
     uint32_t temp_time = unix_time();
     
-    for(i = 0; i < length; ++i) {
+    for (i = 0; i < length; ++i) {
         /*If ip_port is assigned to a different client_id replace it*/
         if(list[i].ip_port.ip.i == ip_port.ip.i &&
-        list[i].ip_port.port == ip_port.port) {
+           list[i].ip_port.port == ip_port.port)
+        {
             memcpy(list[i].client_id, client_id, CLIENT_ID_SIZE);
         }
         
@@ -136,14 +130,12 @@ int client_in_list(Client_data * list, uint32_t length, uint8_t * client_id, IP_
 
 /* check if client with client_id is already in node format list of length length.
    return True(1) or False(0) */
-int client_in_nodelist(Node_format * list, uint32_t length, uint8_t * client_id)
+int client_in_nodelist(Node_format *list, uint32_t length, uint8_t *client_id)
 {
     uint32_t i;
-    for(i = 0; i < length; ++i) {
-        if(memcmp(list[i].client_id, client_id, CLIENT_ID_SIZE) == 0) {
-
+    for (i = 0; i < length; ++i) {
+        if (memcmp(list[i].client_id, client_id, CLIENT_ID_SIZE) == 0)
             return 1;
-        }
     }
     return 0;
     
@@ -151,14 +143,12 @@ int client_in_nodelist(Node_format * list, uint32_t length, uint8_t * client_id)
 
 /*Return the friend number from the client_id
  Return -1 if failure, number of friend if success*/
-static int friend_number(uint8_t * client_id)
+static int friend_number(uint8_t *client_id)
 {
     uint32_t i;
-    for(i = 0; i < num_friends; ++i) {
-        if(memcmp(friends_list[i].client_id, client_id, CLIENT_ID_SIZE) == 0) /* Equal */
-        {
+    for (i = 0; i < num_friends; ++i) {
+        if (memcmp(friends_list[i].client_id, client_id, CLIENT_ID_SIZE) == 0) /* Equal */
             return i;
-        }
     }
     return -1;
 }
@@ -171,14 +161,15 @@ static int friend_number(uint8_t * client_id)
 /* Find MAX_SENT_NODES nodes closest to the client_id for the send nodes request:
    put them in the nodes_list and return how many were found.
    TODO: Make this function much more efficient. */
-int get_close_nodes(uint8_t * client_id, Node_format * nodes_list)
+int get_close_nodes(uint8_t *client_id, Node_format * nodes_list)
 {
     uint32_t i, j, k;
     int num_nodes=0;
     uint32_t temp_time = unix_time();
-    for(i = 0; i < LCLIENT_LIST; ++i) {
-        if(close_clientlist[i].timestamp + BAD_NODE_TIMEOUT > temp_time && 
-        !client_in_nodelist(nodes_list, MAX_SENT_NODES,close_clientlist[i].client_id)) {
+    for (i = 0; i < LCLIENT_LIST; ++i) {
+        if (close_clientlist[i].timestamp + BAD_NODE_TIMEOUT > temp_time && 
+            !client_in_nodelist(nodes_list, MAX_SENT_NODES,close_clientlist[i].client_id))
+        {
         /* if node is good and not already in list. */
             if(num_nodes < MAX_SENT_NODES) {
                     memcpy(nodes_list[num_nodes].client_id, close_clientlist[i].client_id, CLIENT_ID_SIZE);
@@ -194,12 +185,12 @@ int get_close_nodes(uint8_t * client_id, Node_format * nodes_list)
             }
         }    
     }
-    for(i = 0; i < num_friends; ++i) {
-        for(j = 0; j < MAX_FRIEND_CLIENTS; ++j) {
-            if(friends_list[i].client_list[j].timestamp + BAD_NODE_TIMEOUT > temp_time && 
+    for (i = 0; i < num_friends; ++i) {
+        for (j = 0; j < MAX_FRIEND_CLIENTS; ++j) {
+            if (friends_list[i].client_list[j].timestamp + BAD_NODE_TIMEOUT > temp_time && 
             !client_in_nodelist(nodes_list, MAX_SENT_NODES,friends_list[i].client_list[j].client_id)) {
             /* if node is good and not already in list. */
-                if(num_nodes < MAX_SENT_NODES) {
+                if (num_nodes < MAX_SENT_NODES) {
                         memcpy(nodes_list[num_nodes].client_id, friends_list[i].client_list[j].client_id, CLIENT_ID_SIZE);
                         nodes_list[num_nodes].ip_port = friends_list[i].client_list[j].ip_port;
                         num_nodes++;
@@ -220,12 +211,12 @@ int get_close_nodes(uint8_t * client_id, Node_format * nodes_list)
 /* replace first bad (or empty) node with this one
    return 0 if successful
    return 1 if not (list contains no bad nodes) */
-int replace_bad(Client_data * list, uint32_t length, uint8_t * client_id, IP_Port ip_port) /* tested */
+int replace_bad(Client_data *list, uint32_t length, uint8_t *client_id, IP_Port ip_port) /* tested */
 {
     uint32_t i;
     uint32_t temp_time = unix_time();
-    for(i = 0; i < length; ++i) {
-        if(list[i].timestamp + BAD_NODE_TIMEOUT < temp_time) /* if node is bad. */ {
+    for (i = 0; i < length; ++i) {
+        if (list[i].timestamp + BAD_NODE_TIMEOUT < temp_time) /* if node is bad. */ {
             memcpy(list[i].client_id, client_id, CLIENT_ID_SIZE);
             list[i].ip_port = ip_port;
             list[i].timestamp = temp_time;
@@ -240,13 +231,13 @@ int replace_bad(Client_data * list, uint32_t length, uint8_t * client_id, IP_Por
 }
 
 /* replace the first good node that is further to the comp_client_id than that of the client_id in the list */
-int replace_good(Client_data * list, uint32_t length, uint8_t * client_id, IP_Port ip_port, uint8_t * comp_client_id)
+int replace_good(Client_data *list, uint32_t length, uint8_t *client_id, IP_Port ip_port, uint8_t *comp_client_id)
 {
     uint32_t i;
     uint32_t temp_time = unix_time();
     
-    for(i = 0; i < length; ++i) {
-        if(id_closest(comp_client_id, list[i].client_id, client_id) == 2) {
+    for (i = 0; i < length; ++i) {
+        if (id_closest(comp_client_id, list[i].client_id, client_id) == 2) {
             memcpy(list[i].client_id, client_id, CLIENT_ID_SIZE);
             list[i].ip_port = ip_port;
             list[i].timestamp = temp_time;
@@ -261,17 +252,14 @@ int replace_good(Client_data * list, uint32_t length, uint8_t * client_id, IP_Po
 }
 
 /* Attempt to add client with ip_port and client_id to the friends client list and close_clientlist */
-void addto_lists(IP_Port ip_port, uint8_t * client_id)
+void addto_lists(IP_Port ip_port, uint8_t *client_id)
 {
     uint32_t i;
     
     /* NOTE: current behavior if there are two clients with the same id is to replace the first ip by the second. */
-    if(!client_in_list(close_clientlist, LCLIENT_LIST, client_id, ip_port)) {
-         
-        if(replace_bad(close_clientlist, LCLIENT_LIST, client_id, ip_port)) {
-            /* if we can't replace bad nodes we try replacing good ones */
-            replace_good(close_clientlist, LCLIENT_LIST, client_id, ip_port, self_public_key);
-        }    
+    if (!client_in_list(close_clientlist, LCLIENT_LIST, client_id, ip_port)) {
+        if (replace_bad(close_clientlist, LCLIENT_LIST, client_id, ip_port)) 
+            replace_good(close_clientlist, LCLIENT_LIST, client_id, ip_port, self_public_key); /* if we can't replace bad nodes we try replacing good ones */
     }
     for(i = 0; i < num_friends; ++i) {
         if(!client_in_list(friends_list[i].client_list, MAX_FRIEND_CLIENTS, client_id, ip_port)) {  
@@ -285,30 +273,31 @@ void addto_lists(IP_Port ip_port, uint8_t * client_id)
 
 /* If client_id is a friend or us, update ret_ip_port  
    nodeclient_id is the id of the node that sent us this info */
-void returnedip_ports(IP_Port ip_port, uint8_t * client_id, uint8_t * nodeclient_id)
+void returnedip_ports(IP_Port ip_port, uint8_t *client_id, uint8_t *nodeclient_id)
 {
     uint32_t i, j;
     uint32_t temp_time = unix_time();
-    if(memcmp(client_id, self_public_key, CLIENT_ID_SIZE) == 0) {
-        for(i = 0; i < LCLIENT_LIST; ++i) {
-            if(memcmp(nodeclient_id, close_clientlist[i].client_id, CLIENT_ID_SIZE) == 0) {
+    if (memcmp(client_id, self_public_key, CLIENT_ID_SIZE) == 0) {
+        for (i = 0; i < LCLIENT_LIST; ++i) {
+            if (memcmp(nodeclient_id, close_clientlist[i].client_id, CLIENT_ID_SIZE) == 0) {
                 close_clientlist[i].ret_ip_port = ip_port;
                 close_clientlist[i].ret_timestamp = temp_time;
                 return;
             }
         }
     }
-    else
-    for(i = 0; i < num_friends; ++i) {
-        if(memcmp(client_id, friends_list[i].client_id, CLIENT_ID_SIZE) == 0) {
-            for(j = 0; j < MAX_FRIEND_CLIENTS; ++j) {
-                if(memcmp(nodeclient_id, friends_list[i].client_list[j].client_id, CLIENT_ID_SIZE) == 0) {
-                    friends_list[i].client_list[j].ret_ip_port = ip_port;
-                    friends_list[i].client_list[j].ret_timestamp = temp_time;
-                    return;
-                }
-            }
-        }
+    else {
+       for (i = 0; i < num_friends; ++i) {
+           if (memcmp(client_id, friends_list[i].client_id, CLIENT_ID_SIZE) == 0) {
+               for (j = 0; j < MAX_FRIEND_CLIENTS; ++j) {
+                   if (memcmp(nodeclient_id, friends_list[i].client_list[j].client_id, CLIENT_ID_SIZE) == 0) {
+                       friends_list[i].client_list[j].ret_ip_port = ip_port;
+                       friends_list[i].client_list[j].ret_timestamp = temp_time;
+                       return;
+                   }
+               }
+           }
+       }
     }
 }
 
@@ -326,25 +315,23 @@ int is_pinging(IP_Port ip_port, uint64_t ping_id)
     uint8_t pinging;
     uint32_t temp_time = unix_time();
 
-    for(i = 0; i < LPING_ARRAY; ++i ) {
-        if((pings[i].timestamp + PING_TIMEOUT) > temp_time) {
+    for (i = 0; i < LPING_ARRAY; ++i ) {
+        if ((pings[i].timestamp + PING_TIMEOUT) > temp_time) {
             pinging = 0;
-            if(ip_port.ip.i != 0) {
+            if (ip_port.ip.i != 0) {
                 if(pings[i].ip_port.ip.i == ip_port.ip.i &&
-                pings[i].ip_port.port == ip_port.port) {
+                   pings[i].ip_port.port == ip_port.port)
+                {
                         ++pinging;
                 }
             }
-            if(ping_id != 0) {
+            if (ping_id != 0) {
                 if(pings[i].ping_id == ping_id)
-                {
                         ++pinging;
-                }
+
             }
-            if(pinging == (ping_id != 0) + (ip_port.ip.i != 0)) {
+            if(pinging == (ping_id != 0) + (ip_port.ip.i != 0))
                     return 1;
-            }
-            
         }
     }
 
@@ -359,24 +346,21 @@ int is_gettingnodes(IP_Port ip_port, uint64_t ping_id)
     uint8_t pinging;
     uint32_t temp_time = unix_time();
 
-    for(i = 0; i < LSEND_NODES_ARRAY; ++i ) {
-        if((send_nodes[i].timestamp + PING_TIMEOUT) > temp_time) {
+    for(i = 0; i < LSEND_NODES_ARRAY; ++i) {
+        if ((send_nodes[i].timestamp + PING_TIMEOUT) > temp_time) {
             pinging = 0;
-            if(ip_port.ip.i != 0) {
-                if(send_nodes[i].ip_port.ip.i == ip_port.ip.i &&
+            if (ip_port.ip.i != 0) {
+                if (send_nodes[i].ip_port.ip.i == ip_port.ip.i &&
                 send_nodes[i].ip_port.port == ip_port.port) {
                         ++pinging;
                 }
             }
-            if(ping_id != 0) {
-                if(send_nodes[i].ping_id == ping_id) {
+            if (ping_id != 0) {
+                if (send_nodes[i].ping_id == ping_id)
                         ++pinging;
-                }
             }
-            if(pinging == (ping_id != 0) + (ip_port.ip.i != 0)) {
-                    return 1;
-            }
-            
+            if(pinging == (ping_id != 0) + (ip_port.ip.i != 0))
+               return 1;
         }
     }
 
@@ -394,9 +378,9 @@ uint64_t add_pinging(IP_Port ip_port)
     uint64_t ping_id = ((uint64_t)random_int() << 32) + random_int();
     uint32_t temp_time = unix_time();
     
-    for(i = 0; i < PING_TIMEOUT; ++i ) {
-        for(j = 0; j < LPING_ARRAY; ++j ) {
-            if((pings[j].timestamp + PING_TIMEOUT - i) < temp_time) {
+    for (i = 0; i < PING_TIMEOUT; ++i ) {
+        for (j = 0; j < LPING_ARRAY; ++j ) {
+            if ((pings[j].timestamp + PING_TIMEOUT - i) < temp_time) {
                     pings[j].timestamp = temp_time;
                     pings[j].ip_port = ip_port;
                     pings[j].ping_id = ping_id;
@@ -415,9 +399,9 @@ uint64_t add_gettingnodes(IP_Port ip_port)
     uint64_t ping_id = ((uint64_t)random_int() << 32) + random_int();
     uint32_t temp_time = unix_time();
     
-    for(i = 0; i < PING_TIMEOUT; ++i ) {
-        for(j = 0; j < LSEND_NODES_ARRAY; ++j ) {
-            if((send_nodes[j].timestamp + PING_TIMEOUT - i) < temp_time) {
+    for (i = 0; i < PING_TIMEOUT; ++i ) {
+        for (j = 0; j < LSEND_NODES_ARRAY; ++j ) {
+            if ((send_nodes[j].timestamp + PING_TIMEOUT - i) < temp_time) {
                     send_nodes[j].timestamp = temp_time;
                     send_nodes[j].ip_port = ip_port;
                     send_nodes[j].ping_id = ping_id;
@@ -431,20 +415,17 @@ uint64_t add_gettingnodes(IP_Port ip_port)
 
 /* send a ping request
    Ping request only works if none has been sent to that ip/port in the last 5 seconds. */
-static int pingreq(IP_Port ip_port, uint8_t * public_key)
+static int pingreq(IP_Port ip_port, uint8_t *public_key)
 {
-    if(memcmp(public_key, self_public_key, CLIENT_ID_SIZE) == 0) /* check if packet is gonna be sent to ourself */ {
+    if (memcmp(public_key, self_public_key, CLIENT_ID_SIZE) == 0) /* check if packet is gonna be sent to ourself */
         return 1;
-    }
     
-    if(is_pinging(ip_port, 0)) {
+    if (is_pinging(ip_port, 0))
         return 1;
-    }
     
     uint64_t ping_id = add_pinging(ip_port);
-    if(ping_id == 0) {
+    if (ping_id == 0)
         return 1;
-    }
     
     uint8_t data[1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) + ENCRYPTION_PADDING];
     uint8_t encrypt[sizeof(ping_id) + ENCRYPTION_PADDING];
@@ -452,9 +433,8 @@ static int pingreq(IP_Port ip_port, uint8_t * public_key)
     random_nonce(nonce);
     
     int len = encrypt_data(public_key, self_secret_key, nonce, (uint8_t *)&ping_id, sizeof(ping_id), encrypt);
-    if(len != sizeof(ping_id) + ENCRYPTION_PADDING) {
+    if(len != sizeof(ping_id) + ENCRYPTION_PADDING)
         return -1;
-    }
     data[0] = 0;
     memcpy(data + 1, self_public_key, CLIENT_ID_SIZE);
     memcpy(data + 1 + CLIENT_ID_SIZE, nonce, crypto_box_NONCEBYTES);
@@ -465,12 +445,11 @@ static int pingreq(IP_Port ip_port, uint8_t * public_key)
 }
 
 /* send a ping response */
-static int pingres(IP_Port ip_port, uint8_t * public_key, uint64_t ping_id)
+static int pingres(IP_Port ip_port, uint8_t *public_key, uint64_t ping_id)
 {
      /* check if packet is gonna be sent to ourself */
-    if(memcmp(public_key, self_public_key, CLIENT_ID_SIZE) == 0) {
+    if (memcmp(public_key, self_public_key, CLIENT_ID_SIZE) == 0)
         return 1;
-    }
     
     uint8_t data[1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) + ENCRYPTION_PADDING];
     uint8_t encrypt[sizeof(ping_id) + ENCRYPTION_PADDING];
@@ -478,9 +457,8 @@ static int pingres(IP_Port ip_port, uint8_t * public_key, uint64_t ping_id)
     random_nonce(nonce);
     
     int len = encrypt_data(public_key, self_secret_key, nonce, (uint8_t *)&ping_id, sizeof(ping_id), encrypt);
-    if(len != sizeof(ping_id) + ENCRYPTION_PADDING) {
+    if (len != sizeof(ping_id) + ENCRYPTION_PADDING)
         return -1;
-    }
     data[0] = 1;
     memcpy(data + 1, self_public_key, CLIENT_ID_SIZE);
     memcpy(data + 1 + CLIENT_ID_SIZE, nonce, crypto_box_NONCEBYTES);
@@ -491,22 +469,18 @@ static int pingres(IP_Port ip_port, uint8_t * public_key, uint64_t ping_id)
 }
 
 /* send a getnodes request */
-static int getnodes(IP_Port ip_port, uint8_t * public_key, uint8_t * client_id)
+static int getnodes(IP_Port ip_port, uint8_t *public_key, uint8_t *client_id)
 {
     /* check if packet is gonna be sent to ourself */
-    if(memcmp(public_key, self_public_key, CLIENT_ID_SIZE) == 0) {
+    if (memcmp(public_key, self_public_key, CLIENT_ID_SIZE) == 0)
         return 1;
-    }
-    
-    if(is_gettingnodes(ip_port, 0)) {
+    if (is_gettingnodes(ip_port, 0))
         return 1;
-    }
     
     uint64_t ping_id = add_gettingnodes(ip_port);
     
-    if(ping_id == 0) {
+    if (ping_id == 0)
         return 1;
-    }
     
     uint8_t data[1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) + CLIENT_ID_SIZE + ENCRYPTION_PADDING];
     uint8_t plain[sizeof(ping_id) + CLIENT_ID_SIZE];
@@ -519,9 +493,8 @@ static int getnodes(IP_Port ip_port, uint8_t * public_key, uint8_t * client_id)
     
     int len = encrypt_data(public_key, self_secret_key, nonce, plain, sizeof(ping_id) + CLIENT_ID_SIZE, encrypt);
     
-    if(len != sizeof(ping_id) + CLIENT_ID_SIZE + ENCRYPTION_PADDING) {
+    if (len != sizeof(ping_id) + CLIENT_ID_SIZE + ENCRYPTION_PADDING)
         return -1;
-    }
     data[0] = 2;
     memcpy(data + 1, self_public_key, CLIENT_ID_SIZE);
     memcpy(data + 1 + CLIENT_ID_SIZE, nonce, crypto_box_NONCEBYTES);
@@ -531,11 +504,10 @@ static int getnodes(IP_Port ip_port, uint8_t * public_key, uint8_t * client_id)
 }
 
 /* send a send nodes response */
-static int sendnodes(IP_Port ip_port, uint8_t * public_key, uint8_t * client_id, uint64_t ping_id)
+static int sendnodes(IP_Port ip_port, uint8_t *public_key, uint8_t *client_id, uint64_t ping_id)
 {
-    if(memcmp(public_key, self_public_key, CLIENT_ID_SIZE) == 0) /* check if packet is gonna be sent to ourself */ {
+    if (memcmp(public_key, self_public_key, CLIENT_ID_SIZE) == 0) /* check if packet is gonna be sent to ourself */
         return 1;
-    }
     
     uint8_t data[1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) 
                                     + sizeof(Node_format) * MAX_SENT_NODES + ENCRYPTION_PADDING];
@@ -543,9 +515,8 @@ static int sendnodes(IP_Port ip_port, uint8_t * public_key, uint8_t * client_id,
     Node_format nodes_list[MAX_SENT_NODES];
     int num_nodes = get_close_nodes(client_id, nodes_list);
     
-    if(num_nodes == 0) {
+    if (num_nodes == 0)
         return 0;
-    }
     
     uint8_t plain[sizeof(ping_id) + sizeof(Node_format) * MAX_SENT_NODES];
     uint8_t encrypt[sizeof(ping_id) + sizeof(Node_format) * MAX_SENT_NODES + ENCRYPTION_PADDING];
@@ -558,9 +529,8 @@ static int sendnodes(IP_Port ip_port, uint8_t * public_key, uint8_t * client_id,
     int len = encrypt_data(public_key, self_secret_key, nonce, plain, 
                                        sizeof(ping_id) + num_nodes * sizeof(Node_format), encrypt);
     
-    if(len != sizeof(ping_id) + num_nodes * sizeof(Node_format) + ENCRYPTION_PADDING) {
+    if (len != sizeof(ping_id) + num_nodes * sizeof(Node_format) + ENCRYPTION_PADDING)
         return -1;
-    }
     
     data[0] = 3;
     memcpy(data + 1, self_public_key, CLIENT_ID_SIZE);
@@ -574,27 +544,20 @@ static int sendnodes(IP_Port ip_port, uint8_t * public_key, uint8_t * client_id,
 /* Packet handling functions
    One to handle each types of packets we receive
    return 0 if handled correctly, 1 if packet is bad. */
-int handle_pingreq(uint8_t * packet, uint32_t length, IP_Port source)
+int handle_pingreq(uint8_t *packet, uint32_t length, IP_Port source)
 {
     uint64_t ping_id;
-    if(length != 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) + ENCRYPTION_PADDING) {
+    if (length != 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) + ENCRYPTION_PADDING)
         return 1;
-    }
         /* check if packet is from ourself. */
-    if(memcmp(packet + 1, self_public_key, CLIENT_ID_SIZE) == 0)  {
+    if (memcmp(packet + 1, self_public_key, CLIENT_ID_SIZE) == 0)
         return 1;
-    }
-    
-    
-    
     int len = decrypt_data(packet + 1, self_secret_key, packet + 1 + CLIENT_ID_SIZE, 
                                        packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES, 
                                        sizeof(ping_id) + ENCRYPTION_PADDING, (uint8_t *)&ping_id);
-    if(len != sizeof(ping_id)) {
+    if (len != sizeof(ping_id))
         return 1;
-    }
-
-    
+            
     pingres(source, packet + 1, ping_id);
     
     pingreq(source, packet + 1); /* TODO: make this smarter? */
@@ -603,26 +566,21 @@ int handle_pingreq(uint8_t * packet, uint32_t length, IP_Port source)
     
 }
 
-int handle_pingres(uint8_t * packet, uint32_t length, IP_Port source)
+int handle_pingres(uint8_t *packet, uint32_t length, IP_Port source)
 {
     uint64_t ping_id;
-    if(length != 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) + ENCRYPTION_PADDING) {
+    if (length != 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) + ENCRYPTION_PADDING)
         return 1;
-    }
-    if(memcmp(packet + 1, self_public_key, CLIENT_ID_SIZE) == 0) /* check if packet is from ourself. */ {
+    if (memcmp(packet + 1, self_public_key, CLIENT_ID_SIZE) == 0) /* check if packet is from ourself. */
         return 1;
-    }
-    
-    
-    
+
     int len = decrypt_data(packet + 1, self_secret_key, packet + 1 + CLIENT_ID_SIZE, 
                                        packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES, 
                                        sizeof(ping_id) + ENCRYPTION_PADDING, (uint8_t *)&ping_id);
-    if(len != sizeof(ping_id)) {
+    if (len != sizeof(ping_id))
         return 1;
-    }
     
-    if(is_pinging(source, ping_id)) {
+    if (is_pinging(source, ping_id)) {
         addto_lists(source, packet + 1);
         return 0;
     }
@@ -630,16 +588,14 @@ int handle_pingres(uint8_t * packet, uint32_t length, IP_Port source)
     
 }
 
-int handle_getnodes(uint8_t * packet, uint32_t length, IP_Port source)
+int handle_getnodes(uint8_t *packet, uint32_t length, IP_Port source)
 {
     uint64_t ping_id;
-    if(length != 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) + CLIENT_ID_SIZE + ENCRYPTION_PADDING) {
+    if (length != 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) + CLIENT_ID_SIZE + ENCRYPTION_PADDING)
         return 1;
-    }
         /* check if packet is from ourself. */
-    if(memcmp(packet + 1, self_public_key, CLIENT_ID_SIZE) == 0) {
+    if (memcmp(packet + 1, self_public_key, CLIENT_ID_SIZE) == 0)
         return 1;
-    }
     
     uint8_t plain[sizeof(ping_id) + CLIENT_ID_SIZE];
     
@@ -647,10 +603,8 @@ int handle_getnodes(uint8_t * packet, uint32_t length, IP_Port source)
                                        packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES, 
                                        sizeof(ping_id) + CLIENT_ID_SIZE + ENCRYPTION_PADDING, plain);
     
-    if(len != sizeof(ping_id) + CLIENT_ID_SIZE) {
+    if (len != sizeof(ping_id) + CLIENT_ID_SIZE)
         return 1;
-    }
-    
     
     memcpy(&ping_id, plain, sizeof(ping_id));
     sendnodes(source, packet + 1, plain + sizeof(ping_id), ping_id);
@@ -664,7 +618,7 @@ int handle_getnodes(uint8_t * packet, uint32_t length, IP_Port source)
 int handle_sendnodes(uint8_t * packet, uint32_t length, IP_Port source)
 {
     uint64_t ping_id;
-    if(length > (1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id)
+    if (length > (1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) //TODO: rewrite this monstrosity
                  + sizeof(Node_format) * MAX_SENT_NODES + ENCRYPTION_PADDING) || 
     (length - (1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) 
                  + ENCRYPTION_PADDING)) % (sizeof(Node_format)) != 0 ||
@@ -682,42 +636,36 @@ int handle_sendnodes(uint8_t * packet, uint32_t length, IP_Port source)
                                        sizeof(ping_id) + num_nodes * sizeof(Node_format) + ENCRYPTION_PADDING, plain);
     
     
-    if(len != sizeof(ping_id) + num_nodes * sizeof(Node_format)) {
+    if (len != sizeof(ping_id) + num_nodes * sizeof(Node_format))
         return 1;
-    }
-        
     memcpy(&ping_id, plain, sizeof(ping_id));
-    if(!is_gettingnodes(source, ping_id)) {
+    if(!is_gettingnodes(source, ping_id))
         return 1;
-    }
-    
+
     Node_format nodes_list[MAX_SENT_NODES];
     memcpy(nodes_list, plain + sizeof(ping_id), num_nodes * sizeof(Node_format));
     
     addto_lists(source, packet + 1);
     
     uint32_t i;
-    for(i = 0; i < num_nodes; ++i)  {
+    for (i = 0; i < num_nodes; ++i)
         pingreq(nodes_list[i].ip_port, nodes_list[i].client_id);
         returnedip_ports(nodes_list[i].ip_port, nodes_list[i].client_id, packet + 1);
-    }
     
     return 0;
 }
 
 /* END of packet handling functions */
 
-int DHT_addfriend(uint8_t * client_id)
+int DHT_addfriend(uint8_t *client_id)
 {
     Friend * temp;
-    if(num_friends == 0) {
+    if (num_friends == 0)
         temp = malloc(sizeof(Friend));
-    } else {
+    else
         temp = realloc(friends_list, sizeof(Friend) * (num_friends + 1));
-    }
-    if(temp == NULL) {
+    if (temp == NULL)
         return 1;
-    }
     
     friends_list = temp;
     memset(&friends_list[num_friends], 0, sizeof(Friend));
@@ -727,21 +675,19 @@ int DHT_addfriend(uint8_t * client_id)
     return 0;
 }
 
-int DHT_delfriend(uint8_t * client_id)
+int DHT_delfriend(uint8_t *client_id)
 {
     uint32_t i;
     Friend * temp;
-    for(i = 0; i < num_friends; ++i) {
+    for (i = 0; i < num_friends; ++i) {
             /* Equal */ 
-        if(memcmp(friends_list[i].client_id, client_id, CLIENT_ID_SIZE) == 0){
+        if (memcmp(friends_list[i].client_id, client_id, CLIENT_ID_SIZE) == 0){
             --num_friends;
-            if(num_friends != i) {
+            if (num_friends != i)
                 memcpy(friends_list[i].client_id, friends_list[num_friends].client_id, CLIENT_ID_SIZE);
-            }
             temp = realloc(friends_list, sizeof(Friend) * (num_friends));
-            if(temp != NULL) {
+            if (temp != NULL)
                 friends_list = temp;
-            }
             return 0;
         }
     }
@@ -749,12 +695,12 @@ int DHT_delfriend(uint8_t * client_id)
 }
 
 /* TODO: Optimize this. */
-IP_Port DHT_getfriendip(uint8_t * client_id)
+IP_Port DHT_getfriendip(uint8_t *client_id)
 {
     uint32_t i, j;
     IP_Port empty = {{{0}}, 0};
     uint32_t temp_time = unix_time();
-    for(i = 0; i < num_friends; ++i) {
+    for (i = 0; i < num_friends; ++i) {
              /* Equal */
         if(memcmp(friends_list[i].client_id, client_id, CLIENT_ID_SIZE) == 0) {
             for(j = 0; j < MAX_FRIEND_CLIENTS; ++j) {
@@ -789,21 +735,21 @@ void doDHTFriends()
     uint32_t rand_node;
     uint32_t index[MAX_FRIEND_CLIENTS];
     
-    for(i = 0; i < num_friends; ++i) {
+    for (i = 0; i < num_friends; ++i) {
         uint32_t num_nodes = 0;
-        for(j = 0; j < MAX_FRIEND_CLIENTS; ++j) {
-            if(friends_list[i].client_list[j].timestamp + Kill_NODE_TIMEOUT > temp_time) /* if node is not dead. */ {
-                if((friends_list[i].client_list[j].last_pinged + PING_INTERVAL) <= temp_time) {
+        for (j = 0; j < MAX_FRIEND_CLIENTS; ++j) {
+            if (friends_list[i].client_list[j].timestamp + Kill_NODE_TIMEOUT > temp_time) /* if node is not dead. */ {
+                if ((friends_list[i].client_list[j].last_pinged + PING_INTERVAL) <= temp_time) {
                     pingreq(friends_list[i].client_list[j].ip_port, friends_list[i].client_list[j].client_id);
                     friends_list[i].client_list[j].last_pinged = temp_time;
                 }
-                if(friends_list[i].client_list[j].timestamp + BAD_NODE_TIMEOUT > temp_time) /* if node is good. */ {
+                if (friends_list[i].client_list[j].timestamp + BAD_NODE_TIMEOUT > temp_time) /* if node is good. */ {
                     index[num_nodes] = j;
                     ++num_nodes;
                 }
             }
         }
-        if(friends_list[i].lastgetnode + GET_NODE_INTERVAL <= temp_time && num_nodes != 0) {
+        if (friends_list[i].lastgetnode + GET_NODE_INTERVAL <= temp_time && num_nodes != 0) {
             rand_node = rand() % num_nodes;
             getnodes(friends_list[i].client_list[index[rand_node]].ip_port, 
                      friends_list[i].client_list[index[rand_node]].client_id, 
@@ -825,23 +771,23 @@ void doClose() /* tested */
     uint32_t rand_node;
     uint32_t index[LCLIENT_LIST];
     
-    for(i = 0; i < LCLIENT_LIST; ++i) {
+    for (i = 0; i < LCLIENT_LIST; ++i) {
             /* if node is not dead. */
-        if(close_clientlist[i].timestamp + Kill_NODE_TIMEOUT > temp_time) {
-            if((close_clientlist[i].last_pinged + PING_INTERVAL) <= temp_time)
+        if (close_clientlist[i].timestamp + Kill_NODE_TIMEOUT > temp_time) {
+            if ((close_clientlist[i].last_pinged + PING_INTERVAL) <= temp_time)
             {
                 pingreq(close_clientlist[i].ip_port, close_clientlist[i].client_id);
                 close_clientlist[i].last_pinged = temp_time;
             }
                         /* if node is good. */
-            if(close_clientlist[i].timestamp + BAD_NODE_TIMEOUT > temp_time) {
+            if (close_clientlist[i].timestamp + BAD_NODE_TIMEOUT > temp_time) {
                 index[num_nodes] = i;
                 ++num_nodes;
             }
         }   
     }
     
-    if(close_lastgetnodes + GET_NODE_INTERVAL <= temp_time && num_nodes != 0) {
+    if (close_lastgetnodes + GET_NODE_INTERVAL <= temp_time && num_nodes != 0) {
         rand_node = rand() % num_nodes;
         getnodes(close_clientlist[index[rand_node]].ip_port, 
                  close_clientlist[index[rand_node]].client_id, 
@@ -850,18 +796,18 @@ void doClose() /* tested */
     }
 }
 
-void DHT_bootstrap(IP_Port ip_port, uint8_t * public_key)
+void DHT_bootstrap(IP_Port ip_port, uint8_t *public_key)
 {
     getnodes(ip_port, public_key, self_public_key);   
 }
 
 /* send the given packet to node with client_id
    returns -1 if failure */
-int route_packet(uint8_t * client_id, uint8_t * packet, uint32_t length)
+int route_packet(uint8_t *client_id, uint8_t *packet, uint32_t length)
 {
     uint32_t i;
-    for(i = 0; i < LCLIENT_LIST; ++i) {
-        if(memcmp(client_id, close_clientlist[i].client_id, CLIENT_ID_SIZE) == 0) {
+    for (i = 0; i < LCLIENT_LIST; ++i) {
+        if (memcmp(client_id, close_clientlist[i].client_id, CLIENT_ID_SIZE) == 0) {
             return sendpacket(close_clientlist[i].ip_port, packet, length);
         }
     }
@@ -873,22 +819,20 @@ int route_packet(uint8_t * client_id, uint8_t * packet, uint32_t length)
    returns the number of ips returned
    return 0 if we are connected to friend or if no ips were found.
    returns -1 if no such friend*/
-static int friend_iplist(IP_Port * ip_portlist, uint16_t friend_num)
+static int friend_iplist(IP_Port *ip_portlist, uint16_t friend_num)
 {
     int num_ips = 0;
     uint32_t i;
     uint32_t temp_time = unix_time();
-    if(friend_num >= num_friends) {
+    if (friend_num >= num_friends)
         return -1;
-    }
-    for(i = 0; i < MAX_FRIEND_CLIENTS; ++i)
-    {
+    for (i = 0; i < MAX_FRIEND_CLIENTS; ++i) {
             /*If ip is not zero and node is good */
-        if(friends_list[friend_num].client_list[i].ret_ip_port.ip.i != 0 && 
-            friends_list[friend_num].client_list[i].ret_timestamp + BAD_NODE_TIMEOUT > temp_time) {
-            if(memcmp(friends_list[friend_num].client_list[i].client_id, friends_list[friend_num].client_id, CLIENT_ID_SIZE) == 0 ) {
+        if (friends_list[friend_num].client_list[i].ret_ip_port.ip.i != 0 && 
+            friends_list[friend_num].client_list[i].ret_timestamp + BAD_NODE_TIMEOUT > temp_time)
+        {
+            if (memcmp(friends_list[friend_num].client_list[i].client_id, friends_list[friend_num].client_id, CLIENT_ID_SIZE) == 0)
                 return 0;
-            }
             ip_portlist[num_ips] = friends_list[friend_num].client_list[i].ret_ip_port;
             ++num_ips;
         }
@@ -898,21 +842,20 @@ static int friend_iplist(IP_Port * ip_portlist, uint16_t friend_num)
 
 /* Send the following packet to everyone who tells us they are connected to friend_id
    returns the number of nodes it sent the packet to */
-int route_tofriend(uint8_t * friend_id, uint8_t * packet, uint32_t length)
+int route_tofriend(uint8_t * friend_id, uint8_t *packet, uint32_t length)
 {
     uint32_t i, j;
     uint32_t sent = 0;
     uint32_t temp_time = unix_time();
-    for(i = 0; i < num_friends; ++i) {
+    for (i = 0; i < num_friends; ++i) {
             /* Equal */
-        if(memcmp(friends_list[i].client_id, friend_id, CLIENT_ID_SIZE) == 0)  {
-            for(j = 0; j < MAX_FRIEND_CLIENTS; ++j) {
+        if (memcmp(friends_list[i].client_id, friend_id, CLIENT_ID_SIZE) == 0) {
+            for (j = 0; j < MAX_FRIEND_CLIENTS; ++j) {
                              /*If ip is not zero and node is good */
                 if(friends_list[i].client_list[j].ret_ip_port.ip.i != 0 && 
                    friends_list[i].client_list[j].ret_timestamp + BAD_NODE_TIMEOUT > temp_time) {
-                    if(sendpacket(friends_list[i].client_list[j].ip_port, packet, length) == length) {
+                    if(sendpacket(friends_list[i].client_list[j].ip_port, packet, length) == length)
                         ++sent;
-                    }
                 }
             }
             return sent;