1 files changed, 94 insertions, 62 deletions

diff --git a/testing/nTox.c b/testing/nTox.c
index fa3b5b8c..029d62b4 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -208,6 +208,9 @@ char *format_message(Tox *m, char *message, int friendnum)
     return msg;
 }
 
+/* forward declaration */
+static int save_data(Tox *m);
+
 void line_eval(Tox *m, char *line)
 {
     if (line[0] == '/') {
@@ -251,7 +254,12 @@ void line_eval(Tox *m, char *line)
                     break;
 
                 default:
-                    sprintf(numstring, "[i] Added friend as %d.", num);
+                    if (num >= 0) {
+                        sprintf(numstring, "[i] Added friend as %d.", num);
+                        save_data(m);
+                    }
+                    else
+                        sprintf(numstring, "[i] Unknown error %i.", num);
                     break;
             }
 
@@ -284,7 +292,7 @@ void line_eval(Tox *m, char *line)
 
             int num = atoi(numstring);
 
-            if (tox_sendmessage(m, num, (uint8_t *) message, strlen(message) + 1) != 1) {
+            if (tox_sendmessage(m, num, (uint8_t *) message, strlen(message) + 1) < 1) {
                 new_lines("[i] could not send message");
             } else {
                 new_lines(format_message(m, message, -1));
@@ -339,6 +347,7 @@ void line_eval(Tox *m, char *line)
                     new_lines(numchar);
                     sprintf(numchar, "[i] added friendnumber %d", num);
                     new_lines(numchar);
+                    save_data(m);
                 } else {
                     sprintf(numchar, "[i] failed to add friend");
                     new_lines(numchar);
@@ -374,8 +383,8 @@ void line_eval(Tox *m, char *line)
                         tox_group_message_send(m, groupnumber, (uint8_t *)*posi + 1, strlen(*posi + 1) + 1));
                 new_lines(msg);
             }
-
         } else if (inpt_command == 'q') { //exit
+            save_data(m);
             endwin();
             exit(EXIT_SUCCESS);
         } else {
@@ -497,55 +506,70 @@ void print_statuschange(Tox *m, int friendnumber, uint8_t *string, uint16_t leng
     }
 }
 
-void load_key(Tox *m, char *path)
+static char *data_file_name = NULL;
+
+static int load_data(Tox *m)
 {
-    FILE *data_file = fopen(path, "r");
+    FILE *data_file = fopen(data_file_name, "r");
     int size = 0;
-
     if (data_file) {
-        //load keys
         fseek(data_file, 0, SEEK_END);
         size = ftell(data_file);
         rewind(data_file);
 
         uint8_t data[size];
-
         if (fread(data, sizeof(uint8_t), size, data_file) != size) {
-            fputs("[!] could not read data file! exiting...\n", stderr);
-            goto FILE_ERROR;
+            fputs("[!] could not read data file!\n", stderr);
+            return 0;
         }
 
         tox_load(m, data, size);
 
-    } else {
-        //else save new keys
-        int size = tox_size(m);
-        uint8_t data[size];
-        tox_save(m, data);
-        data_file = fopen(path, "w");
-
-        if (!data_file) {
-            perror("[!] load_key");
-            exit(1);
+        if (fclose(data_file) < 0) {
+            perror("[!] fclose failed");
+            /* we got it open and the expected data read... let it be ok */
+            /* return 0; */
         }
 
-        if (fwrite(data, sizeof(uint8_t), size, data_file) != size) {
-            fputs("[!] could not write data file! exiting...", stderr);
-            goto FILE_ERROR;
-        }
+        return 1;
     }
 
-    if (fclose(data_file) < 0)
-        perror("[!] fclose failed");
+    return 0;
+}
 
-    return;
+static int save_data(Tox *m)
+{
+    FILE *data_file = fopen(data_file_name, "w");
+    if (!data_file) {
+        perror("[!] load_key");
+        return 0;
+    }
 
-FILE_ERROR:
+    int size = tox_size(m);
+    uint8_t data[size];
+    tox_save(m, data);
 
-    if (fclose(data_file) < 0)
-        perror("[!] fclose failed");
+    if (fwrite(data, sizeof(uint8_t), size, data_file) != size) {
+        fputs("[!] could not write data file (1)!", stderr);
+        return 0;
+    }
 
-    exit(1);
+    if (fclose(data_file) < 0) {
+        perror("[!] could not write data file (2)");
+        return 0;
+    }
+}
+
+static int load_data_or_init(Tox *m, char *path)
+{
+    data_file_name = path;
+    if (load_data(m))
+        return 1;
+
+    if (save_data(m))
+        return 1;
+
+    return 0;
 }
 
 void print_help(void)
@@ -574,43 +598,43 @@ void print_groupmessage(Tox *m, int groupnumber, uint8_t *message, uint16_t leng
 
 int main(int argc, char *argv[])
 {
+    if (argc < 4) {
+        printf("Usage: %s [--ipv4|--ipv6] IP PORT KEY [-f keyfile]\n", argv[0]);
+        exit(0);
+    }
+
+    /* let user override default by cmdline */
+    uint8_t ipv6enabled = TOX_ENABLE_IPV6_DEFAULT; /* x */
+    int argvoffset = cmdline_parsefor_ipv46(argc, argv, &ipv6enabled);
+
+    if (argvoffset < 0)
+        exit(1);
+
     int on = 0;
     int c = 0;
-    int i = 0;
     char *filename = "data";
     char idstring[200] = {0};
     Tox *m;
 
-    if (argc < 4) {
-        printf("[!] Usage: %s [IP] [port] [public_key] <keyfile>\n", argv[0]);
+    if ((argc == 2) && !strcmp(argv[1], "-h")) {
+        print_help();
         exit(0);
     }
 
-    for (i = 0; i < argc; i++) {
-        if (argv[i] == NULL) {
-            break;
-        } else if (argv[i][0] == '-') {
-            if (argv[i][1] == 'h') {
-                print_help();
-                exit(0);
-            } else if (argv[i][1] == 'f') {
-                if (argv[i + 1] != NULL)
-                    filename = argv[i + 1];
-                else {
-                    fputs("[!] you passed '-f' without giving an argument!\n", stderr);
-                }
-            }
-        }
-    }
+    /* [-f keyfile] MUST be last two arguments, no point in walking over the list
+     * especially not a good idea to accept it anywhere in the middle */
+    if (argc > argvoffset + 3)
+        if (!strcmp(argv[argc - 2], "-f"))
+            filename = argv[argc - 1];
 
-    m = tox_new();
+    m = tox_new(ipv6enabled);
 
     if ( !m ) {
         fputs("Failed to allocate Messenger datastructure", stderr);
         exit(0);
     }
 
-    load_key(m, filename);
+    load_data_or_init(m, filename);
 
     tox_callback_friendrequest(m, print_request, NULL);
     tox_callback_friendmessage(m, print_message, NULL);
@@ -629,23 +653,31 @@ int main(int argc, char *argv[])
     new_lines(idstring);
     strcpy(line, "");
 
-    tox_IP_Port bootstrap_ip_port;
-    bootstrap_ip_port.port = htons(atoi(argv[2]));
-    int resolved_address = resolve_addr(argv[1]);
+    uint16_t port = htons(atoi(argv[argvoffset + 2]));
+    unsigned char *binary_string = hex_string_to_bin(argv[argvoffset + 3]);
+    int res = tox_bootstrap_from_address(m, argv[argvoffset + 1], ipv6enabled, port, binary_string);
+    free(binary_string);
 
-    if (resolved_address != 0)
-        bootstrap_ip_port.ip.i = resolved_address;
-    else
+    if (!res) {
+        printf("Failed to convert \"%s\" into an IP address. Exiting...\n", argv[argvoffset + 1]);
+        endwin();
         exit(1);
+    }
 
-    unsigned char *binary_string = hex_string_to_bin(argv[3]);
-    tox_bootstrap(m, bootstrap_ip_port, binary_string);
-    free(binary_string);
     nodelay(stdscr, TRUE);
 
+    new_lines("[i] change username with /n");
+    char name[TOX_MAX_NAME_LENGTH];
+    uint16_t namelen = tox_getselfname(m, name, sizeof(name));
+    if (namelen > 0) {
+        char whoami[128 + TOX_MAX_NAME_LENGTH];
+        snprintf(whoami, sizeof(whoami), "[i] your current username is: %s", name);
+        new_lines(whoami);
+    }
+
     while (1) {
         if (on == 0 && tox_isconnected(m)) {
-            new_lines("[i] connected to DHT\n[i] define username with /n");
+            new_lines("[i] connected to DHT");
             on = 1;
         }