1 files changed, 42 insertions, 37 deletions

diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index e194d06b..d14e1577 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -7,7 +7,26 @@
  * 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.
+ *
+ *  This file is part of Tox.
+ *
+ *  Tox is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Tox is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  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"
@@ -28,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;
@@ -56,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);
@@ -69,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]);
@@ -94,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]);
@@ -103,14 +114,14 @@ void printpacket(uint8_t * data, uint32_t length, IP_Port ip_port)
     printf("\n--------------------END-----------------------------\n\n\n");
 }
 
-//horrible function from one of my first C programs.
-//only here because I was too lazy to write a proper one.
+//TODO: rewrite
 unsigned char * hex_string_to_bin(char hex_string[])
 {
-    unsigned char * val = malloc(strlen(hex_string));
+    size_t len = strlen(hex_string);
+    unsigned char * val = malloc(len);
     char * pos = hex_string;
     int i=0;
-    while(i < strlen(hex_string))
+    while(i < len)
     {
         sscanf(pos,"%2hhx",&val[i]);
         pos+=2;
@@ -130,8 +141,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]);
@@ -142,8 +152,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);
@@ -152,10 +162,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]));
     
@@ -163,20 +173,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);
             }
         }
@@ -187,4 +192,4 @@ int main(int argc, char *argv[])
     
     shutdown_networking();
     return 0;   
-}
\ No newline at end of file
+}