3 files changed, 192 insertions, 121 deletions

diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index 588450e2..f1940614 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -60,11 +60,11 @@ void print_clientlist()
         }
         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: %u", close_clientlist[i].timestamp);
-        printf("\nLast pinged: %u\n", close_clientlist[i].last_pinged);
+        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: %u\n", close_clientlist[i].ret_timestamp);
+        printf("Timestamp: %llu\n",(long long unsigned int) close_clientlist[i].ret_timestamp);
     }  
 }
 
@@ -93,11 +93,11 @@ void print_friendlist()
             }
             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: %u", friends_list[k].client_list[i].timestamp);
-            printf("\nLast pinged: %u\n", friends_list[k].client_list[i].last_pinged);
+            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("Timestamp: %u\n", friends_list[k].client_list[i].ret_timestamp);
+            printf("Timestamp: %llu\n", (long long unsigned int)friends_list[k].client_list[i].ret_timestamp);
         }
     }
 }
diff --git a/testing/nTox_win32.c b/testing/nTox_win32.c
index 42780923..3b6fb043 100644
--- a/testing/nTox_win32.c
+++ b/testing/nTox_win32.c
@@ -28,6 +28,7 @@
 
 uint8_t pending_requests[256][CLIENT_ID_SIZE];
 uint8_t num_requests = 0;
+uint32_t maxnumfriends;
 
 char line[STRING_LENGTH];
 char users_id[200];
@@ -105,6 +106,7 @@ void load_key()
         int size = Messenger_size();
         uint8_t data[size];
         Messenger_save(data);
+        fclose(data_file);
         data_file = fopen("data", "w");
 
         if (fwrite(data, sizeof(uint8_t), size, data_file) != size) {
@@ -115,32 +117,178 @@ void load_key()
     fclose(data_file);
 }
 
+void add_friend()
+{
+    int i;
+    char temp_id[128];
+    
+    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"));
+   
+    if (num >= 0) {
+        char numstring[100];
+        sprintf(numstring, "\n[i] Friend request sent. Wait to be accepted. Friend id: %d\n\n", num);
+        printf(numstring);
+        ++maxnumfriends;
+    }
+    else if (num == -1) 
+        printf("\n[i] Message is too long.\n\n");
+    
+    else if (num == -2)
+        printf("\n[i] Please add a message to your friend request.\n\n");
+    
+    else if (num == -3)
+        printf("\n[i] That appears to be your own ID.\n\n");
+    
+    else if (num == -4)
+        printf("\n[i] Friend request already sent.\n\n");
+    
+    else if (num == -5)
+        printf("\n[i] Undefined error when adding friend\n\n");
+}
+
+void list_friends()
+{
+    int activefriends = 0;
+    int i;
+
+    for (i = 0; i <= maxnumfriends; i++) {
+        if (m_friendstatus(i) == 4)
+            activefriends++;
+    }
+
+    printf("\n[i] Friend List | Total: %d\n\n", activefriends);
+
+    for (i = 0; i <= 256; i++) {/* TODO: fix this properly*/
+        char name[MAX_NAME_LENGTH];
+        getname(i, (uint8_t*)name);
+        
+        if (m_friendstatus(i) == 4)    
+            printf("[%d] %s\n\n", i, (uint8_t*)name);
+    }
+}
+
+void delete_friend()
+{
+    size_t len = strlen(line);
+    char numstring[len-3];
+    int i;
+    
+    for (i = 0; i < len; i++) {
+        if (line[i+3] != ' ')
+            numstring[i] = line[i+3];
+    }
+    
+    int num = atoi(numstring);
+    m_delfriend(num);
+    --maxnumfriends;
+    printf("\n\n");
+}
+
+void message_friend()
+{
+    size_t len = strlen(line);
+    char numstring[len-3];
+    char message[len-3];
+    int i;
+    
+    for (i = 0; i < len; i++) {
+
+        if (line[i+3] != ' ') 
+            numstring[i] = line[i+3];
+
+        else {
+            int j;
+
+            for (j = (i+1); j < len; j++)
+                message[j-i-1] = line[j+3];
+
+            break;
+        }
+    }
+
+    int num = atoi(numstring);
+
+    if(m_sendmessage(num, (uint8_t*) message, sizeof(message)) != 1)
+        printf("\n[i] could not send message (they may be offline): %s\n", message);
+   
+    else
+        printf("\n");
+}
+
+void change_nickname()
+{
+    uint8_t name[MAX_NAME_LENGTH];
+    int i = 0;
+    size_t len = strlen(line);
+    
+    for (i = 3; i < len; i++) {
+
+        if (line[i] == 0 || line[i] == '\n') 
+            break;
+
+        name[i-3] = line[i];
+    }
+    
+    name[i-3] = 0;
+    setname(name, i);
+    char numstring[100];
+    sprintf(numstring, "\n[i] changed nick to %s\n\n", (char*)name);
+    printf(numstring);
+
+    FILE *name_file = NULL;
+    name_file = fopen("namefile.txt", "w");
+    fprintf(name_file, "%s", (char*)name);
+    fclose(name_file);
+}
+
+void change_status()
+{
+    uint8_t status[MAX_USERSTATUS_LENGTH];
+    int i = 0;
+    size_t len = strlen(line);
+    
+    for (i = 3; i < len; i++) {
+        if (line[i] == 0 || line[i] == '\n') 
+            break;
+        
+        status[i-3] = line[i];
+    }
+
+    status[i-3] = 0;
+    m_set_userstatus(status, strlen((char*)status));
+    char numstring[100];
+    sprintf(numstring, "\n[i] changed status to %s\n\n", (char*)status);
+    printf(numstring);
+
+    FILE* status_file = NULL;
+    status_file = fopen("statusfile.txt", "w");
+    fprintf(status_file, "%s", (char*)status);
+    fclose(status_file);
+}
+
+void accept_friend_request()
+{
+    uint8_t numf = atoi(line + 3);
+    char numchar[100];
+    sprintf(numchar, "\n[i] friend request %u accepted\n\n", numf);
+    printf(numchar);
+    int num = m_addfriend_norequest(pending_requests[numf]);
+    sprintf(numchar, "\n[i] added friendnumber %d\n\n", num);
+    printf(numchar);
+    ++maxnumfriends;
+}
+
 void line_eval(char* line)
 {
     if(line[0] == '/') {
+
         char inpt_command = line[1];
-        /* Add friend */
+
         if(inpt_command == 'f') {
-            int i;
-            char temp_id[128];
-            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"));
-            if (num >= 0) {
-                char numstring[100];
-                sprintf(numstring, "\n[i] Friend request sent. Wait to be accepted. Friend id: %d\n\n", num);
-                printf(numstring);
-            }
-            else if (num == -1) 
-                printf("\n[i] Message is too long.\n\n");
-            else if (num == -2)
-                printf("\n[i] Please add a message to your friend request.\n\n");
-            else if (num == -3)
-                printf("\n[i] That appears to be your own ID.\n\n");
-            else if (num == -4)
-                printf("\n[i] Friend request already sent.\n\n");
-            else if (num == -5)
-                printf("\n[i] Undefined error when adding friend\n\n");
+            add_friend(line);
         }
 
         else if (inpt_command == 'r') {
@@ -149,111 +297,27 @@ void line_eval(char* line)
         }
 
         else if (inpt_command == 'l') {
-            int activefriends = 0;
-            int i;
-
-            for (i = 0; i <= getnumfriends(); i++)
-            {
-                if (m_friendstatus(i) == 4)
-                    activefriends++;
-            }
-
-            printf("\n[i] Friend List | Total: %d\n\n", activefriends);
-
-            for (i = 0; i <= getnumfriends(); i++) {
-                char name[MAX_NAME_LENGTH];
-                getname(i, (uint8_t*)name);
-                if (m_friendstatus(i) == 4)    
-                    printf("[%d] %s\n\n", i, (uint8_t*)name);
-            }
+            list_friends(line);
         }
 
         else if (inpt_command == 'd') {
-            size_t len = strlen(line);
-            char numstring[len-3];
-            int i;
-            for (i = 0; i < len; i++) {
-                if (line[i+3] != ' ') {
-                    numstring[i] = line[i+3];
-                }
-            }
-            int num = atoi(numstring);
-            m_delfriend(num);
-            printf("\n\n");
+            delete_friend(line);
         }
         /* Send message to friend */
         else if (inpt_command == 'm') {
-            size_t len = strlen(line);
-            char numstring[len-3];
-            char message[len-3];
-            int i;
-            for (i = 0; i < len; i++) {
-                if (line[i+3] != ' ') {
-                    numstring[i] = line[i+3];
-                } else {
-                    int j;
-                    for (j = (i+1); j < len; j++)
-                        message[j-i-1] = line[j+3];
-                    break;
-                }
-            }
-            int num = atoi(numstring);
-            if(m_sendmessage(num, (uint8_t*) message, sizeof(message)) != 1) {
-                printf("\n[i] could not send message (they may be offline): %s\n", message);
-            } else {
-                //simply for aesthetics
-                printf("\n");
-            }
+            message_friend(line);
         }
 
         else if (inpt_command == 'n') {
-            uint8_t name[MAX_NAME_LENGTH];
-            int i = 0;
-            size_t len = strlen(line);
-            for (i = 3; i < len; i++) {
-                if (line[i] == 0 || line[i] == '\n') break;
-                name[i-3] = line[i];
-            }
-            name[i-3] = 0;
-            setname(name, i);
-            char numstring[100];
-            sprintf(numstring, "\n[i] changed nick to %s\n\n", (char*)name);
-            printf(numstring);
-
-            FILE *name_file = NULL;
-            name_file = fopen("namefile.txt", "w");
-            fprintf(name_file, "%s", (char*)name);
-            fclose(name_file);
+            change_nickname(line);
         }
 
         else if (inpt_command == 's') {
-            uint8_t status[MAX_USERSTATUS_LENGTH];
-            int i = 0;
-            size_t len = strlen(line);
-            for (i = 3; i < len; i++) {
-                if (line[i] == 0 || line[i] == '\n') break;
-                status[i-3] = line[i];
-            }
-            status[i-3] = 0;
-            m_set_userstatus(status, strlen((char*)status));
-            char numstring[100];
-            sprintf(numstring, "\n[i] changed status to %s\n\n", (char*)status);
-            printf(numstring);
-
-            FILE* status_file = NULL;
-            status_file = fopen("statusfile.txt", "w");
-            fprintf(status_file, "%s", (char*)status);
-            fclose(status_file);
+            change_status(line);
         }
 
         else if (inpt_command == 'a') {
-            uint8_t numf = atoi(line + 3);
-            char numchar[100];
-            sprintf(numchar, "\n[i] friend request %u accepted\n\n", numf);
-            printf(numchar);
-            int num = m_addfriend_norequest(pending_requests[numf]);
-            sprintf(numchar, "\n[i] added friendnumber %d\n\n", num);
-            printf(numchar);
+            accept_friend_request(line);
         }
         /* EXIT */
         else if (inpt_command == 'q') { 
@@ -261,8 +325,6 @@ void line_eval(char* line)
             m_set_userstatus(status, strlen((char*)status));
             exit(EXIT_SUCCESS);
         }
-    } else {
-        //nothing atm
     }
 }
 
@@ -305,8 +367,9 @@ int main(int argc, char *argv[])
         setname(name, strlen((char*)name)+1);
         nameloaded = 1;
         printf("%s\n", name);
+        fclose(name_file);
     }
-    fclose(name_file);
+    
 
     FILE* status_file = NULL;
     status_file = fopen("statusfile.txt", "r");
@@ -318,8 +381,9 @@ int main(int argc, char *argv[])
         m_set_userstatus(status, strlen((char*)status)+1);
         statusloaded = 1;
         printf("%s\n", status);
+        fclose(status_file);
     }
-    fclose(status_file);
+    
 
     m_callback_friendrequest(print_request);
     m_callback_friendmessage(print_message);
diff --git a/testing/nTox_win32.h b/testing/nTox_win32.h
index 374348a4..211ac95f 100644
--- a/testing/nTox_win32.h
+++ b/testing/nTox_win32.h
@@ -34,6 +34,13 @@ void print_message(int friendnumber, uint8_t * string, uint16_t length);
 void print_nickchange(int friendnumber, uint8_t *string, uint16_t length);
 void print_statuschange(int friendnumber, uint8_t *string, uint16_t length);
 void load_key();
+void add_friend();
+void list_friends();
+void delete_friend();
+void message_friend();
+void change_nickname();
+void change_status();
+void accept_friend_request();
 void line_eval(char* line);
 void get_input();