12 files changed, 130 insertions, 37 deletions

diff --git a/INSTALL.md b/INSTALL.md
index 625a9c6d..483928b0 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -101,6 +101,7 @@ Grab the following packages:
   * http://www.gnu.org/software/automake/
   * http://www.cmake.org/
   * https://github.com/jedisct1/libsodium
+  * http://www.hyperrealm.com/libconfig/
 
 Uncompress and install them all. Make sure to follow the README as the instructions change, but they all follow the same pattern below:
 
@@ -118,7 +119,7 @@ make
 ```
 
 Do not install them from macports (or any dependencies for that matter) as they get shoved in the wrong directory
-and make your life more annoying.
+(or the wrong version gets installed) and make your life more annoying.
 
 Another thing you may want to install is the latest gcc, this caused me a few problems as XCode from 4.3
 no longer includes gcc and instead uses LLVM-GCC, a nice install guide can be found at
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 36acb6cf..5bd496cb 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -17,3 +17,4 @@ set(core_sources
         Messenger.c)
 
 add_library(toxcore SHARED ${core_sources})
+target_link_libraries(toxcore ${SODIUM_LIBRARY})
diff --git a/core/DHT.c b/core/DHT.c
index 5d5910e0..08b4710e 100644
--- a/core/DHT.c
+++ b/core/DHT.c
@@ -1,6 +1,6 @@
 /* DHT.c
  *
- * An implementation of the DHT as seen in docs/DHT.txt
+ * An implementation of the DHT as seen in http://wiki.tox.im/index.php/DHT
  *
  *  Copyright (C) 2013 Tox project All Rights Reserved.
  *
diff --git a/core/DHT.h b/core/DHT.h
index ffa02087..36670ed5 100644
--- a/core/DHT.h
+++ b/core/DHT.h
@@ -1,6 +1,6 @@
 /* DHT.h
  *
- * An implementation of the DHT as seen in docs/DHT.txt
+ * An implementation of the DHT as seen in http://wiki.tox.im/index.php/DHT
  *
  *  Copyright (C) 2013 Tox project All Rights Reserved.
  *
diff --git a/core/Lossless_UDP.c b/core/Lossless_UDP.c
index 33b8eb19..a753e5ff 100644
--- a/core/Lossless_UDP.c
+++ b/core/Lossless_UDP.c
@@ -1,6 +1,6 @@
 /* Lossless_UDP.c
  *
- * An implementation of the Lossless_UDP protocol as seen in docs/Lossless_UDP.txt
+ * An implementation of the Lossless_UDP protocol as seen in http://wiki.tox.im/index.php/Lossless_UDP
  *
  *  Copyright (C) 2013 Tox project All Rights Reserved.
  *
@@ -467,7 +467,7 @@ uint32_t missing_packets(int connection_id, uint32_t * requested)
 /* 
  * BEGIN Packet sending functions
  * One per packet type.
- * see docs/Lossless_UDP.txt for more information.
+ * see http://wiki.tox.im/index.php/Lossless_UDP for more information.
  */
 
 int send_handshake(IP_Port ip_port, uint32_t handshake_id1, uint32_t handshake_id2)
diff --git a/core/Lossless_UDP.h b/core/Lossless_UDP.h
index 573e1ab9..75ef273e 100644
--- a/core/Lossless_UDP.h
+++ b/core/Lossless_UDP.h
@@ -1,6 +1,6 @@
 /* Lossless_UDP.h
  *
- * An implementation of the Lossless_UDP protocol as seen in docs/Lossless_UDP.txt
+ * An implementation of the Lossless_UDP protocol as seen in http://wiki.tox.im/index.php/Lossless_UDP
  *
  *  Copyright (C) 2013 Tox project All Rights Reserved.
  *
diff --git a/core/net_crypto.c b/core/net_crypto.c
index 3b5b67f4..561ba866 100644
--- a/core/net_crypto.c
+++ b/core/net_crypto.c
@@ -1,7 +1,7 @@
 /* net_crypto.c
  *
  * Functions for the core network crypto.
- * See also: docs/Crypto.txt
+ * See also: http://wiki.tox.im/index.php/DHT
  *
  * NOTE: This code has to be perfect. We don't mess around with encryption.
  *
diff --git a/testing/misc_tools.c b/testing/misc_tools.c
index dbaa8b3b..aa546a88 100644
--- a/testing/misc_tools.c
+++ b/testing/misc_tools.c
@@ -36,5 +36,6 @@ unsigned char * hex_string_to_bin(char hex_string[])
     int i;
     for(i = 0; i < len; ++i, pos+=2)
         sscanf(pos,"%2hhx",&val[i]);
+
     return val;
 }
diff --git a/testing/nTox.c b/testing/nTox.c
index 4be69ac4..072c17e3 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -142,7 +142,9 @@ void line_eval(char *line)
             for (i = 0; i < 128; i++)
                 temp_id[i] = line[i+prompt_offset];
 
-            int num = m_addfriend(hex_string_to_bin(temp_id), (uint8_t*)"Install Gentoo", sizeof("Install Gentoo"));
+            unsigned char *bin_string = hex_string_to_bin(temp_id);
+            int num = m_addfriend(bin_string, (uint8_t*)"Install Gentoo", sizeof("Install Gentoo"));
+            free(bin_string);
             char numstring[100];
             switch (num) {
             case FAERR_TOOLONG:
@@ -466,7 +468,9 @@ int main(int argc, char *argv[])
     else
         exit(1);
 
-    DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3]));
+    unsigned char *binary_string = hex_string_to_bin(argv[3]);
+    DHT_bootstrap(bootstrap_ip_port, binary_string);
+    free(binary_string);
     nodelay(stdscr, TRUE);
     while(true) {
         if (on == 0 && DHT_isconnected()) {
diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c
index 7cae1c0a..936eb868 100644
--- a/testing/toxic/chat.c
+++ b/testing/toxic/chat.c
@@ -26,6 +26,8 @@ typedef struct {
 } ChatContext;
 
 extern void fix_name(uint8_t* name);
+void print_help(ChatContext* self);
+void execute(ToxWindow* self, ChatContext* ctx, char* cmd);
 
 static void chat_onMessage(ToxWindow* self, int num, uint8_t* msg, uint16_t len) {
   ChatContext* ctx = (ChatContext*) self->x;
@@ -49,6 +51,7 @@ static void chat_onMessage(ToxWindow* self, int num, uint8_t* msg, uint16_t len)
 
   wattron(ctx->history, COLOR_PAIR(2));
   wprintw(ctx->history, "%02d:%02d:%02d  ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
+  wattroff(ctx->history, COLOR_PAIR(2));
   wattron(ctx->history, COLOR_PAIR(4));
   wprintw(ctx->history, "%s: ", nick);
   wattroff(ctx->history, COLOR_PAIR(4));
@@ -77,6 +80,18 @@ static void chat_onStatusChange(ToxWindow* self, int num, uint8_t* status, uint1
 
 }
 
+/* check that the string has one non-space character */
+int string_is_empty(char *string)
+{
+  int rc = 0;
+  char *copy = strdup(string);
+
+  rc = ((strtok(copy, " ") == NULL) ? 1:0);
+  free(copy);
+
+  return rc;
+}
+
 static void chat_onKey(ToxWindow* self, int key) {
   ChatContext* ctx = (ChatContext*) self->x;
 
@@ -85,36 +100,93 @@ static void chat_onKey(ToxWindow* self, int key) {
   struct tm * timeinfo;
   timeinfo = localtime(&now);
 
+  /* PRINTABLE characters: Add to line */
   if(isprint(key)) {
-
     if(ctx->pos != sizeof(ctx->line)-1) {
       ctx->line[ctx->pos++] = key;
       ctx->line[ctx->pos] = '\0';
     }
   }
+
+  /* RETURN key: Execute command or print line */
   else if(key == '\n') {
-    wattron(ctx->history, COLOR_PAIR(2));
-    wprintw(ctx->history, "%02d:%02d:%02d  ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
-    wattron(ctx->history, COLOR_PAIR(1));
-    wprintw(ctx->history, "you: ", ctx->line);
-    wattroff(ctx->history, COLOR_PAIR(1));
-    wprintw(ctx->history, "%s\n", ctx->line);
-
-    if(m_sendmessage(ctx->friendnum, (uint8_t*) ctx->line, strlen(ctx->line)+1) < 0) {
-      wattron(ctx->history, COLOR_PAIR(3));
-      wprintw(ctx->history, " * Failed to send message.\n");
-      wattroff(ctx->history, COLOR_PAIR(3));
+    if (ctx->line[0] == '/')
+      execute(self, ctx, ctx->line);
+    else {
+      if(!string_is_empty(ctx->line)) {
+        /* make sure the string has at least non-space character */
+        wattron(ctx->history, COLOR_PAIR(2));
+        wprintw(ctx->history, "%02d:%02d:%02d ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
+        wattroff(ctx->history, COLOR_PAIR(2));
+        wattron(ctx->history, COLOR_PAIR(1));
+        wprintw(ctx->history, "you: ", ctx->line);
+        wattroff(ctx->history, COLOR_PAIR(1));
+        wprintw(ctx->history, "%s\n", ctx->line);
+      }
+      if(m_sendmessage(ctx->friendnum, (uint8_t*) ctx->line, strlen(ctx->line)+1) < 0) {
+        wattron(ctx->history, COLOR_PAIR(3));
+        wprintw(ctx->history, " * Failed to send message.\n");
+        wattroff(ctx->history, COLOR_PAIR(3));
+      }
     }
-
     ctx->line[0] = '\0';
     ctx->pos = 0;
   }
+
+  /* BACKSPACE key: Remove one character from line */
   else if(key == 0x107 || key == 0x8 || key == 0x7f) {
     if(ctx->pos != 0) {
       ctx->line[--ctx->pos] = '\0';
     }
   }
+}
 
+void execute(ToxWindow* self, ChatContext* ctx, char* cmd)
+{
+  if (!strcmp(cmd, "/clear") || !strcmp(cmd, "/c")) {
+    wclear(self->window);
+    wclear(ctx->history);
+  }
+  else if (!strcmp(cmd, "/help") || !strcmp(cmd, "/h"))
+    print_help(ctx);
+  else if (!strcmp(cmd, "/quit") || !strcmp(cmd, "/exit") || !strcmp(cmd, "/q")) {
+    endwin();
+    exit(0);
+  }
+  else if (!strncmp(cmd, "/status ", strlen("/status "))) {
+    char* msg;
+    msg = strchr(cmd, ' ');
+    if(msg == NULL) {
+      wprintw(ctx->history, "Invalid syntax.\n");
+      return;
+    }
+    msg++;
+    m_set_userstatus((uint8_t*) msg, strlen(msg)+1);
+    wprintw(ctx->history, "Status set to: %s\n", msg);
+  }
+  else if (!strncmp(cmd, "/nick ", strlen("/nick "))) {
+    char* nick;
+    nick = strchr(cmd, ' ');
+    if(nick == NULL) {
+      wprintw(ctx->history, "Invalid syntax.\n");
+      return;
+    }
+    nick++;
+    setname((uint8_t*) nick, strlen(nick)+1);
+    wprintw(ctx->history, "Nickname set to: %s\n", nick);
+  }
+  else if(!strcmp(cmd, "/myid")) {
+    char id[32*2 + 1] = {0};
+    int i;
+    for (i = 0; i < 32; i++) {
+      char xx[3];
+      snprintf(xx, sizeof(xx), "%02x",  self_public_key[i] & 0xff);
+      strcat(id, xx);
+    }
+    wprintw(ctx->history, "Your ID: %s\n", id);
+  }
+  else
+    wprintw(ctx->history, "Invalid command.\n");
 }
 
 static void chat_onDraw(ToxWindow* self) {
@@ -147,6 +219,21 @@ static void chat_onInit(ToxWindow* self) {
   ctx->linewin = subwin(self->window, 2, x, y - 3, 0);
 }
 
+void print_help(ChatContext* self) {
+  wattron(self->history, COLOR_PAIR(2) | A_BOLD);
+  wprintw(self->history, "\nCommands:\n");
+  wattroff(self->history, A_BOLD);
+  
+  wprintw(self->history, "      /status <message>          : Set your status\n");
+  wprintw(self->history, "      /nick <nickname>           : Set your nickname\n");
+  wprintw(self->history, "      /myid                      : Print your ID\n");
+  wprintw(self->history, "      /clear                     : Clear the screen\n");
+  wprintw(self->history, "      /quit or /exit             : Exit program\n");
+  wprintw(self->history, "      /help                      : Print this message again\n\n");
+
+  wattroff(self->history, COLOR_PAIR(2));
+}
+
 ToxWindow new_chat(int friendnum) {
   ToxWindow ret;
 
@@ -169,6 +256,6 @@ ToxWindow new_chat(int friendnum) {
   x->friendnum = friendnum;
 
   ret.x = (void*) x;
-
+  free(x);
   return ret;
 }
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index 3b45a89f..e0e23708 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -91,7 +91,7 @@ static void init_term() {
   cbreak();
   keypad(stdscr, 1);
   noecho();
-  timeout(2000);
+  timeout(100);
 
   if(has_colors()) {
     start_color();
@@ -255,15 +255,15 @@ static void draw_bar() {
       attron(A_BOLD);
     }
 
-    odd = (odd+1) % 2;
+    odd = (odd+1) % 10;
 
-    if(windows[i].blink && odd) {
+    if(windows[i].blink && (odd < 5)) {
       attron(COLOR_PAIR(3));
     }
 
     printw(" %s", windows[i].title);
 
-    if(windows[i].blink && odd) {
+    if(windows[i].blink && (odd < 5)) {
       attron(COLOR_PAIR(3));
     }
 
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c
index 1db60883..463b9352 100644
--- a/testing/toxic/prompt.c
+++ b/testing/toxic/prompt.c
@@ -89,7 +89,9 @@ static void execute(ToxWindow* self, char* cmd) {
     }
 
     dht.ip.i = resolved_address;
-    DHT_bootstrap(dht, hex_string_to_bin(key));
+    unsigned char *binary_string = hex_string_to_bin(key);
+    DHT_bootstrap(dht, binary_string);
+    free(binary_string); 
   }
   else if(!strncmp(cmd, "add ", strlen("add "))) {
     uint8_t id_bin[32];
@@ -148,7 +150,7 @@ static void execute(ToxWindow* self, char* cmd) {
       wprintw(self->window, "Friend request already sent.\n");
       break;
     case -5:
-      wprintw(self->window, "[i] Undefined error when adding friend.\n");
+      wprintw(self->window, "Undefined error when adding friend.\n");
       break; 
     default:
       wprintw(self->window, "Friend added as %d.\n", num);
@@ -178,12 +180,13 @@ static void execute(ToxWindow* self, char* cmd) {
 
     nick = strchr(cmd, ' ');
     if(nick == NULL) {
+      wprintw(self->window, "Invalid syntax.\n");
       return;
     }
     nick++;
 
     setname((uint8_t*) nick, strlen(nick)+1);
-    wprintw(self->window, "Nickname set to: %s.\n", nick);
+    wprintw(self->window, "Nickname set to: %s\n", nick);
   }
   else if(!strcmp(cmd, "myid")) {
     char id[32*2 + 1] = {0};
@@ -195,7 +198,7 @@ static void execute(ToxWindow* self, char* cmd) {
       strcat(id, xx);
     }
     
-    wprintw(self->window, "%s\n", id);
+    wprintw(self->window, "Your ID: %s\n", id);
   }
   else if(!strncmp(cmd, "accept ", strlen("accept "))) {
     char* id;
@@ -251,20 +254,18 @@ static void execute(ToxWindow* self, char* cmd) {
       wprintw(self->window, "Message successfully sent.\n");
     }
   }
+
   else {
-    wprintw(self->window, "Invalid syntax.\n");
+    wprintw(self->window, "Invalid command.\n");
   }
 }
 
 static void prompt_onKey(ToxWindow* self, int key) {
-
   // PRINTABLE characters: Add to line.
   if(isprint(key)) {
-
     if(prompt_buf_pos == (sizeof(prompt_buf) - 1)) {
       return;
     }
-
     prompt_buf[prompt_buf_pos++] = key;
     prompt_buf[prompt_buf_pos] = 0;
   }
@@ -273,14 +274,12 @@ static void prompt_onKey(ToxWindow* self, int key) {
   else if(key == '\n') {
     wprintw(self->window, "\n");
     execute(self, prompt_buf);
-
     prompt_buf_pos = 0;
     prompt_buf[0] = 0;
   }
 
   // BACKSPACE key: Remove one character from line.
   else if(key == 0x107 || key == 0x8 || key == 0x7f) {
-
     if(prompt_buf_pos != 0) {
       prompt_buf[--prompt_buf_pos] = 0;
     }