4 files changed, 66 insertions, 50 deletions

diff --git a/INSTALL.md b/INSTALL.md
index 87451948..d6a5b3f9 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -57,21 +57,30 @@ make
 <a name="osx" />
 ###OS X:
 
+You need the latest XCode with the Developer Tools (Preferences -> Downloads -> Command Line Tools).
+The following libraries are required along with libsodium and cmake for Mountain Lion and XCode 4.6.3 install libtool, automake and autoconf. You can download them with Homebrew, or install them manually.
+
+There are no binaries/executables going to /bin/ or /usr/bin/ now. Everything is compiled and ran from the inside your local branch. See [Usage](#usage) below.
+
 <a name="homebrew" />
 ####Homebrew:
 ```
 brew install libtool automake autoconf libconfig libsodium cmake
 cmake .
 make
-sudo make install
 ```
 
 <a name="non-homebrew" />
 ####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:
+Grab the following packages:
+  * http://www.gnu.org/software/libtool/
+  * http://www.gnu.org/software/autoconf/ 
+  * http://www.gnu.org/software/automake/
+  * http://www.cmake.org/
+  * https://github.com/jedisct1/libsodium
+
+Uncompress and install them all. Make sure to follow the README as the instructions change, but they all follow the same pattern below:
 
 ```bash
 ./configure
@@ -79,6 +88,13 @@ make
 sudo make install
 ```
 
+In your local TOX repository:
+
+```bash
+cmake .
+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.
 
diff --git a/core/Messenger.c b/core/Messenger.c
index e60357c8..c768633e 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -94,30 +94,30 @@ 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 message length is too long
- * return -2 if no message (message length must be >= 1 byte)
- * return -3 if user's own key
- * return -4 if friend request already sent or already a friend
- * return -5 for unknown error 
+ * return FA_TOOLONG if message length is too long
+ * return FAERR_NOMESSAGE if no message (message length must be >= 1 byte)
+ * return FAERR_OWNKEY if user's own key
+ * return FAERR_ALREADYSENT if friend request already sent or already a friend
+ * return FAERR_UNKNOWN for unknown error 
  */
 int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length)
 {
     if (length >= (MAX_DATA_SIZE - crypto_box_PUBLICKEYBYTES 
                          - crypto_box_NONCEBYTES - crypto_box_BOXZEROBYTES 
                          + crypto_box_ZEROBYTES))
-        return -1;
+        return FAERR_TOOLONG;
     if (length < 1)
-        return -2;
+        return FAERR_NOMESSAGE;
     if (memcmp(client_id, self_public_key, crypto_box_PUBLICKEYBYTES) == 0)
-        return -3;
+        return FAERR_OWNKEY;
     if (getfriend_id(client_id) != -1)
-        return -4;
+        return FAERR_ALREADYSENT;
 
     uint32_t 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) {
+        if(friendlist[i].status == NOFRIEND) {
             DHT_addfriend(client_id);
-            friendlist[i].status = 1;
+            friendlist[i].status = FRIEND_ADDED;
             friendlist[i].crypt_connection_id = -1;
             friendlist[i].friend_request_id = -1;
             memcpy(friendlist[i].client_id, client_id, CLIENT_ID_SIZE);
@@ -130,7 +130,7 @@ int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length)
             return i;
         }
     }
-    return -5;
+    return FAERR_UNKNOWN;
 }
 
 int m_addfriend_norequest(uint8_t * client_id)
@@ -139,9 +139,9 @@ int m_addfriend_norequest(uint8_t * client_id)
         return -1;
     uint32_t 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) {
+        if(friendlist[i].status == NOFRIEND) {
             DHT_addfriend(client_id);
-            friendlist[i].status = 2;
+            friendlist[i].status = FRIEND_REQUESTED;
             friendlist[i].crypt_connection_id = -1;
             friendlist[i].friend_request_id = -1;
             memcpy(friendlist[i].client_id, client_id, CLIENT_ID_SIZE);
@@ -169,7 +169,7 @@ int m_delfriend(int friendnumber)
     uint32_t i;
 
     for (i = numfriends; i != 0; --i) {
-        if (friendlist[i-1].status != 0)
+        if (friendlist[i-1].status != NOFRIEND)
             break;
     }
     numfriends = i;
@@ -177,15 +177,15 @@ int m_delfriend(int friendnumber)
     return 0;
 }
 
-/* return 4 if friend is online
-   return 3 if friend is confirmed
-   return 2 if the friend request was sent
-   return 1 if the friend was added
-   return 0 if there is no friend with that number */
+/* return FRIEND_ONLINE if friend is online
+   return FRIEND_CONFIRMED if friend is confirmed
+   return FRIEND_REQUESTED if the friend request was sent
+   return FRIEND_ADDED if the friend was added
+   return NOFRIEND if there is no friend with that number */
 int m_friendstatus(int friendnumber)
 {
     if (friendnumber < 0 || friendnumber >= numfriends)
-        return 0;
+        return NOFRIEND;
     return friendlist[friendnumber].status;
 }
 
@@ -196,7 +196,7 @@ int m_sendmessage(int friendnumber, uint8_t *message, uint32_t length)
 {
     if (friendnumber < 0 || friendnumber >= numfriends)
         return 0;
-    if (length >= MAX_DATA_SIZE || friendlist[friendnumber].status != 4)
+    if (length >= MAX_DATA_SIZE || friendlist[friendnumber].status != FRIEND_ONLINE)
         /* this does not mean the maximum message length is MAX_DATA_SIZE - 1, it is actually 17 bytes less. */
         return 0;
     uint8_t temp[MAX_DATA_SIZE];
@@ -385,15 +385,15 @@ static void doFriends()
     int len;
     uint8_t temp[MAX_DATA_SIZE];
     for (i = 0; i < numfriends; ++i) {
-        if (friendlist[i].status == 1) {
+        if (friendlist[i].status == FRIEND_ADDED) {
             int fr = send_friendrequest(friendlist[i].client_id, friendlist[i].info, friendlist[i].info_size);
             if (fr == 0) /* TODO: This needs to be fixed so that it sends the friend requests a couple of times in case of packet loss */
-                friendlist[i].status = 2;
+                friendlist[i].status = FRIEND_REQUESTED;
             else if (fr > 0)
-                friendlist[i].status = 2;
+                friendlist[i].status = FRIEND_REQUESTED;
         }
-        if (friendlist[i].status == 2 || friendlist[i].status == 3) { /* friend is not online */
-            if (friendlist[i].status == 2) {
+        if (friendlist[i].status == FRIEND_REQUESTED || friendlist[i].status == FRIEND_CONFIRMED) { /* friend is not online */
+            if (friendlist[i].status == FRIEND_REQUESTED) {
                 if (friendlist[i].friend_request_id + 10 < unix_time()) { /*I know this is hackish but it should work.*/
                     send_friendrequest(friendlist[i].client_id, friendlist[i].info, friendlist[i].info_size);
                     friendlist[i].friend_request_id = unix_time();
@@ -406,7 +406,7 @@ static void doFriends()
                     friendlist[i].crypt_connection_id = crypto_connect(friendlist[i].client_id, friendip);
                 break;
             case 3: /*  Connection is established */
-                friendlist[i].status = 4;
+                friendlist[i].status = FRIEND_ONLINE;
                 break;
             case 4:
                 crypto_kill(friendlist[i].crypt_connection_id);
@@ -416,7 +416,7 @@ static void doFriends()
                 break;
             }
         }
-        while (friendlist[i].status == 4) { /* friend is online */
+        while (friendlist[i].status == FRIEND_ONLINE) { /* friend is online */
             if (friendlist[i].name_sent == 0) {
                 if (m_sendname(i, self_name, self_name_length))
                     friendlist[i].name_sent = 1;
@@ -456,7 +456,7 @@ static void doFriends()
                 if (is_cryptoconnected(friendlist[i].crypt_connection_id) == 4) { /* if the connection timed out, kill it */
                     crypto_kill(friendlist[i].crypt_connection_id);
                     friendlist[i].crypt_connection_id = -1;
-                    friendlist[i].status = 3;
+                    friendlist[i].status = FRIEND_CONFIRMED;
                 }
                 break;
             }
@@ -477,7 +477,7 @@ static void doInbound()
             friendlist[friend_id].crypt_connection_id =
                 accept_crypto_inbound(inconnection, public_key, secret_nonce, session_key);
 
-            friendlist[friend_id].status = 3;
+            friendlist[friend_id].status = FRIEND_CONFIRMED;
         }
     }
 }
diff --git a/core/Messenger.h b/core/Messenger.h
index 3f144ff4..acf62a32 100644
--- a/core/Messenger.h
+++ b/core/Messenger.h
@@ -42,6 +42,21 @@ extern "C" {
 #define PACKET_ID_USERSTATUS 49
 #define PACKET_ID_MESSAGE 64
 
+/* status definitions */
+#define FRIEND_ONLINE 4
+#define FRIEND_CONFIRMED 3
+#define FRIEND_REQUESTED 2
+#define FRIEND_ADDED 1
+#define NOFRIEND 0
+
+/* errors for m_addfriend
+ *  FAERR - Friend Add Error */
+#define FAERR_TOOLONG -1
+#define FAERR_NOMESSAGE -2
+#define FAERR_OWNKEY -3
+#define FAERR_ALREADYSENT -4
+#define FAERR_UNKNOWN -5
+
 /* don't assume MAX_USERSTATUS_LENGTH will stay at 128, it may be increased
     to an absurdly large number later */
 
diff --git a/testing/nTox_win32.c b/testing/nTox_win32.c
index 42780923..27fc6ff3 100644
--- a/testing/nTox_win32.c
+++ b/testing/nTox_win32.c
@@ -151,21 +151,6 @@ void line_eval(char* line)
         else if (inpt_command == 'l') {
             int activefriends = 0;
             int i;
-
-            for (i = 0; i <= getnumfriends(); i++)
-            {
-                if (m_friendstatus(i) == 4)
-                    activefriends++;
-            }
-
-            printf("\n[i] Friend List | Total: %d\n\n", activefriends);
-
-            for (i = 0; i <= getnumfriends(); i++) {
-                char name[MAX_NAME_LENGTH];
-                getname(i, (uint8_t*)name);
-                if (m_friendstatus(i) == 4)    
-                    printf("[%d] %s\n\n", i, (uint8_t*)name);
-            }
         }
 
         else if (inpt_command == 'd') {