22 files changed, 595 insertions, 82 deletions

diff --git a/.gitignore b/.gitignore
index 010561a2..9969b38d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,11 @@ install_manifest.txt
 
 testing/data
 *~
+
+# Object files
+*.o
+
+# Executables
+*.exe
+*.out
+*.app
diff --git a/.travis.yml b/.travis.yml
index 9de4e282..8e71c327 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,12 +11,17 @@ before_script:
   - ./autogen.sh
   - ./configure && make check -j3
   - sudo make install
-  - sudo ldconfig
   - cd ..
 # installing libconfig, needed for DHT_bootstrap_daemon
-  - sudo sed -i 's/precise/quantal/' /etc/apt/sources.list # needed for libconfig-dev
-  - sudo apt-get update -qq
-  - yes | sudo apt-get install libconfig-dev
+  - wget http://www.hyperrealm.com/libconfig/libconfig-1.4.9.tar.gz
+  - tar -xvzf libconfig-1.4.9.tar.gz
+  - cd libconfig-1.4.9
+  - ./configure && make -j3
+  - sudo make install
+  - cd ..
+# creating librarys' links and updating cache
+  - sudo ldconfig
+
 
 script:
   - mkdir build && cd build
diff --git a/INSTALL.md b/INSTALL.md
index 3459a5c7..9efa7ee9 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -42,7 +42,17 @@ make
 
 ###OSX:
 
-Much the same as above, remember to install the latest XCode and the developer tools (Preferences -> Downloads -> Command Line Tools).
+####Homebrew:
+```
+brew install libtool automake autoconf libconfig libsodium
+cmake .
+make
+sudo make install
+```
+
+####Non-homebrew:
+
+Much the same as Linux, remember to install the latest XCode and the developer tools (Preferences -> Downloads -> Command Line Tools).
 Users running Mountain Lion and the latest version of XCode (4.6.3) will also need to install libtool, automake and autoconf.
 They are easy enough to install, grab them from http://www.gnu.org/software/libtool/, http://www.gnu.org/software/autoconf/ and http://www.gnu.org/software/automake/, then follow these steps for each:
 
diff --git a/README.md b/README.md
index 8f903bc0..19bbb759 100644
--- a/README.md
+++ b/README.md
@@ -6,27 +6,28 @@ With the rise of governmental monitoring programs, Tox aims to be an easy to use
 
 
 
-**IRC**: #tox on Freenode, alternatively, you can use the [webchat](http://webchat.freenode.net/?channels=#tox).<br />
+**IRC**: #tox on freenode, alternatively, you can use the [webchat](http://webchat.freenode.net/?channels=#tox).<br />
 **Website**: [http://tox.im](http://tox.im)
 
 **Website translations**: [see stal888's repository](https://github.com/stal888/ProjectTox-Website)<br/>
 **Qt GUI**: [see nurupo's repository](https://github.com/nurupo/ProjectTox-Qt-GUI)
 
-
+**How to build Tox on Linux**: [YouTube video](http://www.youtube.com/watch?v=M4WXE4VKmyg)<br />
+**How to use Tox on Windows**: [YouTube video](http://www.youtube.com/watch?v=qg_j_sDb6WQ)
 
 ## The Complex Stuff:
 + Tox must use UDP simply because you can't hole punch with TCP. It's possible, but it doesn't work all the time.
 + Every peer is represented as a byte string (the public key of the peer [client id])
 + We're using torrent-style DHT so that peers can find the IP of the other peers when they have their ID.
 + Once the client has the IP of that peer, they start initiating a secure connection with each other. (See [Crypto](https://github.com/irungentoo/ProjectTox-Core/wiki/Crypto))
-+ When both peers are securely connect with the encryption, they can securely exchange messages, initiate a video chat, send files, etc.<br />
++ When both peers are securely connected, they can exchange messages, initiate a video chat, send files, etc, all using encrypted communications.<br />
 + Current build status: [![Build Status](https://travis-ci.org/irungentoo/ProjectTox-Core.png?branch=master)](https://travis-ci.org/irungentoo/ProjectTox-Core) 
 
 ## Roadmap:
 - [x] Get our DHT working perfectly.(Done, needs large scale testing though.)
 - [x] Reliable connection (See Lossless_UDP protocol) to other peers according to client id. (Done, see DHT_sendfiletest.c for an example)
 - [x] Encryption. (Done)
-- [ ] Get a simple text only im client working perfectly. (This is where we are)
+- [ ] Get a simple text only IM client working perfectly. (This is where we are)
 - [ ] Streaming media
 - [ ] ???
 
diff --git a/core/Lossless_UDP.c b/core/Lossless_UDP.c
index eb1314d1..6be8328f 100644
--- a/core/Lossless_UDP.c
+++ b/core/Lossless_UDP.c
@@ -308,12 +308,16 @@ IP_Port connection_ip(int connection_id)
 /* returns the number of packets in the queue waiting to be successfully sent. */
 uint32_t sendqueue(int connection_id)
 {
+    if (connection_id < 0 || connection_id >= MAX_CONNECTIONS)
+        return 0;
     return connections[connection_id].sendbuff_packetnum - connections[connection_id].successful_sent;
 }
 
 /* returns the number of packets in the queue waiting to be successfully read with read_packet(...) */
 uint32_t recvqueue(int connection_id)
 {
+    if (connection_id < 0 || connection_id >= MAX_CONNECTIONS)
+        return 0;
     return connections[connection_id].recv_packetnum - connections[connection_id].successful_read;
 }
 
@@ -321,6 +325,8 @@ uint32_t recvqueue(int connection_id)
    return -1 if no packet in queue */
 char id_packet(int connection_id)
 {
+    if (connection_id < 0 || connection_id >= MAX_CONNECTIONS)
+        return -1;
     if (recvqueue(connection_id) != 0 && connections[connection_id].status != 0)
         return connections[connection_id].recvbuffer[connections[connection_id].successful_read % MAX_QUEUE_NUM].data[0];
     return -1;
diff --git a/core/Messenger.c b/core/Messenger.c
index 4c76dd30..872d7407 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -99,18 +99,21 @@ int getclient_id(int friend_id, uint8_t *client_id)
    client_id is the client id of the friend
    data is the data and length is the length
    returns the friend number if success
-   return -1 if failure. */
+   return -1 if key length is wrong.
+   return -2 if user's own key
+   return -3 if already a friend
+   return -4 for other*/
 int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length)
 {
     if (length == 0 || length >=
         (MAX_DATA_SIZE - crypto_box_PUBLICKEYBYTES - crypto_box_NONCEBYTES - crypto_box_BOXZEROBYTES + crypto_box_ZEROBYTES))
         return -1;
     if (memcmp(client_id, self_public_key, crypto_box_PUBLICKEYBYTES) == 0)
-        return -1;
+        return -2;
     if (getfriend_id(client_id) != -1)
-        return -1;
+        return -3;
     uint32_t i;
-    for (i = 0; i <= numfriends; ++i) {
+    for (i = 0; i <= numfriends; ++i) { /*TODO: dynamic memory allocation, this will segfault if there are more than MAX_NUM_FRIENDS*/
         if(friendlist[i].status == 0) {
             DHT_addfriend(client_id);
             friendlist[i].status = 1;
@@ -126,7 +129,7 @@ int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length)
             return i;
         }
     }
-    return -1;
+    return -4;
 }
 
 int m_addfriend_norequest(uint8_t * client_id)
@@ -134,7 +137,7 @@ int m_addfriend_norequest(uint8_t * client_id)
     if (getfriend_id(client_id) != -1)
         return -1;
     uint32_t i;
-    for (i = 0; i <= numfriends; ++i) {
+    for (i = 0; i <= numfriends; ++i) {/*TODO: dynamic memory allocation, this will segfault if there are more than MAX_NUM_FRIENDS*/
         if(friendlist[i].status == 0) {
             DHT_addfriend(client_id);
             friendlist[i].status = 2;
@@ -164,7 +167,7 @@ int m_delfriend(int friendnumber)
     memset(&friendlist[friendnumber], 0, sizeof(Friend));
     uint32_t i;
     for (i = numfriends; i != 0; --i) {
-        if (friendlist[i].status != 0)
+        if (friendlist[i-1].status != 0)
             break;
     }
     numfriends = i;
@@ -178,7 +181,7 @@ int m_delfriend(int friendnumber)
    return 0 if there is no friend with that number */
 int m_friendstatus(int friendnumber)
 {
-    if (friendnumber < 0 || friendnumber >= MAX_NUM_FRIENDS)
+    if (friendnumber < 0 || friendnumber >= numfriends)
         return 0;
     return friendlist[friendnumber].status;
 }
@@ -188,7 +191,7 @@ int m_friendstatus(int friendnumber)
    return 0 if it was not */
 int m_sendmessage(int friendnumber, uint8_t *message, uint32_t length)
 {
-    if (friendnumber < 0 || friendnumber >= MAX_NUM_FRIENDS)
+    if (friendnumber < 0 || friendnumber >= numfriends)
         return 0;
     if (length >= MAX_DATA_SIZE || friendlist[friendnumber].status != 4)
         /* this does not mean the maximum message length is MAX_DATA_SIZE - 1, it is actually 17 bytes less. */
@@ -240,6 +243,16 @@ int setname(uint8_t * name, uint16_t length)
     return 0;
 }
 
+/* get our nickname
+   put it in name 
+   name needs to be a valid memory location with a size of at least MAX_NAME_LENGTH bytes.
+   return the length of the name */
+uint16_t getself_name(uint8_t *name)
+{
+    memcpy(name, self_name, self_name_length);
+    return self_name_length;
+} 
+
 /* get name of friendnumber
    put it in name
    name needs to be a valid memory location with a size of at least MAX_NAME_LENGTH bytes.
diff --git a/core/Messenger.h b/core/Messenger.h
index 7263901c..9ce96fb4 100644
--- a/core/Messenger.h
+++ b/core/Messenger.h
@@ -46,11 +46,14 @@ extern "C" {
     to an absurdly large number later */
 
 /* add a friend
-    set the data that will be sent along with friend request
-    client_id is the client id of the friend
-    data is the data and length is the length
-    returns the friend number if success
-    return -1 if failure. */
+   set the data that will be sent along with friend request
+   client_id is the client id of the friend
+   data is the data and length is the length
+   returns the friend number if success
+   return -1 if key length is wrong.
+   return -2 if user's own key
+   return -3 if already a friend
+   return -4 for other*/
 int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length);
 
 
@@ -92,6 +95,11 @@ int m_sendmessage(int friendnumber, uint8_t *message, uint32_t length);
    return -1 if failure */
 int setname(uint8_t *name, uint16_t length);
 
+/* get our nickname
+   put it in name 
+   return the length of the name*/
+uint16_t getself_name(uint8_t *name);
+
 /* get name of friendnumber
     put it in name
     name needs to be a valid memory location with a size of at least MAX_NAME_LENGTH (128) bytes.
diff --git a/docs/commands.md b/docs/commands.md
new file mode 100644
index 00000000..8669bb9b
--- /dev/null
+++ b/docs/commands.md
@@ -0,0 +1,25 @@
+# Tox User Commands
+Here's a list of commands that nTox accepts,
+which can all be used by starting your line with
+a */*. Currently there can be no spaces before this.
+
+* */f* [ID]
+    + Add a friend with ID [ID].
+* */d*
+    + Call doMessenger() which does...something?
+* */m* \[FRIEND\_NUM\] \[MESSAGE\]
+    + Message \[FRIEND\_NUM\] \[MESSAGE\].
+* */n* \[NAME\] 
+    + Change your username to \[NAME\].
+* */l* 
+    + Print your list of friends. (like you have any)
+* */s* \[STATUS\]
+    + Set your status to \[STATUS\].
+* */a* \[ID\]
+    + Accept friend request from \[ID\].
+* */i*
+    + Print useful info about your client.
+* */h*
+    + Print some help.
+* */q/*
+    + Quit Tox. (why ;_;)
diff --git a/docs/using_tox.md b/docs/using_tox.md
new file mode 100644
index 00000000..b4f4310d
--- /dev/null
+++ b/docs/using_tox.md
@@ -0,0 +1,38 @@
+# Using Tox
+1. Build Tox
+2. Fix errors
+3. Consult IRC for help
+4. Go on debugging journy for devs
+5. Build Tox for real
+6. ???
+
+For all the work we've put into Tox so far,
+there isn't yet a decent guide for how you _use_
+Tox. Here's a user-friendly attempt at it.
+
+1. Connect to the network!
+    + You need to connect to a bootstrapping server, to give you a public key.
+    + Where can I find a public server? Right here, as of now:
+      (the help message from running nTox with no args will help)
+        + 198.46.136.167 33445 728925473812C7AAC482BE7250BCCAD0B8CB9F737BF3D42ABD34459C1768F854
+        + 192.81.133.111 33445 8CD5A9BF0A6CE358BA36F7A653F99FA6B258FF756E490F52C1F98CC420F78858
+        + 66.175.223.88 33445  AC4112C975240CAD260BB2FCD134266521FAAF0A5D159C5FD3201196191E4F5D
+        + 192.184.81.118 33445 5CD7EB176C19A2FD840406CD56177BB8E75587BB366F7BB3004B19E3EDC04143
+2. Find a friend!
+    + Now that you're on the network, you need a friend. To get one of those,
+       you need to to send or receive a request. What's a request, you ask?
+       It's like a friend request, but we use really scary and cryptic numbers
+       instead of names. When nTox starts, it shows your _your_ long, scary number,
+       called your *public key*. Give that to people, and they can add you as
+       as "friend". Or, you can add someone else, with the */f* command, if you like.
+3. Chat it up!
+    + Now use the */m* command to send a message to someone. Wow, you're chatting!
+4. But something broke!
+    + Yeah, pre-alpha-alpha software tends to do that. We're working on it.
+    + Please report all crashes to either the github page, or #tox-dev on freenode.
+5. Nothing broke, but what does */f* mean?
+    + nTox parses text as a command if the first character is a forward-slash ('/').
+      You can check all commands in commands.md.
+6. Use and support Tox!
+    + Code for us, debug for us, document for us, translate for us, even just talk about us!
+    + The more interest we get, the more work gets done, the better Tox is.
diff --git a/other/bootstrap_serverdaemon/CMakeLists.txt b/other/bootstrap_serverdaemon/CMakeLists.txt
index a9cfdff7..512179f3 100644
--- a/other/bootstrap_serverdaemon/CMakeLists.txt
+++ b/other/bootstrap_serverdaemon/CMakeLists.txt
@@ -14,3 +14,6 @@ target_link_libraries(${exe_name}
         ${LIBCONFIG_LIBRARY})
 
 linkCoreLibraries(${exe_name})
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
+find_package(LibConfig REQUIRED)
diff --git a/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c b/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
index 8e278b28..4f28fb3c 100644
--- a/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
+++ b/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
@@ -123,11 +123,12 @@ void manage_keys(char *keys_file)
 {
     const uint32_t KEYS_SIZE = crypto_box_PUBLICKEYBYTES + crypto_box_SECRETKEYBYTES;
     uint8_t keys[KEYS_SIZE];
-
-    /* TODO: stat the file before trying to open it. We aren't cave people! */
-    FILE *keysf = fopen(keys_file, "r");
-    if (keysf != NULL) {
-        /* if file was opened successfully -- load keys */
+    struct stat existence;
+    FILE *keysf;
+    
+    /* Check if file exits, proceed to open and load keys */
+    if(stat(keys_file,&existence) >= 0) {
+        keysf = fopen(keys_file, "r");
         size_t read_size = fread(keys, sizeof(uint8_t), KEYS_SIZE, keysf);
         if (read_size != KEYS_SIZE) {
             printf("Error while reading the key file\nExiting.\n");
diff --git a/other/bootstrap_serverdaemon/cmake/Modules/FindLibConfig.cmake b/other/bootstrap_serverdaemon/cmake/Modules/FindLibConfig.cmake
new file mode 100644
index 00000000..7d6270e6
--- /dev/null
+++ b/other/bootstrap_serverdaemon/cmake/Modules/FindLibConfig.cmake
@@ -0,0 +1,73 @@
+#Ref: https://github.com/schnorr/pajeng/blob/master/cmake/FindLibConfig.cmake
+#
+# This module defines
+# LIBCONFIG_INCLUDE_DIR, where to find cppunit include files, etc.
+# LIBCONFIG_LIBRARIES, the libraries to link against to use CppUnit.
+# LIBCONFIG_STATIC_LIBRARIY_PATH
+# LIBCONFIG_FOUND, If false, do not try to use CppUnit.
+
+# also defined, but not for general use are
+# LIBCONFIG_LIBRARY, where to find the CUnit library.
+
+#MESSAGE("Searching for libconfig library")
+
+FIND_PATH(LIBCONFIG_INCLUDE_DIR libconfig.h
+  /usr/local/include
+  /usr/include
+)
+
+FIND_PATH(LIBCONFIGPP_INCLUDE_DIR libconfig.h++
+  /usr/local/include
+  /usr/include
+)
+
+FIND_LIBRARY(LIBCONFIG_LIBRARY config
+  /usr/local/lib
+  /usr/lib
+)
+
+FIND_LIBRARY(LIBCONFIGPP_LIBRARY config++
+  /usr/local/lib
+  /usr/lib
+)
+
+FIND_LIBRARY(LIBCONFIG_STATIC_LIBRARY "libconfig${CMAKE_STATIC_LIBRARY_SUFFIX}"
+  /usr/local/lib
+  /usr/lib
+)
+
+FIND_LIBRARY(LIBCONFIGPP_STATIC_LIBRARY "libconfig++${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    /usr/local/lib
+    /usr/lib
+)
+
+
+IF(LIBCONFIG_INCLUDE_DIR)
+  IF(LIBCONFIG_LIBRARY)
+    SET(LIBCONFIG_FOUND TRUE)
+    SET(LIBCONFIG_LIBRARIES ${LIBCONFIG_LIBRARY})
+    SET(LIBCONFIG_STATIC_LIBRARY_PATH ${LIBCONFIG_STATIC_LIBRARY})
+  ENDIF(LIBCONFIG_LIBRARY)
+ENDIF(LIBCONFIG_INCLUDE_DIR)
+
+IF(LIBCONFIGPP_INCLUDE_DIR)
+  IF(LIBCONFIGPP_LIBRARY)
+    SET(LIBCONFIGPP_FOUND TRUE)
+    SET(LIBCONFIGPP_LIBRARIES ${LIBCONFIGPP_LIBRARY})
+    SET(LIBCONFIGPP_STATIC_LIBRARY_PATH ${LIBCONFIGPP_STATIC_LIBRARY})
+  ENDIF(LIBCONFIGPP_LIBRARY)
+ENDIF(LIBCONFIGPP_INCLUDE_DIR)
+
+IF (LIBCONFIG_FOUND)
+   IF (NOT LibConfig_FIND_QUIETLY)
+      MESSAGE(STATUS "Found LibConfig++: ${LIBCONFIGPP_LIBRARIES}" )
+      MESSAGE(STATUS "Found LibConfig: ${LIBCONFIG_LIBRARIES}")
+      MESSAGE(STATUS "static LibConfig path: ${LIBCONFIG_STATIC_LIBRARY_PATH}")
+   ENDIF (NOT LibConfig_FIND_QUIETLY)
+ELSE (LIBCONFIG_FOUND)
+   IF (LibConfig_FIND_REQUIRED)
+      MESSAGE(SEND_ERROR "Could NOT find LibConfig")
+   ENDIF (LibConfig_FIND_REQUIRED)
+ENDIF (LIBCONFIG_FOUND)
+
+MARK_AS_ADVANCED(LIBCONFIG_INCLUDE_DIR LIBCONFIG_LIBRARIES)
diff --git a/other/bootstrap_serverdaemon/server.cfg b/other/bootstrap_serverdaemon/server.cfg
index 8ef516ca..527c2a72 100644
--- a/other/bootstrap_serverdaemon/server.cfg
+++ b/other/bootstrap_serverdaemon/server.cfg
@@ -6,11 +6,15 @@ port = 33445;
 // The key file
 // make sure that the user who runs the server
 // does have permissions to read it/write to it
+// Remember to replace the provided example with
+// the directory the DHT server will run in.
 keys_file = "/home/tom/.bootstrap_server.keys"
 
 // The PID file written to by bootstrap_server,
 // make sure that the user who runs the server
 // does have permissions to write to it
+// Remember to replace the provided example with
+// the directory the DHT server will run in.
 pid_file = "/home/tom/.bootstrap_server.pid";
 
 // The info of the node bootstap_server will
diff --git a/start_guide.de.md b/start_guide.de.md
new file mode 100644
index 00000000..7dfd52ca
--- /dev/null
+++ b/start_guide.de.md
@@ -0,0 +1,40 @@
+# Tox nutzen
+1. Tox erstellen
+2. Fehler korrigieren
+3. Im IRC nach Hilfe fragen
+4. Auf Debug-Reise für Entwickler
+5. Tox wirklich erstellen
+6. ???
+ 
+Trotz der ganzen Arbeit, die wir bisher in Tox
+gesteckt haben, gibt es noch keine richtige
+Anleitung, wie man Tox _benutzt_.
+Dies ist ein anwenderfreundlicher Versuch.
+
+1. Verbinde dich zum Netzwerk!
+    + Du musst dich zu einem Bootstrap-Server verbinden, um einen öffentlichen Schlüssel zu erhalten.
+    + Wo finde ich einen öffentlichen Server? Zur Zeit hier:
+      (die Hilfe-Nachricht von nTox ohne Kommandos hilft auch)
+        + 198.46.136.167 33445 728925473812C7AAC482BE7250BCCAD0B8CB9F737BF3D42ABD34459C1768F854
+        + 192.81.133.111 33445 8CD5A9BF0A6CE358BA36F7A653F99FA6B258FF756E490F52C1F98CC420F78858
+        + 66.175.223.88 33445  AC4112C975240CAD260BB2FCD134266521FAAF0A5D159C5FD3201196191E4F5D
+        + 192.184.81.118 33445 5CD7EB176C19A2FD840406CD56177BB8E75587BB366F7BB3004B19E3EDC04143
+2. Finde einen Freund!
+    + Jetzt, da du im Netzwerk bist, brauchst du einen Freund. Um einen zu bekommen,
+      musst du eine Anfrage senden oder erhalten. Was eine Anfrage ist?
+      Es ist wie eine Freundschaftsanfrage, jedoch benutzen wir unglaublich schaurige
+      und kryptische Nummern anstatt Namen. When nTox startet, erscheint _deine_ lange,
+      schaurige Nummer, auch *öffentlicher Schlüssel* genannt. Diesen kannst du an
+      andere Personen weitergeben und sie können dich als "Freund" hinzufügen. Oder du
+      fügst andere Personen mit dem */f*-Befehl hinzu, wenn du möchtest.
+3. Chatte drauf los!
+    + Benutze nun den */m*-Befehl, um eine Nachricht an jemanden zu senden. Wow, du chattest!
+4. Mach etwas kaputt!
+    + Jep, pre-alpha-alpha-Software stürzt manchmal ab. Wir arbeiten daran.
+    + Bitte melde alle Abstürze entweder an die GitHub-Seite oder #tox-dev im freenode-IRC.
+5. Nichts ist kaputt, aber was bedeutet */f*?
+    + nTox liest einen Text als Befehl, wenn das erste Zeichen ein Schrägstrich ist ('/').
+      Du kannst alle Befehle in commands.md nachlesen.
+6. Benutze und unterstütze Tox!
+    + Programmiere, debugge, dokumentiere, übersetze für uns, oder sprich einfach über uns!
+    + Je mehr Interesse wir erhalten, desto mehr Arbeit wird getan und desto besser wird Tox.
diff --git a/start_guide.md b/start_guide.md
new file mode 100644
index 00000000..b4f4310d
--- /dev/null
+++ b/start_guide.md
@@ -0,0 +1,38 @@
+# Using Tox
+1. Build Tox
+2. Fix errors
+3. Consult IRC for help
+4. Go on debugging journy for devs
+5. Build Tox for real
+6. ???
+
+For all the work we've put into Tox so far,
+there isn't yet a decent guide for how you _use_
+Tox. Here's a user-friendly attempt at it.
+
+1. Connect to the network!
+    + You need to connect to a bootstrapping server, to give you a public key.
+    + Where can I find a public server? Right here, as of now:
+      (the help message from running nTox with no args will help)
+        + 198.46.136.167 33445 728925473812C7AAC482BE7250BCCAD0B8CB9F737BF3D42ABD34459C1768F854
+        + 192.81.133.111 33445 8CD5A9BF0A6CE358BA36F7A653F99FA6B258FF756E490F52C1F98CC420F78858
+        + 66.175.223.88 33445  AC4112C975240CAD260BB2FCD134266521FAAF0A5D159C5FD3201196191E4F5D
+        + 192.184.81.118 33445 5CD7EB176C19A2FD840406CD56177BB8E75587BB366F7BB3004B19E3EDC04143
+2. Find a friend!
+    + Now that you're on the network, you need a friend. To get one of those,
+       you need to to send or receive a request. What's a request, you ask?
+       It's like a friend request, but we use really scary and cryptic numbers
+       instead of names. When nTox starts, it shows your _your_ long, scary number,
+       called your *public key*. Give that to people, and they can add you as
+       as "friend". Or, you can add someone else, with the */f* command, if you like.
+3. Chat it up!
+    + Now use the */m* command to send a message to someone. Wow, you're chatting!
+4. But something broke!
+    + Yeah, pre-alpha-alpha software tends to do that. We're working on it.
+    + Please report all crashes to either the github page, or #tox-dev on freenode.
+5. Nothing broke, but what does */f* mean?
+    + nTox parses text as a command if the first character is a forward-slash ('/').
+      You can check all commands in commands.md.
+6. Use and support Tox!
+    + Code for us, debug for us, document for us, translate for us, even just talk about us!
+    + The more interest we get, the more work gets done, the better Tox is.
diff --git a/testing/DHT_cryptosendfiletest.c b/testing/DHT_cryptosendfiletest.c
index c7c33531..888dac0f 100644
--- a/testing/DHT_cryptosendfiletest.c
+++ b/testing/DHT_cryptosendfiletest.c
@@ -186,7 +186,7 @@ int main(int argc, char *argv[])
                     fclose(file2);
                 }
             }
-                        /* if buffer is empty and the connection timed out. */
+            /* if buffer is empty and the connection timed out. */
             else if(is_cryptoconnected(inconnection) == 4) {
                 crypto_kill(inconnection);
             }
@@ -209,7 +209,7 @@ int main(int argc, char *argv[])
                     fclose(file2);
                 }
             }
-                        /* if buffer is empty and the connection timed out. */
+            /* if buffer is empty and the connection timed out. */
             else if(is_cryptoconnected(connection) == 4) {
                 crypto_kill(connection);
             }
diff --git a/testing/nTox.c b/testing/nTox.c
index 97a39a12..6aef1d7b 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -35,6 +35,8 @@
 
 char lines[HISTORY][STRING_LENGTH];
 char line[STRING_LENGTH];
+char *help = "[i] commands: /f ID (to add friend), /m friendnumber message  (to send message), /s status (to change status)\n"
+             "[i] /l list (list friends), /h for help, /i for info, /n nick (to change nickname), /q (to quit)";
 int x,y;
 
 uint8_t pending_requests[256][CLIENT_ID_SIZE];
@@ -50,6 +52,7 @@ void new_lines(char *line)
     do_refresh();
 }
 
+
 void print_friendlist()
 {
     char name[MAX_NAME_LENGTH];
@@ -69,6 +72,26 @@ void print_friendlist()
     }
 }
 
+char *format_message(char *message, int friendnum)
+{
+    char name[MAX_NAME_LENGTH];
+    if(friendnum != -1) {
+        getname(friendnum, (uint8_t*)name);
+    } else {
+        getself_name((uint8_t*)name);
+    }
+    char *msg = malloc(100+strlen(message)+strlen(name)+1);
+    time_t rawtime;
+    struct tm * timeinfo;
+    time ( &rawtime );
+    timeinfo = localtime ( &rawtime );
+    char* time = asctime(timeinfo);
+    size_t len = strlen(time);
+    time[len-1]='\0';
+    sprintf(msg, "[%d] %s <%s> %s", friendnum, time, name, message); // timestamp
+    return msg;
+}
+
 void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
 {
     if (line[0] == '/') {
@@ -107,6 +130,8 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
             int num = atoi(numstring);
             if(m_sendmessage(num, (uint8_t*) message, sizeof(message)) != 1) {
                 new_lines("[i] could not send message");
+            } else {
+                new_lines(format_message(message, -1));
             }
         }
         else if (line[1] == 'n') {
@@ -153,10 +178,31 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
         }
         
        else if (line[1] == 'h') { //help
-           new_lines("[i] commands: /f ID (to add friend), /m friendnumber message  (to send message), /s status (to change status)");
-           new_lines("[i] /l list (list friends), /h for help, /n nick (to change nickname), /q (to quit)");
+           new_lines(help);
         }
-
+      
+       else if (line[1] == 'i') { //info
+           char idstring0[200];
+           char idstring1[32][5];
+           char idstring2[32][5];
+           uint32_t i;
+           for(i = 0; i < 32; i++)
+           {
+               if(self_public_key[i] < 16)
+                   strcpy(idstring1[i],"0");
+               else 
+                   strcpy(idstring1[i], "");
+               sprintf(idstring2[i], "%hhX",self_public_key[i]);
+           }
+           //
+           strcpy(idstring0,"[i] ID: ");
+           for (i=0; i<32; i++) {
+               strcat(idstring0,idstring1[i]);
+               strcat(idstring0,idstring2[i]);
+           }    
+                  new_lines(idstring0);
+       }
+  
         else if (line[1] == 'q') { //exit
             endwin();
             exit(EXIT_SUCCESS);
@@ -255,7 +301,7 @@ void print_message(int friendnumber, uint8_t * string, uint16_t length)
     size_t len = strlen(temp);
     temp[len-1]='\0';
     sprintf(msg, "[%d] %s <%s> %s", friendnumber, temp, name, string); // timestamp
-    new_lines(msg);
+    new_lines(format_message((char*)string, friendnumber));
 }
 
 void print_nickchange(int friendnumber, uint8_t *string, uint16_t length) {
@@ -344,8 +390,7 @@ int main(int argc, char *argv[])
     raw();
     getmaxyx(stdscr,y,x);
     new_lines(idstring0);
-    new_lines("[i] commands: /f ID (to add friend), /m friendnumber message  (to send message), /s status (to change status)");
-    new_lines("[i] /l list (list friends), /n nick (to change nickname), /q (to quit)");
+    new_lines(help);
     strcpy(line, "");
     IP_Port bootstrap_ip_port;
     bootstrap_ip_port.port = htons(atoi(argv[2]));
diff --git a/testing/nTox_win32.c b/testing/nTox_win32.c
index 3a9caaf5..a870c210 100644
--- a/testing/nTox_win32.c
+++ b/testing/nTox_win32.c
@@ -317,6 +317,7 @@ int main(int argc, char *argv[])
         }
 
         doMessenger();
+        Sleep(1);
     }
 
     return 0;
diff --git a/testing/toxic/CMakeLists.txt b/testing/toxic/CMakeLists.txt
index 4f9785d5..c70babb7 100644
--- a/testing/toxic/CMakeLists.txt
+++ b/testing/toxic/CMakeLists.txt
@@ -5,7 +5,8 @@ set(exe_name toxic)
 
 add_executable(${exe_name}
         main.c
-        prompt.c)
+        prompt.c
+        friendlist.c)
 
 target_link_libraries(${exe_name}
         curses)
diff --git a/testing/toxic/friendlist.c b/testing/toxic/friendlist.c
new file mode 100644
index 00000000..f8b8c840
--- /dev/null
+++ b/testing/toxic/friendlist.c
@@ -0,0 +1,125 @@
+/*
+ * Toxic -- Tox Curses Client
+ */
+
+#include <curses.h>
+#include <string.h>
+#include <stdint.h>
+#include <ctype.h>
+
+#include "../../core/Messenger.h"
+#include "../../core/network.h"
+
+#include "windows.h"
+
+#define MAX_FRIENDS_NUM 100
+
+typedef struct {
+  uint8_t name[MAX_NAME_LENGTH];
+  uint8_t status[MAX_USERSTATUS_LENGTH];
+  int     num;
+
+} friend_t;
+
+static friend_t friends[MAX_FRIENDS_NUM];
+static int num_friends = 0;
+
+
+void fix_name(uint8_t* name) {
+
+  // Remove all non alphanumeric characters.
+  uint8_t* p = name;
+  uint8_t* q = name;
+
+  while(*p != 0) {
+    if(isalnum(*p)) {
+      *q++ = *p;
+    }
+
+    p++;
+  }
+
+  *q = 0;
+}
+
+int friendlist_nickchange(int num, uint8_t* str, uint16_t len) {
+
+  if(len >= MAX_NAME_LENGTH || num >= num_friends)
+    return -1;
+
+  memcpy((char*) &friends[num].name, (char*) str, len);
+  friends[num].name[len] = 0;
+  fix_name(friends[num].name);
+
+  return 0;
+}
+
+int friendlist_statuschange(int num, uint8_t* str, uint16_t len) {
+
+  if(len >= MAX_USERSTATUS_LENGTH || num >= num_friends)
+    return -1;
+
+  memcpy((char*) &friends[num].status, (char*) str, len);
+  friends[num].status[len] = 0;
+  fix_name(friends[num].status);
+
+  return 0;
+}
+
+int friendlist_addfriend(int num) {
+
+  if(num_friends == MAX_FRIENDS_NUM)
+    return -1;
+
+  friends[num_friends].num = num;
+  getname(num, friends[num_friends].name);
+  strcpy((char*) friends[num_friends].name, "unknown");
+  strcpy((char*) friends[num_friends].status, "unknown");
+
+  num_friends++;
+  return 0;
+}
+
+static void friendlist_onKey(ToxWindow* self, int key) {
+
+}
+
+static void friendlist_onDraw(ToxWindow* self) {
+  size_t i;
+
+  wclear(self->window);
+
+  if(num_friends == 0) {
+    wprintw(self->window, "Empty. Add some friends! :-)\n");
+  }
+
+  wprintw(self->window, "\n");
+
+  for(i=0; i<num_friends; i++) {
+    wprintw(self->window, "[%d] ", friends[i].num);
+
+    attron(A_BOLD);
+    wprintw(self->window, "%s ", friends[i].name);
+    attroff(A_BOLD);
+
+    wprintw(self->window, "(%s)\n", friends[i].status);
+  }
+
+  wrefresh(self->window);
+}
+
+static void friendlist_onInit(ToxWindow* self) {
+
+}
+
+
+ToxWindow new_friendlist() {
+  ToxWindow ret;
+
+  ret.onKey = &friendlist_onKey;
+  ret.onDraw = &friendlist_onDraw;
+  ret.onInit = &friendlist_onInit;
+  strcpy(ret.title, "[friends]");
+
+  return ret;
+}
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index 0aad6777..e1d1ebd0 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -14,6 +14,12 @@
 #include "windows.h"
 
 extern ToxWindow new_prompt();
+extern ToxWindow new_friendlist();
+
+extern int friendlist_addfriend(int num);
+extern int friendlist_nickchange(int num, uint8_t* str, uint16_t len);
+extern int friendlist_statuschange(int num, uint8_t* str, uint16_t len);
+
 extern int add_req(uint8_t* public_key); // XXX
 
 #define TOXWINDOWS_MAX_NUM 32
@@ -35,11 +41,19 @@ void on_message(int friendnumber, uint8_t* string, uint16_t length) {
 }
 
 void on_nickchange(int friendnumber, uint8_t* string, uint16_t length) {
-  wprintw(prompt->window, "\n(nick) %d: %s!\n", friendnumber, string);
+  wprintw(prompt->window, "\n(nickchange) %d: %s!\n", friendnumber, string);
+
+  friendlist_nickchange(friendnumber, string, length);
 }
 
 void on_statuschange(int friendnumber, uint8_t* string, uint16_t length) {
-  wprintw(prompt->window, "\n(status) %d: %s!\n", friendnumber, string);
+  wprintw(prompt->window, "\n(statuschange) %d: %s!\n", friendnumber, string);
+
+  friendlist_statuschange(friendnumber, string, length);
+}
+
+void on_friendadded(int friendnumber) {
+  friendlist_addfriend(friendnumber);
 }
 // CALLBACKS END
 
@@ -95,7 +109,7 @@ static void init_windows() {
   w_num = 0;
   w_active = 0;
 
-  if(add_window(new_prompt()) == -1) {
+  if(add_window(new_prompt()) == -1 || add_window(new_friendlist()) == -1) {
     fprintf(stderr, "add_window() failed.\n");
 
     endwin();
@@ -134,14 +148,18 @@ static void load_data() {
 
     if(buf == NULL) {
       fprintf(stderr, "malloc() failed.\n");
+
       fclose(fd);
+      endwin();
       exit(1);
     }
 
     if(fread(buf, len, 1, fd) != 1){
       fprintf(stderr, "fread() failed.\n");
+
       free(buf);
       fclose(fd);
+      endwin();
       exit(1);
     }
 
@@ -153,6 +171,7 @@ static void load_data() {
 
     if(buf == NULL) {
       fprintf(stderr, "malloc() failed.\n");
+      endwin();
       exit(1);
     }
 
@@ -161,14 +180,18 @@ static void load_data() {
     fd = fopen("data", "w");
     if(fd == NULL) {
       fprintf(stderr, "fopen() failed.\n");
+
       free(buf);
+      endwin();
       exit(1);
     }
 
     if(fwrite(buf, len, 1, fd) != 1){
       fprintf(stderr, "fwrite() failed.\n");
+
       free(buf);
       fclose(fd);
+      endwin();
       exit(1);
     }
   }
@@ -186,12 +209,16 @@ static void draw_bar() {
 
   move(LINES - 1, 0);
 
+  attron(COLOR_PAIR(3) | A_BOLD);
+  printw(" TOXIC 1.0 |");
+  attroff(COLOR_PAIR(3) | A_BOLD);
+
   for(i=0; i<w_num; i++) {
     if(i == w_active) {
       attron(A_BOLD);
     }
 
-    printw(" %s ", windows[i].title);
+    printw(" %s", windows[i].title);
 
     if(i == w_active) {
       attroff(A_BOLD);
@@ -201,6 +228,11 @@ static void draw_bar() {
   refresh();
 }
 
+void prepare_window(WINDOW* w) {
+  mvwin(w, 0, 0);
+  wresize(w, LINES-2, COLS);
+}
+
 int main(int argc, char* argv[]) {
   int ch;
   ToxWindow* a;
@@ -211,14 +243,21 @@ int main(int argc, char* argv[]) {
   init_windows();
 
   while(true) {
+    // Update tox.
     do_tox();
 
+    // Draw.
     a = &windows[w_active];
+    prepare_window(a->window);
     a->onDraw(a);
     draw_bar();
 
+    // Handle input.
     ch = getch();
-    if(ch != ERR) {
+    if(ch == '\t') {
+      w_active = (w_active + 1) % w_num;
+    }
+    else if(ch != ERR) {
       a->onKey(a, ch);
     }
 
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c
index 4a59cc7b..0cd10730 100644
--- a/testing/toxic/prompt.c
+++ b/testing/toxic/prompt.c
@@ -15,6 +15,8 @@
 uint8_t pending_requests[256][CLIENT_ID_SIZE]; // XXX
 uint8_t num_requests=0; // XXX
 
+extern void on_friendadded(int friendnumber);
+
 // XXX:
 int add_req(uint8_t* public_key) {
   memcpy(pending_requests[num_requests], public_key, CLIENT_ID_SIZE);
@@ -40,7 +42,6 @@ static int prompt_buf_pos=0;
 
 static void execute(ToxWindow* self, char* cmd) {
 
-  // quit/exit: Exit program.
   if(!strcmp(cmd, "quit") || !strcmp(cmd, "exit")) {
     endwin();
     exit(0);
@@ -53,33 +54,32 @@ static void execute(ToxWindow* self, char* cmd) {
 
     ip = strchr(cmd, ' ');
     if(ip == NULL) {
+      wprintw(self->window, "Invalid syntax.\n");
       return;
     }
-
     ip++;
 
     port = strchr(ip, ' ');
     if(port == NULL) {
+      wprintw(self->window, "Invalid syntax.\n");
       return;
     }
-
     port[0] = 0;
     port++;
 
     key = strchr(port, ' ');
     if(key == NULL) {
+      wprintw(self->window, "Invalid syntax.\n");
       return;
     }
-
     key[0] = 0;
     key++;
 
     if(atoi(port) == 0) {
+      wprintw(self->window, "Invalid syntax.\n");
       return;
     }
 
-    wprintw(self->window, "ip=%s, port=%s, key=%s\n", ip, port, key);
-
     dht.port = htons(atoi(port));
 
     int resolved_address = resolve_addr(ip);
@@ -91,38 +91,62 @@ static void execute(ToxWindow* self, char* cmd) {
     DHT_bootstrap(dht, hex_string_to_bin(key));
   }
   else if(!strncmp(cmd, "add ", strlen("add "))) {
+    uint8_t id_bin[32];
+    size_t i;
+    char xx[3];
+    uint32_t x;
+
     char* id;
     char* msg;
     int num;
 
     id = strchr(cmd, ' ');
-
     if(id == NULL) {
+      wprintw(self->window, "Invalid syntax.\n");
       return;
     }
-
     id++;
 
     msg = strchr(id, ' ');
-    if(msg == NULL) {
+    if(msg != NULL) {
+      msg[0] = 0;
+      msg++;
+    }
+    else msg = "";
+
+    if(strlen(id) != 2*32) {
+      wprintw(self->window, "Invalid ID length.\n");
       return;
     }
 
-    msg[0] = 0;
-    msg++;
+    for(i=0; i<32; i++) {
+      xx[0] = id[2*i];
+      xx[1] = id[2*i+1];
+      xx[2] = '\0';
+
+      if(sscanf(xx, "%02x", &x) != 1) {
+        wprintw(self->window, "Invalid ID.\n");
+        return;
+      }
+
+      id_bin[i] = x;
+    }
+
+    num = m_addfriend(id_bin, (uint8_t*) msg, strlen(msg)+1);
 
-    num = m_addfriend((uint8_t*) id, (uint8_t*) msg, strlen(msg)+1);
     wprintw(self->window, "Friend added as %d.\n", num);
+    on_friendadded(num);
   }
   else if(!strncmp(cmd, "status ", strlen("status "))) {
     char* msg;
 
     msg = strchr(cmd, ' ');
     if(msg == NULL) {
+      wprintw(self->window, "Invalid syntax.\n");
       return;
     }
-
     msg++;
+
     m_set_userstatus((uint8_t*) msg, strlen(msg)+1);
     wprintw(self->window, "Status set to: %s.\n", msg);
   }
@@ -133,33 +157,22 @@ static void execute(ToxWindow* self, char* cmd) {
     if(nick == NULL) {
       return;
     }
-
     nick++;
+
     setname((uint8_t*) nick, strlen(nick)+1);
     wprintw(self->window, "Nickname set to: %s.\n", nick);
   }
   else if(!strcmp(cmd, "myid")) {
-    // XXX: Clean this up
-    char idstring0[200];
-    char idstring1[32][5];
-    char idstring2[32][5];
-    uint32_t i;
-
-    for(i = 0; i < 32; i++) {
-      if(self_public_key[i] < 16)
-        strcpy(idstring1[i], "0");
-      else 
-        strcpy(idstring1[i], "");
-
-      sprintf(idstring2[i], "%hhX", self_public_key[i]);
+    char id[32*2 + 1] = {0};
+    size_t i;
+
+    for(i=0; i<32; i++) {
+      char xx[3];
+      snprintf(xx, sizeof(xx), "%02x",  self_public_key[i] & 0xff);
+      strcat(id, xx);
     }
     
-    for (i=0; i<32; i++) {
-      strcat(idstring0, idstring1[i]);
-      strcat(idstring0, idstring2[i]);
-    }
-
-    wprintw(self->window, "%s\n", idstring0);
+    wprintw(self->window, "%s\n", id);
   }
   else if(!strncmp(cmd, "accept ", strlen("accept "))) {
     char* id;
@@ -167,17 +180,26 @@ static void execute(ToxWindow* self, char* cmd) {
 
     id = strchr(cmd, ' ');
     if(id == NULL) {
+      wprintw(self->window, "Invalid syntax.\n");
       return;
     }
     id++;
-   
+
     num = atoi(id);
     if(num >= num_requests) {
+      wprintw(self->window, "Invalid syntax.\n");
       return;
     }
 
     num = m_addfriend_norequest(pending_requests[num]);
-    wprintw(self->window, "Friend accepted as: %d.\n", num);
+
+    if(num == -1) {
+      wprintw(self->window, "Failed to add friend.\n");
+    }
+    else {
+      wprintw(self->window, "Friend accepted as: %d.\n", num);
+      on_friendadded(num);
+    }
   }
   else if(!strncmp(cmd, "msg ", strlen("msg "))) {
     char* id;
@@ -186,16 +208,16 @@ static void execute(ToxWindow* self, char* cmd) {
     id = strchr(cmd, ' ');
 
     if(id == NULL) {
+      wprintw(self->window, "Invalid syntax.\n");
       return;
     }
-
     id++;
 
     msg = strchr(id, ' ');
     if(msg == NULL) {
+      wprintw(self->window, "Invalid syntax.\n");
       return;
     }
-
     msg[0] = 0;
     msg++;
 
@@ -206,6 +228,9 @@ static void execute(ToxWindow* self, char* cmd) {
       wprintw(self->window, "Message successfully sent.\n");
     }
   }
+  else {
+    wprintw(self->window, "Invalid syntax.\n");
+  }
 }
 
 static void prompt_onKey(ToxWindow* self, int key) {
@@ -242,9 +267,6 @@ static void prompt_onKey(ToxWindow* self, int key) {
 static void prompt_onDraw(ToxWindow* self) {
   int x, y;
 
-  mvwin(self->window,0,0);
-  wresize(self->window, LINES-2, COLS);
-
   getyx(self->window, y, x);
   (void) x;
 
@@ -265,11 +287,18 @@ static void print_usage(ToxWindow* self) {
   
   wprintw(self->window, "      connect <ip> <port> <key> : Connect to DHT server\n");
   wprintw(self->window, "      add <id> <message>        : Add friend\n");
+  wprintw(self->window, "      msg <number> <message>    : Send message\n");
   wprintw(self->window, "      status <message>          : Set your status\n");
   wprintw(self->window, "      nick <nickname>           : Set your nickname\n");
   wprintw(self->window, "      accept <number>           : Accept friend request\n");
   wprintw(self->window, "      myid                      : Print your ID\n");
   wprintw(self->window, "      quit/exit                 : Exit program\n");
+
+
+  wattron(self->window, A_BOLD);
+  wprintw(self->window, "Use the TAB key to navigate through the tabs.\n");
+  wattroff(self->window, A_BOLD);
+
   wattroff(self->window, COLOR_PAIR(2));
 }