4 files changed, 83 insertions, 89 deletions

diff --git a/testing/DHT_sendfiletest.c b/testing/DHT_sendfiletest.c
index 5b5d6c9f..873a73f8 100644
--- a/testing/DHT_sendfiletest.c
+++ b/testing/DHT_sendfiletest.c
@@ -96,78 +96,72 @@ int main(int argc, char *argv[])
     uint8_t buffer2[128];
     int read2 = 0;
     FILE *file1 = fopen(argv[4], "rb");
-    if ( file1==NULL ){printf("Error opening file.\n");return 1;}
+    if (file1 == NULL) {
+      printf("Error opening file.\n");
+      return 1;
+    }
     FILE *file2 = fopen("received.txt", "wb");
-    if ( file2==NULL ){return 1;}
+    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 */
-                    printf("Received unhandled packet with length: %u\n", length);
-                } else {
+    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))
+                    printf("Received unhandled packet with length: %u\n", length); /* if packet is not recognized */
+                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 (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(is_connected(connection) == 3)
-        {
-            if(write_packet(0, buffer1, read1))
-            {
+        if (is_connected(connection) == 3) {
+            if (write_packet(0, buffer1, read1)) {
                 printf("Wrote data.\n");
                 read1 = fread(buffer1, 1, 128, file1);
             }
             read2 = read_packet(0, buffer2);
-            if(read2 != 0)
-            {
+            if (read2 != 0) {
                 printf("Received data.\n");
                 if(!fwrite(buffer2, read2, 1, file2))
-                {
-                        printf("file write error\n");
-                }
+                   printf("file write error\n");
                 if(read2 < 128)
-                {
                     fclose(file2);
-                }
-            } 
+            }
         }
         doDHT();
         doLossless_UDP();
diff --git a/testing/Lossless_UDP_testclient.c b/testing/Lossless_UDP_testclient.c
index 8f23528c..c1eaa69d 100644
--- a/testing/Lossless_UDP_testclient.c
+++ b/testing/Lossless_UDP_testclient.c
@@ -44,13 +44,13 @@
 
 #define PORT 33446
 
-void printpacket(uint8_t * data, uint32_t length, IP_Port ip_port)
+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++) {
-        if(data[i] < 16)
+    for (i = 0; i < length; i++) {
+        if (data[i] < 16)
             printf("0");
         printf("%hhX",data[i]);
     }
@@ -59,7 +59,7 @@ void printpacket(uint8_t * data, uint32_t length, IP_Port ip_port)
 
 void printip(IP_Port ip_port)
 {
-    printf("\nIP: %u.%u.%u.%u Port: %u",ip_port.ip.c[0],ip_port.ip.c[1],ip_port.ip.c[2],ip_port.ip.c[3],ntohs(ip_port.port));
+    printf("\nIP: %u.%u.%u.%u Port: %u", ip_port.ip.c[0], ip_port.ip.c[1], ip_port.ip.c[2], ip_port.ip.c[3], ntohs(ip_port.port));
 }
 /*
 void printpackets(Data test)
@@ -123,16 +123,15 @@ 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)) {
-                    printpacket(data, length, ip_port);
-            } else {
-                //printconnection(0);
-                 printf("Received handled packet with length: %u\n", length);
-            }
+            if (LosslessUDP_handlepacket(data, length, ip_port))
+                printpacket(data, length, ip_port);
+            else 
+                printf("Received handled packet with length: %u\n", length); //printconnection(0);
+            
        /* } */
     }
     
@@ -151,7 +150,8 @@ int main(int argc, char *argv[])
     int read;
     
     FILE *file = fopen(argv[3], "rb");
-    if ( file==NULL ){return 1;}
+    if (file == NULL)
+      return 1;
     
     
     /* initialize networking */
@@ -166,14 +166,14 @@ int main(int argc, char *argv[])
     printip(serverip);
     int connection = new_connection(serverip);
     uint64_t timer = current_time();
-    while(1) {
+    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;
         }
@@ -185,19 +185,19 @@ int main(int argc, char *argv[])
     /*read first part of file */
     read = fread(buffer, 1, 512, file);
     
-    while(1) {
+    while (1) {
         /* printconnection(connection); */
         Lossless_UDP();
-        if(is_connected(connection) == 3) {
+        if (is_connected(connection) == 3) {
             
-            if(write_packet(connection, buffer, read)) {
+            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) {
+            if (sendqueue(connection) == 0) {
+                if (read == 0) {
                     printf("Sent file successfully in: %llu us\n", (unsigned long long)(current_time() - timer));
                     break;
                 }
diff --git a/testing/Lossless_UDP_testserver.c b/testing/Lossless_UDP_testserver.c
index a8097048..4b437f0e 100644
--- a/testing/Lossless_UDP_testserver.c
+++ b/testing/Lossless_UDP_testserver.c
@@ -45,12 +45,12 @@
 
 #define PORT 33445
 
-void printpacket(uint8_t * data, uint32_t length, IP_Port ip_port)
+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]);
@@ -120,10 +120,10 @@ 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 {
                 //printconnection(0);
@@ -147,7 +147,8 @@ int main(int argc, char *argv[])
     int read;
     
     FILE *file = fopen(argv[1], "wb");
-    if ( file==NULL ){return 1;}
+    if (file == NULL)
+      return 1;
     
     
     //initialize networking
@@ -161,7 +162,7 @@ int main(int argc, char *argv[])
     uint64_t timer = current_time();
     
     
-    while(1) {
+    while (1) {
         Lossless_UDP();
         connection = incoming_connection();
         if(connection != -1) {
@@ -176,17 +177,16 @@ 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) {
diff --git a/testing/nTox.c b/testing/nTox.c
index 3a5e9bb3..27654191 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -39,9 +39,9 @@ int nick_before;
 void new_lines(char *line)
 {
     int i;
-    for (i = HISTORY-1; i > 0; i--) {
+    for (i = HISTORY-1; i > 0; i--) 
         strcpy(lines[i],lines[i-1]);
-    }
+    
     strcpy(lines[0],line);
     do_refresh();
 }
@@ -53,8 +53,7 @@ unsigned char * hex_string_to_bin(char hex_string[])
     unsigned char * val = malloc(len);
     char * pos = hex_string;
     int i=0;
-    while(i < len)
-    {
+    while(i < len) {
         sscanf(pos,"%2hhx",&val[i]);
         pos+=2;
         i++;
@@ -71,17 +70,18 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
         if (line[1] == 'f') { // add friend command: /f ID
             int i;
             char temp_id[128];
-            for (i=0; i<128; i++) {
+            for (i=0; i<128; i++) 
                 temp_id[i] = line[i+3];
-            }
             int num = m_addfriend(hex_string_to_bin(temp_id), (uint8_t*)"Install Gentoo", sizeof("Install Gentoo"));
             char numstring[100];
             sprintf(numstring, "[i] added friend %d", num);
             new_lines(numstring);
             do_refresh();
-        } else if (line[1] == 'd') {
+        }
+        else if (line[1] == 'd') {
             doMessenger();
-        } else if (line[1] == 'm') { //message command: /m friendnumber messsage
+        }
+        else if (line[1] == 'm') { //message command: /m friendnumber messsage
             int i;
             size_t len = strlen(line);
             char numstring[len-3];
@@ -91,15 +91,15 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
                     numstring[i] = line[i+3];
                 } else {
                     int j;
-                    for (j=i+1; j<len; j++) {
+                    for (j=i+1; j<len; j++)
                         message[j-i-1] = line[j+3];
-                    }
                     break;
                 }
             }
             int num = atoi(numstring);
             m_sendmessage(num, (uint8_t*) message, sizeof(message));
-        } else if (line[1] == 'n') {
+        }
+        else if (line[1] == 'n') {
             uint8_t name[MAX_NAME_LENGTH];
             int i = 0;
             size_t len = strlen(line);
@@ -112,7 +112,8 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
             char numstring[100];
             sprintf(numstring, "[i] changed nick to %s", (char*)name);
             new_lines(numstring);
-        } else if (line[1] == 's') {
+        }
+        else if (line[1] == 's') {
             uint8_t status[MAX_USERSTATUS_LENGTH];
             int i = 0;
             size_t len = strlen(line);
@@ -125,7 +126,8 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
             char numstring[100];
             sprintf(numstring, "[i] changed status to %s", (char*)status);
             new_lines(numstring);
-        } else if (line[1] == 'q') { //exit
+        }
+        else if (line[1] == 'q') { //exit
             endwin();
             exit(EXIT_SUCCESS);
         }
@@ -139,7 +141,7 @@ void wrap(char output[STRING_LENGTH], char input[STRING_LENGTH], int line_width)
     int i = 0;
     strcpy(output,input);
     size_t len = strlen(output);
-    for (i=line_width; i < len; i = i + line_width) {
+    for (i = line_width; i < len; i = i + line_width) {
         while (output[i] != ' ' && i != 0) {
             i--;
         }
@@ -155,9 +157,8 @@ int count_lines(char *string)
     int i;
     int count = 1;
     for (i=0; i < len; i++) {
-        if (string[i] == '\n') {
+        if (string[i] == '\n')
             count++;
-        }
     }
     return count;
 }
@@ -196,11 +197,11 @@ void do_refresh()
     refresh();
 }
 
-void print_request(uint8_t * public_key, uint8_t * data, uint16_t length)
+void print_request(uint8_t *public_key, uint8_t *data, uint16_t length)
 {
     new_lines("[i] received friend request");
     do_refresh();
-    if(memcmp(data , "Install Gentoo", sizeof("Install Gentoo")) == 0 )
+    if (memcmp(data , "Install Gentoo", sizeof("Install Gentoo")) == 0)
     //if the request contained the message of peace the person is obviously a friend so we add him.
     {
         new_lines("[i] friend request accepted");
@@ -298,15 +299,14 @@ int main(int argc, char *argv[])
     uint32_t i;
     for(i = 0; i < 32; i++)
     {
-        if(self_public_key[i] < 16) {
+        if(self_public_key[i] < 16)
             strcpy(idstring1[i],"0");
-        } else {
+        else 
             strcpy(idstring1[i], "");
-        }
         sprintf(idstring2[i], "%hhX",self_public_key[i]);
     }
     strcpy(idstring0,"[i] your ID: ");
-    for(i=0; i<32; i++) {
+    for (i=0; i<32; i++) {
         strcat(idstring0,idstring1[i]);
         strcat(idstring0,idstring2[i]);
     }
@@ -320,11 +320,11 @@ int main(int argc, char *argv[])
     IP_Port bootstrap_ip_port;
     bootstrap_ip_port.port = htons(atoi(argv[2]));
     int resolved_address = resolve_addr(argv[1]);
-    if (resolved_address != -1) {
+    if (resolved_address != -1)
         bootstrap_ip_port.ip.i = resolved_address;
-    } else {
+    else 
         exit(1);
-    }
+    
     DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3]));
     nodelay(stdscr, TRUE);
     while(true) {