ffi-tox 0.1.0 → 0.1.1

data/ProjectTox-Core/core/friend_requests.h

@@ -48,4 +48,4 @@ int friendreq_handlepacket(uint8_t *packet, uint32_t length, IP_Port source);
 }
 #endif
 
-#endif
+#endif

data/ProjectTox-Core/core/net_crypto.c

@@ -65,14 +65,19 @@ int encrypt_data(uint8_t *public_key, uint8_t *secret_key, uint8_t *nonce,
 
     uint8_t temp_plain[MAX_DATA_SIZE + crypto_box_ZEROBYTES - crypto_box_BOXZEROBYTES] = {0};
     uint8_t temp_encrypted[MAX_DATA_SIZE + crypto_box_ZEROBYTES];
-    uint8_t zeroes[crypto_box_BOXZEROBYTES] = {0};
 
     memcpy(temp_plain + crypto_box_ZEROBYTES, plain, length); /* pad the message with 32 0 bytes. */
 
     crypto_box(temp_encrypted, temp_plain, length + crypto_box_ZEROBYTES, nonce, public_key, secret_key);
 
-    /* if encryption is successful the first crypto_box_BOXZEROBYTES of the message will be zero */
-    if (memcmp(temp_encrypted, zeroes, crypto_box_BOXZEROBYTES) != 0)
+    /* if encryption is successful the first crypto_box_BOXZEROBYTES of the message will be zero
+       apparently memcmp should not be used so we do this instead:*/
+    uint32_t i;
+    uint32_t check = 0;
+    for(i = 0; i < crypto_box_BOXZEROBYTES; ++i) {
+            check |= temp_encrypted[i] ^ 0;
+    }
+    if(check != 0)
         return -1;
 
     /* unpad the encrypted message */
@@ -92,7 +97,6 @@ int decrypt_data(uint8_t *public_key, uint8_t *secret_key, uint8_t *nonce,
 
     uint8_t temp_plain[MAX_DATA_SIZE - crypto_box_ZEROBYTES + crypto_box_BOXZEROBYTES];
     uint8_t temp_encrypted[MAX_DATA_SIZE + crypto_box_ZEROBYTES] = {0};
-    uint8_t zeroes[crypto_box_ZEROBYTES] = {0};
 
     memcpy(temp_encrypted + crypto_box_BOXZEROBYTES, encrypted, length); /* pad the message with 16 0 bytes. */
 
@@ -100,8 +104,14 @@ int decrypt_data(uint8_t *public_key, uint8_t *secret_key, uint8_t *nonce,
                         nonce, public_key, secret_key) == -1)
         return -1;
 
-    /* if decryption is successful the first crypto_box_ZEROBYTES of the message will be zero */
-    if (memcmp(temp_plain, zeroes, crypto_box_ZEROBYTES) != 0)
+    /* if decryption is successful the first crypto_box_ZEROBYTES of the message will be zero 
+       apparently memcmp should not be used so we do this instead:*/
+    uint32_t i;
+    uint32_t check = 0;
+    for(i = 0; i < crypto_box_ZEROBYTES; ++i) {
+            check |= temp_plain[i] ^ 0;
+    }
+    if(check != 0)
         return -1;
 
     /* unpad the plain message */
@@ -365,6 +375,7 @@ int crypto_kill(int crypt_connection_id)
     if (crypto_connections[crypt_connection_id].status != 0) {
         crypto_connections[crypt_connection_id].status = 0;
         kill_connection(crypto_connections[crypt_connection_id].number);
+        memset(&crypto_connections[crypt_connection_id], 0 ,sizeof(Crypto_Connection));
         crypto_connections[crypt_connection_id].number = ~0;
         return 0;
     }

data/ProjectTox-Core/core/network.c

@@ -164,25 +164,42 @@ void shutdown_networking()
     return;
 }
 
-/* resolves provided address to a binary data in network byte order
-  address is ASCII null terminated string
-  address should represent IPv4, IPv6 or a hostname
-  on success returns a data in network byte order that can be used to set IP.i or IP_Port.ip.i
-  on failure returns -1 */
-int resolve_addr(const char *address)
+/*
+  resolve_addr():
+    address should represent IPv4 or a hostname with A record
+
+    returns a data in network byte order that can be used to set IP.i or IP_Port.ip.i
+    returns 0 on failure
+
+    TODO: Fix ipv6 support
+*/
+uint32_t resolve_addr(const char *address)
 {
-    struct addrinfo hints;
+    struct addrinfo *server = NULL;
+    struct addrinfo  hints;
+    int              rc;
+    uint32_t         addr;
+
     memset(&hints, 0, sizeof(hints));
-    hints.ai_family = AF_UNSPEC; //support both IPv4 and IPv6
-    hints.ai_socktype = SOCK_DGRAM; //type of socket Tox uses
+    hints.ai_family   = AF_INET;    // IPv4 only right now.
+    hints.ai_socktype = SOCK_DGRAM; // type of socket Tox uses.
 
-    struct addrinfo *server = NULL;
+    rc = getaddrinfo(address, "echo", &hints, &server);
 
-    int success = getaddrinfo(address, "echo", &hints, &server);
-    if(success != 0)
-        return -1;
+    // Lookup failed.
+    if(rc != 0) {
+        return 0;
+    }
+
+    // IPv4 records only..
+    if(server->ai_family != AF_INET) {
+        freeaddrinfo(server);
+        return 0;
+    }
+    
+
+    addr = ((struct sockaddr_in*)server->ai_addr)->sin_addr.s_addr;
 
-    int resolved = ((struct sockaddr_in*)server->ai_addr)->sin_addr.s_addr;
     freeaddrinfo(server);
-    return resolved;
+    return addr;
 }

data/ProjectTox-Core/core/network.h

@@ -56,11 +56,7 @@
 /* we use libsodium by default */
 #include <sodium.h>
 #else
-
-/* TODO: Including stuff like this is bad. This needs fixing.
-   We keep support for the original NaCl for now. */
-#include "../nacl/build/Linux/include/amd64/crypto_box.h"
-
+#include <crypto_box.h>
 #endif
 
 #ifdef __cplusplus
@@ -120,12 +116,16 @@ int init_networking(IP ip, uint16_t port);
 /* function to cleanup networking stuff(doesn't do much right now) */
 void shutdown_networking();
 
-/* resolves provided address to a binary data in network byte order
-    address is ASCII null terminated string
-    address should represent IPv4, IPv6 or a hostname
-    on success returns a data in network byte order that can be used to set IP.i or IP_Port.ip.i
-    on failure returns -1 */
-int resolve_addr(const char *address);
+/*
+  resolve_addr():
+    address should represent IPv4 or a hostname with A record
+
+    returns a data in network byte order that can be used to set IP.i or IP_Port.ip.i
+    returns 0 on failure
+
+    TODO: Fix ipv6 support
+*/
+uint32_t resolve_addr(const char *address);
 
 #ifdef __cplusplus
 }

data/ProjectTox-Core/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 ;_;)

data/ProjectTox-Core/docs/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.

data/ProjectTox-Core/docs/start_guide.md

@@ -0,0 +1,38 @@
+# Using Tox
+1. [Build Tox](../INSTALL.md)
+2. Fix errors
+3. Consult IRC for help
+4. Go on debugging journey 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_ long, scary number,
+       called your *public key*. Give that to people, and they can add you as
+       a "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.

data/ProjectTox-Core/testing/CMakeLists.txt

@@ -9,10 +9,10 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testclient.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testserver.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Messenger_test.cmake)
 if(WIN32)
-    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox_win32.cmake)
+	include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox_win32.cmake)
 endif()
 
 if(NOT WIN32)
-    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake)
-    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/toxic.cmake)
+	include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake)
+	add_subdirectory(toxic)
 endif()

data/ProjectTox-Core/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);
             }

data/ProjectTox-Core/testing/DHT_test.c

@@ -87,7 +87,7 @@ void print_friendlist()
         for(i = 0; i < 4; i++) {
             printf("ClientID: ");
             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)
+                if(friends_list[k].client_list[i].client_id[j] < 16)
                     printf("0");
                 printf("%hhX", friends_list[k].client_list[i].client_id[j]);
             }

data/ProjectTox-Core/testing/Lossless_UDP_testclient.c

@@ -4,7 +4,7 @@
  * 
  * Best used in combination with Lossless_UDP_testserver
  * 
- * Compile with: gcc -O2 -Wall -o testclient ../core/network.c ../core/Lossless_UDP.c Lossless_UDP_testclient.c
+ * Compile with: gcc -O2 -Wall -lsodium -o testclient ../core/network.c ../core/Lossless_UDP.c Lossless_UDP_testclient.c
  * 
  * Command line arguments are the ip and port to connect and send the file to.
  * EX: ./testclient 127.0.0.1 33445 filename.txt
@@ -211,4 +211,4 @@ int main(int argc, char *argv[])
     }
         
     return 0;
-}
+}

data/ProjectTox-Core/testing/Lossless_UDP_testserver.c

@@ -4,7 +4,7 @@
  * 
  * Best used in combination with Lossless_UDP_testclient
  * 
- * Compile with: gcc -O2 -Wall -o testserver ../core/network.c ../core/Lossless_UDP.c Lossless_UDP_testserver.c
+ * Compile with: gcc -O2 -Wall -lsodium -o testserver ../core/network.c ../core/Lossless_UDP.c Lossless_UDP_testserver.c
  * 
  * Command line argument is the name of the file to save what we recieve to.
  * EX: ./testserver filename1.txt
@@ -198,4 +198,4 @@ int main(int argc, char *argv[])
     }
         
     return 0;
-}
+}

data/ProjectTox-Core/testing/misc_tools.h

@@ -26,4 +26,4 @@
 
 unsigned char * hex_string_to_bin(char hex_string[]);
  
-#endif // MISC_TOOLS_H
+#endif // MISC_TOOLS_H

data/ProjectTox-Core/testing/nTox.c

@@ -23,9 +23,9 @@
 #include "nTox.h"
 #include "misc_tools.h"
 
-
 #include <stdio.h>
 #include <time.h>
+
 #ifdef WIN32
 #define c_sleep(x) Sleep(1*x)
 #else
@@ -35,30 +35,33 @@
 
 char lines[HISTORY][STRING_LENGTH];
 char line[STRING_LENGTH];
-int x,y;
+
+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];
-uint8_t num_requests;
+uint8_t num_requests = 0;
 
 void new_lines(char *line)
 {
     int i;
     for (i = HISTORY-1; i > 0; i--) 
-        strcpy(lines[i],lines[i-1]);
+        strcpy(lines[i], lines[i-1]);
     
-    strcpy(lines[0],line);
+    strcpy(lines[0], line);
     do_refresh();
 }
 
+
 void print_friendlist()
 {
     char name[MAX_NAME_LENGTH];
-    uint32_t i;
-
     new_lines("[i] Friend List:");
-    for (i=0; i <= num_requests; i++) {
+    uint32_t i;
+    for (i = 0; i <= num_requests; i++) {
         char fstring[128];
-
         getname(i, (uint8_t*)name);
         if (strlen(name) <= 0) {
             sprintf(fstring, "[i] Friend: NULL\n\tid: %i", i);
@@ -69,89 +72,164 @@ 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] == '/') {
-        char command[STRING_LENGTH + 2] = "> ";
-        strcat(command, line);
-        new_lines(command);
-        if (line[1] == 'f') { // add friend command: /f ID
+        char inpt_command = line[1];
+        char prompt[STRING_LENGTH+2] = "> ";
+        int prompt_offset = 3;
+        strcat(prompt, line);
+        new_lines(prompt);
+        if (inpt_command == 'f') { // add friend command: /f ID
             int i;
             char temp_id[128];
-            for (i=0; i<128; i++) 
-                temp_id[i] = line[i+3];
+            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"));
             char numstring[100];
-            sprintf(numstring, "[i] added friend %d", num);
+            switch (num) {
+                case -1:
+                    sprintf(numstring, "[i] Incorrect key length");
+                    break;
+                case -2:
+                    sprintf(numstring, "[i] That appears to be your own key");
+                    break;
+                case -3:
+                    sprintf(numstring, "[i] Friend request already sent");
+                    break;
+                case -4:
+                    sprintf(numstring, "[i] Could not add friend");
+                    break;
+                default:
+                    sprintf(numstring, "[i] Added friend %d", num);
+                    break;
+            }
             new_lines(numstring);
             do_refresh();
         }
-        else if (line[1] == 'd') {
+        else if (inpt_command == 'd') {
             doMessenger();
         }
-        else if (line[1] == 'm') { //message command: /m friendnumber messsage
-            int i;
+        else if (inpt_command == 'm') { //message command: /m friendnumber messsage
             size_t len = strlen(line);
+	    if(len < 3)
+	      return;
+
             char numstring[len-3];
             char message[len-3];
-            for (i=0; i<len; i++) {
+            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++)
+                    for (j = (i+1); j < (len+1); j++)
                         message[j-i-1] = line[j+3];
                     break;
                 }
             }
             int num = atoi(numstring);
-            if(m_sendmessage(num, (uint8_t*) message, sizeof(message)) != 1) {
+            if (m_sendmessage(num, (uint8_t*) message, strlen(message) + 1) != 1) {
                 new_lines("[i] could not send message");
+            } else {
+                new_lines(format_message(message, -1));
             }
         }
-        else if (line[1] == 'n') {
+        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++) {
+            for (i = 3; i < len; i++) {
                 if (line[i] == 0 || line[i] == '\n') break;
-                name[i - 3] = line[i];
+                name[i-3] = line[i];
             }
-            name[i - 3] = 0;
-            setname(name, i);
+            name[i-3] = 0;
+            setname(name, i - 2);
             char numstring[100];
             sprintf(numstring, "[i] changed nick to %s", (char*)name);
             new_lines(numstring);
         }
-        else if (line[1] == 'l') {
+        else if (inpt_command == 'l') {
             print_friendlist();
         }
-        else if (line[1] == 's') {
+        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++) {
+            for (i = 3; i < len; i++) {
                 if (line[i] == 0 || line[i] == '\n') break;
-                status[i - 3] = line[i];
+                status[i-3] = line[i];
             }
-            status[i - 3] = 0;
-            m_set_userstatus(status, strlen((char*)status));
+            status[i-3] = 0;
+            m_set_userstatus(status, strlen((char*)status) + 1);
             char numstring[100];
             sprintf(numstring, "[i] changed status to %s", (char*)status);
             new_lines(numstring);
         }
-        else if (line[1] == 'a') {
+        else if (inpt_command == 'a') {
             uint8_t numf = atoi(line + 3);
             char numchar[100];
-            sprintf(numchar, "[i] friend request %u accepted", numf);
-            new_lines(numchar);
             int num = m_addfriend_norequest(pending_requests[numf]);
-            sprintf(numchar, "[i] added friendnumber %d", num);
-            new_lines(numchar);
+            if (num != -1) {
+                sprintf(numchar, "[i] friend request %u accepted", numf);
+                new_lines(numchar);
+                sprintf(numchar, "[i] added friendnumber %d", num);
+                new_lines(numchar);
+            } else {
+                sprintf(numchar, "[i] failed to add friend");
+                new_lines(numchar);
+            }
             do_refresh();
-            
         }
-        else if (line[1] == 'q') { //exit
+       else if (inpt_command == '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, /i for info, /n nick (to change nickname), /q (to quit)");
+        }
+       else if (inpt_command == 'i') { //info
+           char idstring0[200];
+           char idstring1[PUB_KEY_BYTES][5];
+           char idstring2[PUB_KEY_BYTES][5];
+           int i;
+           for (i = 0; i < PUB_KEY_BYTES; i++)
+           {
+               if (self_public_key[i] < (PUB_KEY_BYTES/2))
+                   strcpy(idstring1[i],"0");
+               else 
+                   strcpy(idstring1[i], "");
+               sprintf(idstring2[i], "%hhX", self_public_key[i]);
+           }
+           //
+           strcpy(idstring0,"[i] ID: ");
+           int j;
+           for (j = 0; j < PUB_KEY_BYTES; j++) {
+               strcat(idstring0,idstring1[j]);
+               strcat(idstring0,idstring2[j]);
+           }    
+                  new_lines(idstring0);
+       }
+
+        else if (inpt_command == 'q') { //exit
             endwin();
             exit(EXIT_SUCCESS);
         } else { 
@@ -165,9 +243,9 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
 
 void wrap(char output[STRING_LENGTH], char input[STRING_LENGTH], int line_width)
 {
-    int i = 0;
     strcpy(output,input);
     size_t len = strlen(output);
+    int i = 0;
     for (i = line_width; i < len; i = i + line_width) {
         while (output[i] != ' ' && i != 0) {
             i--;
@@ -181,9 +259,9 @@ void wrap(char output[STRING_LENGTH], char input[STRING_LENGTH], int line_width)
 int count_lines(char *string)
 {
     size_t len = strlen(string);
-    int i;
     int count = 1;
-    for (i=0; i < len; i++) {
+    int i;
+    for (i = 0; i < len; i++) {
         if (string[i] == '\n')
             count++;
     }
@@ -194,7 +272,7 @@ char *appender(char *str, const char c)
 {
     size_t len = strlen(str);
     if (len < STRING_LENGTH) {
-        str[len + 1] = str[len];
+        str[len+1] = str[len];
         str[len] = c;
     }
     return str;
@@ -202,21 +280,21 @@ char *appender(char *str, const char c)
 
 void do_refresh()
 {
-    int i;
     int count=0;
-    int l;
     char wrap_output[STRING_LENGTH];
-    for (i=0; i<HISTORY; i++) {
+    int L;
+    int i;
+    for (i = 0; i < HISTORY; i++) {
         wrap(wrap_output, lines[i], x);
-        l = count_lines(wrap_output);
-        count = count + l;
+        L = count_lines(wrap_output);
+        count = count + L;
         if (count < y) {
-            move(y-1-count,0);
+            move(y-1-count, 0);
             printw(wrap_output);
             clrtoeol();
         }
     }
-    move(y-1,0);
+    move(y-1, 0);
     clrtoeol();
     printw(">> ");
     printw(line);
@@ -247,12 +325,13 @@ void print_message(int friendnumber, uint8_t * string, uint16_t length)
     timeinfo = localtime ( &rawtime );
     char* temp = asctime(timeinfo);
     size_t len = strlen(temp);
-    temp[len-1]='\0';
+    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) {
+void print_nickchange(int friendnumber, uint8_t *string, uint16_t length) 
+{
     char name[MAX_NAME_LENGTH];
     getname(friendnumber, (uint8_t*)name);
     char msg[100+length];
@@ -260,7 +339,8 @@ void print_nickchange(int friendnumber, uint8_t *string, uint16_t length) {
     new_lines(msg);
 }
 
-void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) {
+void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) 
+{
     char name[MAX_NAME_LENGTH];
     getname(friendnumber, (uint8_t*)name);
     char msg[100+length+strlen(name)+1];
@@ -268,15 +348,17 @@ void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) {
     new_lines(msg);
 }
 
-void load_key(){
+void load_key() 
+{
     FILE *data_file = NULL;
-    if ((data_file = fopen("data","r"))) {
+    data_file = fopen("data","r");
+    if (data_file) {
         //load keys
         fseek(data_file, 0, SEEK_END);
         int size = ftell(data_file);
         fseek(data_file, 0, SEEK_SET);
         uint8_t data[size];
-        if(fread(data, sizeof(uint8_t), size, data_file) != size){
+        if (fread(data, sizeof(uint8_t), size, data_file) != size){
             printf("[i] could not read data file\n[i] exiting\n");
             exit(1);
         }
@@ -287,7 +369,7 @@ void load_key(){
         uint8_t data[size];
         Messenger_save(data);
         data_file = fopen("data","w");
-        if(fwrite(data, sizeof(uint8_t), size, data_file) != size){
+        if (fwrite(data, sizeof(uint8_t), size, data_file) != size){
             printf("[i] could not write data file\n[i] exiting\n");
             exit(1);
         }
@@ -317,34 +399,34 @@ int main(int argc, char *argv[])
     m_callback_namechange(print_nickchange);
     m_callback_userstatus(print_statuschange);
     char idstring0[200];
-    char idstring1[32][5];
-    char idstring2[32][5];
-    uint32_t i;
-    for(i = 0; i < 32; i++)
+    char idstring1[PUB_KEY_BYTES][5];
+    char idstring2[PUB_KEY_BYTES][5];
+    int i;
+    for(i = 0; i < PUB_KEY_BYTES; i++)
     {
-        if(self_public_key[i] < 16)
+        if (self_public_key[i] < (PUB_KEY_BYTES / 2))
             strcpy(idstring1[i],"0");
         else 
             strcpy(idstring1[i], "");
         sprintf(idstring2[i], "%hhX",self_public_key[i]);
     }
     strcpy(idstring0,"[i] your ID: ");
-    for (i=0; i<32; i++) {
-        strcat(idstring0,idstring1[i]);
-        strcat(idstring0,idstring2[i]);
+    int j;
+    for (j = 0; j < PUB_KEY_BYTES; j++) {
+        strcat(idstring0,idstring1[j]);
+        strcat(idstring0,idstring2[j]);
     }
     initscr();
     noecho();
     raw();
-    getmaxyx(stdscr,y,x);
+    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]));
     int resolved_address = resolve_addr(argv[1]);
-    if (resolved_address != -1)
+    if (resolved_address != 0)
         bootstrap_ip_port.ip.i = resolved_address;
     else 
         exit(1);
@@ -362,7 +444,6 @@ int main(int argc, char *argv[])
         do_refresh();
 
         c = getch();
-
         if (c == ERR || c == 27)
             continue;
 
@@ -371,7 +452,7 @@ int main(int argc, char *argv[])
             line_eval(lines, line);
             strcpy(line, "");
         } else if (c == 127) {
-            line[strlen(line) - 1] = '\0';
+            line[strlen(line)-1] = '\0';
         } else if (isalnum(c) || ispunct(c) || c == ' ') {
             strcpy(line, appender(line, (char) c));
         }