Passed everything through astyle.

1 files changed, 74 insertions, 58 deletions

diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index c5b367cf..3883f3a7 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -1,11 +1,11 @@
 /* DHT test
  * A file with a main that runs our DHT for testing.
- * 
+ *
  * Compile with: gcc -O2 -Wall -D VANILLA_NACL -o test ../core/Lossless_UDP.c ../core/network.c ../core/net_crypto.c ../core/Messenger.c ../nacl/build/${HOSTNAME%.*}/lib/amd64/{cpucycles.o,libnacl.a,randombytes.o} DHT_test.c
- * 
+ *
  * Command line arguments are the ip, port and public key of a node.
  * EX: ./test 127.0.0.1 33445 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- * 
+ *
  * The test will then ask you for the id (in hex format) of the friend you wish to add
  *
  *  Copyright (C) 2013 Tox project All Rights Reserved.
@@ -24,9 +24,9 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
- *  
+ *
  */
- 
+
 //#include "../core/network.h"
 #include "../core/DHT.c"
 #include "../core/friend_requests.c"
@@ -53,19 +53,22 @@ void print_clientlist()
     uint32_t i, j;
     IP_Port p_ip;
     printf("___________________CLOSE________________________________\n");
-    for(i = 0; i < 32; i++) {
+
+    for (i = 0; i < 32; i++) {
         printf("ClientID: ");
-        for(j = 0; j < 32; j++) {
+
+        for (j = 0; j < 32; j++) {
             printf("%02hhX", close_clientlist[i].client_id[j]);
         }
+
         p_ip = close_clientlist[i].ip_port;
-        printf("\nIP: %u.%u.%u.%u Port: %u",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port));
-        printf("\nTimestamp: %llu",(long long unsigned int) close_clientlist[i].timestamp);
-        printf("\nLast pinged: %llu\n",(long long unsigned int) close_clientlist[i].last_pinged);
+        printf("\nIP: %u.%u.%u.%u Port: %u", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port));
+        printf("\nTimestamp: %llu", (long long unsigned int) close_clientlist[i].timestamp);
+        printf("\nLast pinged: %llu\n", (long long unsigned int) close_clientlist[i].last_pinged);
         p_ip = close_clientlist[i].ret_ip_port;
-        printf("OUR IP: %u.%u.%u.%u Port: %u\n",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port));
-        printf("Timestamp: %llu\n",(long long unsigned int) close_clientlist[i].ret_timestamp);
-    }  
+        printf("OUR IP: %u.%u.%u.%u Port: %u\n", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port));
+        printf("Timestamp: %llu\n", (long long unsigned int) close_clientlist[i].ret_timestamp);
+    }
 }
 
 void print_friendlist()
@@ -73,78 +76,91 @@ 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);
-        printf("\nIP: %u.%u.%u.%u:%u",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port));
+        printf("\nIP: %u.%u.%u.%u:%u", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port));
 
         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++) {
-                if(friends_list[k].client_list[i].client_id[j] < 16)
+
+            for (j = 0; j < 32; j++) {
+                if (friends_list[k].client_list[i].client_id[j] < 16)
                     printf("0");
+
                 printf("%hhX", friends_list[k].client_list[i].client_id[j]);
             }
+
             p_ip = friends_list[k].client_list[i].ip_port;
-            printf("\nIP: %u.%u.%u.%u:%u",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port));
-            printf("\nTimestamp: %llu",(long long unsigned int) friends_list[k].client_list[i].timestamp);
-            printf("\nLast pinged: %llu\n",(long long unsigned int) friends_list[k].client_list[i].last_pinged);
+            printf("\nIP: %u.%u.%u.%u:%u", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port));
+            printf("\nTimestamp: %llu", (long long unsigned int) friends_list[k].client_list[i].timestamp);
+            printf("\nLast pinged: %llu\n", (long long unsigned int) friends_list[k].client_list[i].last_pinged);
             p_ip = friends_list[k].client_list[i].ret_ip_port;
-            printf("ret IP: %u.%u.%u.%u:%u\n",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port));
+            printf("ret IP: %u.%u.%u.%u:%u\n", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port));
             printf("Timestamp: %llu\n", (long long unsigned int)friends_list[k].client_list[i].ret_timestamp);
         }
     }
 }
 
-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]);
+
+        printf("%hhX", data[i]);
     }
+
     printf("\n--------------------END-----------------------------\n\n\n");
 }
 
 int main(int argc, char *argv[])
 {
     //memcpy(self_client_id, "qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq", 32);
-    
+
     if (argc < 4) {
         printf("usage %s ip port public_key\n", argv[0]);
         exit(0);
     }
+
     new_keys();
     printf("OUR ID: ");
     uint32_t i;
-    for(i = 0; i < 32; i++) {
-        if(self_public_key[i] < 16)
+
+    for (i = 0; i < 32; i++) {
+        if (self_public_key[i] < 16)
             printf("0");
-        printf("%hhX",self_public_key[i]);
+
+        printf("%hhX", self_public_key[i]);
     }
-    
+
     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)
         exit(0);
-    
+
     DHT_addfriend(hex_string_to_bin(temp_id));
-    
+
     /* initialize networking */
     /* bind to ip 0.0.0.0:PORT */
     IP ip;
     ip.i = 0;
     init_networking(ip, PORT);
-    
+
 
     perror("Initialization");
     IP_Port bootstrap_ip_port;
@@ -155,37 +171,37 @@ int main(int argc, char *argv[])
      * 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]));
-    
-/*
-    IP_Port ip_port;
-    uint8_t data[MAX_UDP_PACKET_SIZE];
-    uint32_t length;
-*/
+
+    /*
+        IP_Port ip_port;
+        uint8_t data[MAX_UDP_PACKET_SIZE];
+        uint32_t length;
+    */
 
     DHT_init();
     friendreq_init();
-    
-    while(1) {
-            
+
+    while (1) {
+
         doDHT();
-        
-/* slvrTODO:
-        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 {
-                printf("Received handled packet with length: %u\n", length);
-            }
-        }
-*/
+
+        /* slvrTODO:
+                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 {
+                        printf("Received handled packet with length: %u\n", length);
+                    }
+                }
+        */
         networking_poll();
 
         print_clientlist();
         print_friendlist();
         c_sleep(300);
     }
-    
+
     shutdown_networking();
     return 0;
 }