8 files changed, 147 insertions, 238 deletions

diff --git a/testing/DHT_cryptosendfiletest.c b/testing/DHT_cryptosendfiletest.c
index 6aaac677..b06ddea5 100644
--- a/testing/DHT_cryptosendfiletest.c
+++ b/testing/DHT_cryptosendfiletest.c
@@ -41,7 +41,7 @@
 
 #include <string.h>
 
-//Sleep function (x = milliseconds)
+/* Sleep function (x = milliseconds) */
 #ifdef WIN32
 
 #define c_sleep(x) Sleep(1*x)
@@ -60,16 +60,14 @@ void printip(IP_Port ip_port)
     printf("\nIP: %u.%u.%u.%u Port: %u\n",ip_port.ip.c[0],ip_port.ip.c[1],ip_port.ip.c[2],ip_port.ip.c[3],ntohs(ip_port.port));
 }
 
-
-//horrible function from one of my first C programs.
-//only here because I was too lazy to write a proper one.
+/* horrible function from one of my first C programs.
+ *only here because I was too lazy to write a proper one. */
 unsigned char * hex_string_to_bin(char hex_string[])
 {
     unsigned char * val = malloc(strlen(hex_string));
     char * pos = hex_string;
     int i=0;
-    while(i < strlen(hex_string))
-    {
+    while(i < strlen(hex_string)) {
         sscanf(pos,"%2hhx",&val[i]);
         pos+=2;
         i++;
@@ -88,8 +86,7 @@ int main(int argc, char *argv[])
     new_keys();
     printf("OUR ID: ");
     uint32_t i;
-    for(i = 0; i < 32; i++)
-    {
+    for(i = 0; i < 32; i++) {
         if(self_public_key[i] < 16)
             printf("0");
         printf("%hhX",self_public_key[i]);
@@ -105,8 +102,7 @@ int main(int argc, char *argv[])
     uint8_t friend_id[32];
     memcpy(friend_id, hex_string_to_bin(temp_id), 32);
     
-    
-    //memcpy(self_client_id, "qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq", 32);
+    /* memcpy(self_client_id, "qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq", 32); */
     
 
     DHT_addfriend(friend_id);
@@ -118,15 +114,13 @@ int main(int argc, char *argv[])
     int friendrequest = -1;
     uint8_t request_data[512];
     
-    //initialize networking
-    //bind to ip 0.0.0.0:PORT
+    /* initialize networking
+     * bind to ip 0.0.0.0:PORT */
     IP ip;
     ip.i = 0;
     init_networking(ip, PORT);
     initNetCrypto();
     
-    
-
     perror("Initialization");
     IP_Port bootstrap_ip_port;
     bootstrap_ip_port.port = htons(atoi(argv[2]));
@@ -147,122 +141,99 @@ int main(int argc, char *argv[])
     if ( file2==NULL ){return 1;}
     read1 = fread(buffer1, 1, 128, file1);
     
-    while(1)
-    {
-
-        while(receivepacket(&ip_port, data, &length) != -1)
-        {
-            if(rand() % 3 != 1)//simulate packet loss
-            {
-                if(DHT_handlepacket(data, length, ip_port) && LosslessUDP_handlepacket(data, length, ip_port))
-                {
-                    //if packet is not recognized
+    while(1) {
+        while(receivepacket(&ip_port, data, &length) != -1) {
+            if(rand() % 3 != 1) { /* simulate packet loss */
+                if(DHT_handlepacket(data, length, ip_port) && LosslessUDP_handlepacket(data, length, ip_port)) {
+                    /* if packet is not recognized */
                     printf("Received unhandled packet with length: %u\n", length);
-                }
-                else
-                {
+                } else {
                     printf("Received handled packet with length: %u\n", length);
                 }
             }
         }
         friend_ip = DHT_getfriendip(friend_id);
-        if(friend_ip.ip.i != 0)
-        {
-            if(connection == -1 && friendrequest == -1)
-            {
+        if(friend_ip.ip.i != 0) {
+            if(connection == -1 && friendrequest == -1) {
                 printf("Sending friend request to peer:");
                 printip(friend_ip);
                 friendrequest = send_friendrequest(friend_id, friend_ip,(uint8_t *) "Hello World", 12);
-                //connection = crypto_connect((uint8_t *)friend_id, friend_ip);
-                //connection = new_connection(friend_ip);
+                /* connection = crypto_connect((uint8_t *)friend_id, friend_ip); */
+                /* connection = new_connection(friend_ip); */
             }
-            if(check_friendrequest(friendrequest) == 1)
-            {
+            if(check_friendrequest(friendrequest) == 1) {
                 printf("Started connecting to friend:");
                 connection = crypto_connect(friend_id, friend_ip);
             }
         }
-        if(inconnection == -1)
-        {
+        if(inconnection == -1) {
             uint8_t secret_nonce[crypto_box_NONCEBYTES];
             uint8_t public_key[crypto_box_PUBLICKEYBYTES];
             uint8_t session_key[crypto_box_PUBLICKEYBYTES];
             inconnection = crypto_inbound(public_key, secret_nonce, session_key);
             inconnection = accept_crypto_inbound(inconnection, acceptedfriend_public_key, secret_nonce, session_key);
-            //inconnection = incoming_connection();
-            if(inconnection != -1)
-            {
+            /* inconnection = incoming_connection(); */
+            if(inconnection != -1) {
                 printf("Someone connected to us:\n");
-               // printip(connection_ip(inconnection));
+               /* printip(connection_ip(inconnection)); */
             }
         }
-        if(handle_friendrequest(acceptedfriend_public_key, request_data) > 1)
-        {
+        if(handle_friendrequest(acceptedfriend_public_key, request_data) > 1) {
             printf("RECIEVED FRIEND REQUEST: %s\n", request_data);
         }
 
-        //if someone connected to us write what he sends to a file
-        //also send him our file.
-        if(inconnection != -1)
-        {
-            if(write_cryptpacket(inconnection, buffer1, read1))
-            {
+        /* if someone connected to us write what he sends to a file
+         * also send him our file. */
+        if(inconnection != -1) {
+            if(write_cryptpacket(inconnection, buffer1, read1)) {
                 printf("Wrote data1.\n");
                 read1 = fread(buffer1, 1, 128, file1);
             }
             read2 = read_cryptpacket(inconnection, buffer2);
-            if(read2 != 0)
-            {
+            if(read2 != 0) {
                 printf("Received data1.\n");
-                if(!fwrite(buffer2, read2, 1, file2))
-                {
+                if(!fwrite(buffer2, read2, 1, file2)) {
                         printf("file write error1\n");
                 }
-                if(read2 < 128)
-                {
+                if(read2 < 128) {
                     printf("Closed file1 %u\n", read2);
                     fclose(file2);
                 }
             }
-            else if(is_cryptoconnected(inconnection) == 4)//if buffer is empty and the connection timed out.
-            {
+                        /* if buffer is empty and the connection timed out. */
+            else if(is_cryptoconnected(inconnection) == 4) {
                 crypto_kill(inconnection);
             }
         }
-        //if we are connected to a friend send him data from the file.
-        //also put what he sends us in a file.
-        if(is_cryptoconnected(connection) >= 3)
-        {
-            if(write_cryptpacket(0, buffer1, read1))
-            {
+        /* if we are connected to a friend send him data from the file.
+         * also put what he sends us in a file. */
+        if(is_cryptoconnected(connection) >= 3)  {
+            if(write_cryptpacket(0, buffer1, read1)) {
                 printf("Wrote data2.\n");
                 read1 = fread(buffer1, 1, 128, file1);
             }
             read2 = read_cryptpacket(0, buffer2);
-            if(read2 != 0)
-            {
+            if(read2 != 0) {
                 printf("Received data2.\n");
-                if(!fwrite(buffer2, read2, 1, file2))
-                {
+                if(!fwrite(buffer2, read2, 1, file2)) {
                         printf("file write error2\n");
                 }
-                if(read2 < 128)
-                {
+                if(read2 < 128) {
                     printf("Closed file2 %u\n", read2);
                     fclose(file2);
                 }
             }
-            else if(is_cryptoconnected(connection) == 4)//if buffer is empty and the connection timed out.
-            {
+                        /* if buffer is empty and the connection timed out. */
+            else if(is_cryptoconnected(connection) == 4) {
                 crypto_kill(connection);
             }
         }
         doDHT();
         doLossless_UDP();
         doNetCrypto();
-        //print_clientlist();
-        //print_friendlist();
-        //c_sleep(300);
+        /*print_clientlist();
+         *print_friendlist();
+         *c_sleep(300); */
         c_sleep(1);
     }
     
diff --git a/testing/DHT_sendfiletest.c b/testing/DHT_sendfiletest.c
index c9865843..5b5d6c9f 100644
--- a/testing/DHT_sendfiletest.c
+++ b/testing/DHT_sendfiletest.c
@@ -33,6 +33,7 @@
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  *  
  */
+ 
 #include "../core/network.h"
 #include "../core/DHT.h"
 #include "../core/Lossless_UDP.h"
@@ -100,68 +101,53 @@ int main(int argc, char *argv[])
     if ( file2==NULL ){return 1;}
     read1 = fread(buffer1, 1, 128, file1);
     
-    while(1)
-    {
+    while(1) {
 
-        while(receivepacket(&ip_port, data, &length) != -1)
-        {
-            if(rand() % 3 != 1)//simulate packet loss
-            {
-                if(DHT_handlepacket(data, length, ip_port) && LosslessUDP_handlepacket(data, length, ip_port))
-                {
-                    //if packet is not recognized
+        while(receivepacket(&ip_port, data, &length) != -1) {
+            if(rand() % 3 != 1) { /* simulate packet loss */
+                if(DHT_handlepacket(data, length, ip_port) && LosslessUDP_handlepacket(data, length, ip_port)) {
+                    /* if packet is not recognized */
                     printf("Received unhandled packet with length: %u\n", length);
-                }
-                else
-                {
+                } else {
                     printf("Received handled packet with length: %u\n", length);
                 }
             }
         }
         friend_ip = DHT_getfriendip((uint8_t *)argv[3]);
-        if(friend_ip.ip.i != 0)
-        {
-            if(connection == -1)
-            {
+        if(friend_ip.ip.i != 0) {
+            if(connection == -1) {
                 printf("Started connecting to friend:");
                 printip(friend_ip);
                 connection = new_connection(friend_ip);
             }
         }
-        if(inconnection == -1)
-        {
+        if(inconnection == -1) {
             inconnection = incoming_connection();
-            if(inconnection != -1)
-            {
+            if(inconnection != -1) {
                 printf("Someone connected to us:");
                 printip(connection_ip(inconnection));
             }
         }
-        //if someone connected to us write what he sends to a file
-        //also send him our file.
-        if(inconnection != -1)
-        {
-            if(write_packet(inconnection, buffer1, read1))
-            {
+        /* if someone connected to us write what he sends to a file */
+        /* also send him our file. */
+        if(inconnection != -1) {
+            if(write_packet(inconnection, buffer1, read1)) {
                 printf("Wrote data.\n");
                 read1 = fread(buffer1, 1, 128, file1);
             }
             read2 = read_packet(inconnection, buffer2);
-            if(read2 != 0)
-            {
+            if(read2 != 0) {
                 printf("Received data.\n");
-                if(!fwrite(buffer2, read2, 1, file2))
-                {
+                if(!fwrite(buffer2, read2, 1, file2)) {
                         printf("file write error\n");
                 }
-                if(read2 < 128)
-                {
+                if(read2 < 128) {
                     fclose(file2);
                 }
             } 
         }
-        //if we are connected to a friend send him data from the file.
-        //also put what he sends us in a file.
+        /* if we are connected to a friend send him data from the file.
+         * also put what he sends us in a file. */
         if(is_connected(connection) == 3)
         {
             if(write_packet(0, buffer1, read1))
@@ -185,9 +171,9 @@ int main(int argc, char *argv[])
         }
         doDHT();
         doLossless_UDP();
-        //print_clientlist();
-        //print_friendlist();
-        //c_sleep(300);
+        /* print_clientlist();
+         * print_friendlist();
+         * c_sleep(300); */
         c_sleep(1);
     }
     
diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index 80019029..bb482595 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -47,17 +47,14 @@
 
 #define PORT 33445
 
-
 void print_clientlist()
 {
     uint32_t i, j;
     IP_Port p_ip;
     printf("___________________CLOSE________________________________\n");
-    for(i = 0; i < 4; i++)
-    {
+    for(i = 0; i < 4; i++) {
         printf("ClientID: ");
-        for(j = 0; j < 32; j++)
-        {
+        for(j = 0; j < 32; j++) {
             printf("%c", close_clientlist[i].client_id[j]);
         }
         p_ip = close_clientlist[i].ip_port;
@@ -75,12 +72,10 @@ void print_friendlist()
     uint32_t i, j, k;
     IP_Port p_ip;
     printf("_________________FRIENDS__________________________________\n");
-    for(k = 0; k < num_friends; k++)
-    {
+    for(k = 0; k < num_friends; k++) {
         printf("FRIEND %u\n", k);
         printf("ID: ");
-        for(j = 0; j < 32; j++)
-        {
+        for(j = 0; j < 32; j++) {
             printf("%c", friends_list[k].client_id[j]);
         }
         p_ip = DHT_getfriendip(friends_list[k].client_id);
@@ -88,11 +83,9 @@ void print_friendlist()
 
         printf("\nCLIENTS IN LIST:\n\n");
         
-        for(i = 0; i < 4; i++)
-        {
+        for(i = 0; i < 4; i++) {
             printf("ClientID: ");
-            for(j = 0; j < 32; j++)
-            {
+            for(j = 0; j < 32; j++) {
                 if(0 <= friends_list[k].client_list[i].client_id[j] && friends_list[k].client_list[i].client_id[j] < 16)
                     printf("0");
                 printf("%hhX", friends_list[k].client_list[i].client_id[j]);
@@ -113,8 +106,7 @@ void printpacket(uint8_t * data, uint32_t length, IP_Port ip_port)
     uint32_t i;
     printf("UNHANDLED PACKET RECEIVED\nLENGTH:%u\nCONTENTS:\n", length);
     printf("--------------------BEGIN-----------------------------\n");
-    for(i = 0; i < length; i++)
-    {
+    for(i = 0; i < length; i++) {
         if(data[i] < 16)
             printf("0");
         printf("%hhX",data[i]);
@@ -129,8 +121,7 @@ unsigned char * hex_string_to_bin(char hex_string[])
     unsigned char * val = malloc(strlen(hex_string));
     char * pos = hex_string;
     int i=0;
-    while(i < strlen(hex_string))
-    {
+    while(i < strlen(hex_string)) {
         sscanf(pos,"%2hhx",&val[i]);
         pos+=2;
         i++;
@@ -149,8 +140,7 @@ int main(int argc, char *argv[])
     new_keys();
     printf("OUR ID: ");
     uint32_t i;
-    for(i = 0; i < 32; i++)
-    {
+    for(i = 0; i < 32; i++) {
         if(self_public_key[i] < 16)
             printf("0");
         printf("%hhX",self_public_key[i]);
@@ -161,8 +151,8 @@ int main(int argc, char *argv[])
     scanf("%s", temp_id);
     DHT_addfriend(hex_string_to_bin(temp_id));
     
-    //initialize networking
-    //bind to ip 0.0.0.0:PORT
+    /* initialize networking */
+    /* bind to ip 0.0.0.0:PORT */
     IP ip;
     ip.i = 0;
     init_networking(ip, PORT);
@@ -171,10 +161,10 @@ int main(int argc, char *argv[])
     perror("Initialization");
     IP_Port bootstrap_ip_port;
     bootstrap_ip_port.port = htons(atoi(argv[2]));
-    //bootstrap_ip_port.ip.c[0] = 127;
-    //bootstrap_ip_port.ip.c[1] = 0;
-    //bootstrap_ip_port.ip.c[2] = 0;
-    //bootstrap_ip_port.ip.c[3] = 1;
+    /* bootstrap_ip_port.ip.c[0] = 127;
+     * bootstrap_ip_port.ip.c[1] = 0;
+     * bootstrap_ip_port.ip.c[2] = 0;
+     * bootstrap_ip_port.ip.c[3] = 1; */
     bootstrap_ip_port.ip.i = inet_addr(argv[1]);
     DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3]));
     
@@ -182,20 +172,15 @@ int main(int argc, char *argv[])
     uint8_t data[MAX_UDP_PACKET_SIZE];
     uint32_t length;
     
-    while(1)
-    {
+    while(1) {
             
         doDHT();
         
-        while(receivepacket(&ip_port, data, &length) != -1)
-        {
-            if(DHT_handlepacket(data, length, ip_port) && friendreq_handlepacket(data, length, ip_port))
-            {
+        while(receivepacket(&ip_port, data, &length) != -1) {
+            if(DHT_handlepacket(data, length, ip_port) && friendreq_handlepacket(data, length, ip_port)) {
                 //unhandled packet
                 printpacket(data, length, ip_port);
-            }
-            else
-            {
+            } else {
                 printf("Received handled packet with length: %u\n", length);
             }
         }
diff --git a/testing/Lossless_UDP_testclient.c b/testing/Lossless_UDP_testclient.c
index 07ab319b..8f23528c 100644
--- a/testing/Lossless_UDP_testclient.c
+++ b/testing/Lossless_UDP_testclient.c
@@ -42,7 +42,6 @@
 
 #endif
 
-
 #define PORT 33446
 
 void printpacket(uint8_t * data, uint32_t length, IP_Port ip_port)
@@ -50,8 +49,7 @@ void printpacket(uint8_t * data, uint32_t length, IP_Port ip_port)
     uint32_t i;
     printf("UNHANDLED PACKET RECEIVED\nLENGTH:%u\nCONTENTS:\n", length);
     printf("--------------------BEGIN-----------------------------\n");
-    for(i = 0; i < length; i++)
-    {
+    for(i = 0; i < length; i++) {
         if(data[i] < 16)
             printf("0");
         printf("%hhX",data[i]);
@@ -117,39 +115,34 @@ void printconnection(int connection_id)
     
 }
 */
-//recieve packets and send them to the packethandler
-//run doLossless_UDP(); 
+
+/*( recieve packets and send them to the packethandler */
+/*run doLossless_UDP(); */
 void Lossless_UDP()
 {
     IP_Port ip_port;
     uint8_t data[MAX_UDP_PACKET_SIZE];
     uint32_t length;
-    while(receivepacket(&ip_port, data, &length) != -1)
-    {
+    while(receivepacket(&ip_port, data, &length) != -1) {
         printf("packet with length: %u\n", length);
-        //if(rand() % 3 != 1)//add packet loss
-       // {    
-            if(LosslessUDP_handlepacket(data, length, ip_port))
-            {
+        /* if(rand() % 3 != 1)//add packet loss
+         { */
+            if(LosslessUDP_handlepacket(data, length, ip_port)) {
                     printpacket(data, length, ip_port);
-            }
-            else
-            {
+            } else {
                 //printconnection(0);
                  printf("Received handled packet with length: %u\n", length);
             }
-       // }
+       /* } */
     }
     
     doLossless_UDP();   
     
 }
 
-
 int main(int argc, char *argv[])
 {
-    if (argc < 4) 
-    {
+    if (argc < 4) {
         printf("usage: %s ip port filename\n", argv[0]);
         exit(0);
     }
@@ -161,8 +154,8 @@ int main(int argc, char *argv[])
     if ( file==NULL ){return 1;}
     
     
-    //initialize networking
-    //bind to ip 0.0.0.0:PORT
+    /* initialize networking */
+    /* bind to ip 0.0.0.0:PORT */
     IP ip;
     ip.i = 0;
     init_networking(ip, PORT);
@@ -173,17 +166,14 @@ int main(int argc, char *argv[])
     printip(serverip);
     int connection = new_connection(serverip);
     uint64_t timer = current_time();
-    while(1)
-    {
-       // printconnection(connection);
+    while(1) {
+       /* printconnection(connection); */
         Lossless_UDP();
-        if(is_connected(connection) == 3)
-        {
+        if(is_connected(connection) == 3) {
             printf("Connecting took: %llu us\n", (unsigned long long)(current_time() - timer));
             break;
         }
-        if(is_connected(connection) == 0)
-        {
+        if(is_connected(connection) == 0) {
             printf("Connection timeout after: %llu us\n", (unsigned long long)(current_time() - timer));
             return 1;
         }
@@ -192,38 +182,32 @@ int main(int argc, char *argv[])
     timer = current_time();
     
     
-    //read first part of file
+    /*read first part of file */
     read = fread(buffer, 1, 512, file);
     
-    while(1)
-    {
-        //printconnection(connection);
+    while(1) {
+        /* printconnection(connection); */
         Lossless_UDP();
-        if(is_connected(connection) == 3)
-        {
+        if(is_connected(connection) == 3) {
             
-            if(write_packet(connection, buffer, read))
-            {
-               //printf("Wrote data.\n");
+            if(write_packet(connection, buffer, read)) {
+               /* printf("Wrote data.\n"); */
                 read = fread(buffer, 1, 512, file);
 
             }
-            //printf("%u\n", sendqueue(connection));
-            if(sendqueue(connection) == 0)
-            {
-                if(read == 0)
-                {
+            /* printf("%u\n", sendqueue(connection)); */
+            if(sendqueue(connection) == 0) {
+                if(read == 0) {
                     printf("Sent file successfully in: %llu us\n", (unsigned long long)(current_time() - timer));
                     break;
                 }
             }
         }
-        else
-        {
+        else {
             printf("Connecting Lost after: %llu us\n", (unsigned long long)(current_time() - timer));
             return 0;
         }
-        //c_sleep(1);
+        /* c_sleep(1); */
     }
         
     return 0;
diff --git a/testing/Lossless_UDP_testserver.c b/testing/Lossless_UDP_testserver.c
index 0ed214e9..a8097048 100644
--- a/testing/Lossless_UDP_testserver.c
+++ b/testing/Lossless_UDP_testserver.c
@@ -43,7 +43,6 @@
 
 #endif
 
-
 #define PORT 33445
 
 void printpacket(uint8_t * data, uint32_t length, IP_Port ip_port)
@@ -51,14 +50,14 @@ void printpacket(uint8_t * data, uint32_t length, IP_Port ip_port)
     uint32_t i;
     printf("UNHANDLED PACKET RECEIVED\nLENGTH:%u\nCONTENTS:\n", length);
     printf("--------------------BEGIN-----------------------------\n");
-    for(i = 0; i < length; i++)
-    {
+    for(i = 0; i < length; i++) {
         if(data[i] < 16)
             printf("0");
         printf("%hhX",data[i]);
     }
     printf("\n--------------------END-----------------------------\n\n\n");
 }
+
 /*
 void printpackets(Data test)
 {
@@ -113,23 +112,20 @@ void printconnection(int connection_id)
     
 }
 */
-//recieve packets and send them to the packethandler
-//run doLossless_UDP(); 
+
+/* recieve packets and send them to the packethandler
+ * run doLossless_UDP(); */
 void Lossless_UDP()
 {
     IP_Port ip_port;
     uint8_t data[MAX_UDP_PACKET_SIZE];
     uint32_t length;
-    while(receivepacket(&ip_port, data, &length) != -1)
-    {
+    while(receivepacket(&ip_port, data, &length) != -1) {
         //if(rand() % 3 != 1)//add packet loss
         //{
-            if(LosslessUDP_handlepacket(data, length, ip_port))
-            {
+            if(LosslessUDP_handlepacket(data, length, ip_port)) {
                     printpacket(data, length, ip_port);
-            }
-            else
-            {
+            } else {
                 //printconnection(0);
                  printf("Received handled packet with length: %u\n", length);
             }
@@ -137,14 +133,12 @@ void Lossless_UDP()
     }
     
     doLossless_UDP();   
-    
 }
 
 
 int main(int argc, char *argv[])
 {
-    if (argc < 2) 
-    {
+    if (argc < 2) {
         printf("usage: %s filename\n", argv[0]);
         exit(0);
     }
@@ -167,14 +161,11 @@ int main(int argc, char *argv[])
     uint64_t timer = current_time();
     
     
-    while(1)
-    {
+    while(1) {
         Lossless_UDP();
         connection = incoming_connection();
-        if(connection != -1)
-        {
-            if(is_connected(connection) == 2)
-            {
+        if(connection != -1) {
+            if(is_connected(connection) == 2) {
                 printf("Recieved the connection.\n");
                 
             }
@@ -185,25 +176,20 @@ int main(int argc, char *argv[])
     
     timer = current_time();
     
-    while(1)
-    {
+    while(1) {
         //printconnection(0);
         Lossless_UDP();
-        if(is_connected(connection) >= 2)
-        {
+        if(is_connected(connection) >= 2) {
             kill_connection_in(connection, 3000000);
             read = read_packet(connection, buffer);
-            if(read != 0)
-            {
+            if(read != 0) {
                // printf("Recieved data.\n");
-                if(!fwrite(buffer, read, 1, file))
-                {
+                if(!fwrite(buffer, read, 1, file)) {
                         printf("file write error\n");
                 }
             }
         }
-        if(is_connected(connection) == 4)
-        {
+        if(is_connected(connection) == 4) {
             printf("Connecting Lost after: %llu us\n", (unsigned long long)(current_time() - timer));
             fclose(file);
             return 1;
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index e5da16e9..19ab4cc3 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -104,15 +104,12 @@ int main(int argc, char *argv[])
         exit(0);
     }
     initMessenger();
-    if(argc > 3)
-    {
+    if(argc > 3) {
         IP_Port bootstrap_ip_port;
         bootstrap_ip_port.port = htons(atoi(argv[2]));
         bootstrap_ip_port.ip.i = inet_addr(argv[1]);
         DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3]));
-    }
-    else
-    {
+    } else {
         FILE *file = fopen(argv[1], "rb");
         if ( file==NULL ){return 1;}
         int read;
@@ -127,8 +124,7 @@ int main(int argc, char *argv[])
     
     printf("OUR ID: ");
     uint32_t i;
-    for(i = 0; i < 32; i++)
-    {
+    for(i = 0; i < 32; i++) {
         if(self_public_key[i] < 16)
             printf("0");
         printf("%hhX",self_public_key[i]);
@@ -138,16 +134,14 @@ int main(int argc, char *argv[])
     
     char temp_id[128];
     printf("\nEnter the client_id of the friend you wish to add (32 bytes HEX format):\n");
-    if(scanf("%s", temp_id) != 1)
-    {
+    if(scanf("%s", temp_id) != 1) {
         return 1;
     }
     int num = m_addfriend(hex_string_to_bin(temp_id), (uint8_t*)"Install Gentoo", sizeof("Install Gentoo"));
     
     perror("Initialization");
 
-    while(1)
-    {
+    while(1) {
         uint8_t name[128];
         getname(num, name);
         printf("%s\n", name);
@@ -162,6 +156,5 @@ int main(int argc, char *argv[])
         fwrite(buffer, 1, Messenger_size(), file);
         free(buffer);
         fclose(file);
-    }
-    
+    }  
 }
diff --git a/testing/nTox.c b/testing/nTox.c
index 87a87007..caa7d45c 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -51,8 +51,7 @@ unsigned char * hex_string_to_bin(char hex_string[])
     unsigned char * val = malloc(strlen(hex_string));
     char * pos = hex_string;
     int i=0;
-    while(i < strlen(hex_string))
-    {
+    while(i < strlen(hex_string)) {
         sscanf(pos,"%2hhx",&val[i]);
         pos+=2;
         i++;
@@ -190,6 +189,7 @@ void do_refresh()
     clrtoeol();
     refresh();
 }
+
 void print_request(uint8_t * public_key, uint8_t * data, uint16_t length)
 {
     new_lines("[i] received friend request");
@@ -205,6 +205,7 @@ void print_request(uint8_t * public_key, uint8_t * data, uint16_t length)
         new_lines(numchar);
     }
 }
+
 void print_message(int friendnumber, uint8_t * string, uint16_t length)
 {
     char name[MAX_NAME_LENGTH];
@@ -220,6 +221,7 @@ void print_message(int friendnumber, uint8_t * string, uint16_t length)
     sprintf(msg, "[%d] %s <%s> %s", friendnumber, temp, name, string); // someone please fix this
     new_lines(msg);
 }
+
 void print_nickchange(int friendnumber, uint8_t *string, uint16_t length) {
     char name[MAX_NAME_LENGTH];
     getname(friendnumber, (uint8_t*)name);
@@ -227,6 +229,7 @@ void print_nickchange(int friendnumber, uint8_t *string, uint16_t length) {
     sprintf(msg, "[i] [%d] %s is now known as %s.", friendnumber, name, string);
     new_lines(msg);
 }
+
 void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) {
     char name[MAX_NAME_LENGTH];
     getname(friendnumber, (uint8_t*)name);
@@ -234,6 +237,7 @@ void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) {
     sprintf(msg, "[i] [%d] %s's status changed to %s.", friendnumber, name, string);
     new_lines(msg);
 }
+
 void load_key(){
     FILE *data_file = NULL;
     if ((data_file = fopen("data","r"))) {
@@ -260,6 +264,7 @@ void load_key(){
     }
    fclose(data_file);
 }
+
 int main(int argc, char *argv[])
 {
     if (argc < 4) {
@@ -317,9 +322,7 @@ int main(int argc, char *argv[])
     DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3]));
     nodelay(stdscr, TRUE);
     while(true) {
-
-        if (on == 0 && DHT_isconnected())
-        {
+        if (on == 0 && DHT_isconnected()) {
             new_lines("[i] connected to DHT\n[i] define username with /n");
             on = 1;
         }
diff --git a/testing/nTox.h b/testing/nTox.h
index 5a86830f..9b69d959 100644
--- a/testing/nTox.h
+++ b/testing/nTox.h
@@ -20,6 +20,7 @@
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  *  
  */
+
 #ifndef NTOX_H
 #define NTOX_H