2 files changed, 50 insertions, 38 deletions

diff --git a/auto_tests/friends_test.c b/auto_tests/friends_test.c
index 0ba42b61..3c15b35b 100755
--- a/auto_tests/friends_test.c
+++ b/auto_tests/friends_test.c
@@ -44,6 +44,8 @@
 #define c_sleep(x) usleep(1000*x)
 #endif
 
+static Messenger *m;
+
 uint8_t *parent_id = NULL;
 uint8_t *child_id = NULL;
 
@@ -60,16 +62,16 @@ void do_tox(void)
         dht_on = 0;
     }
 
-    doMessenger();
+    doMessenger(m);
 }
 
-void parent_confirm_message(int num, uint8_t *data, uint16_t length)
+void parent_confirm_message(Messenger *m, int num, uint8_t *data, uint16_t length, void* userdata)
 {
     puts("OK");
     request_flags |= SECOND_FLAG;
 }
 
-void parent_confirm_status(int num, uint8_t *data, uint16_t length)
+void parent_confirm_status(Messenger *m, int num, uint8_t *data, uint16_t length, void* userdata)
 {
     puts("OK");
     request_flags |= FIRST_FLAG;
@@ -84,7 +86,7 @@ int parent_friend_request(void)
     fputs("Sending child request.", stdout);
     fflush(stdout);
 
-    m_addfriend(child_id, (uint8_t *)message, len);
+    m_addfriend(m, child_id, (uint8_t *)message, len);
 
     /* wait on the status change */
     for(i = 0; i < WAIT_COUNT; i++) {
@@ -106,15 +108,15 @@ int parent_friend_request(void)
     return 0;
 }
 
-void child_got_request(uint8_t *public_key, uint8_t *data, uint16_t length)
+void child_got_request(uint8_t *public_key, uint8_t *data, uint16_t length, void* userdata)
 {
     fputs("OK\nsending status to parent", stdout);
     fflush(stdout);
-    m_addfriend_norequest(public_key);
+    m_addfriend_norequest(m, public_key);
     request_flags |= FIRST_FLAG;
 }
 
-void child_got_statuschange(int friend_num, uint8_t *string, uint16_t length)
+void child_got_statuschange(Messenger *m, int friend_num, uint8_t *string, uint16_t length, void* userdata)
 {
     request_flags |= SECOND_FLAG;
 }
@@ -168,12 +170,13 @@ int main(int argc, char *argv[])
         int i = 0;
         char *message = "Y-yes Mr. Watson?";
 
-        initMessenger();
-        Messenger_save(child_id);
+        m = initMessenger();
+
+        Messenger_save(m, child_id);
         msync(child_id, crypto_box_PUBLICKEYBYTES, MS_SYNC);
 
-        m_callback_friendrequest(child_got_request);
-        m_callback_statusmessage(child_got_statuschange);
+        m_callback_friendrequest(m, child_got_request, NULL);
+        m_callback_statusmessage(m, child_got_statuschange, NULL);
 
         /* wait on the friend request */
        while(!(request_flags & FIRST_FLAG))
@@ -185,10 +188,12 @@ int main(int argc, char *argv[])
 
         for(i = 0; i < 6; i++) {
             /* send the message six times, just to be sure */
-            m_sendmessage(0, (uint8_t *)message, strlen(message));
+            m_sendmessage(m, 0, (uint8_t *)message, strlen(message));
             do_tox();
         }
 
+        cleanupMessenger(m);
+
         return 0;
     }
 
@@ -199,15 +204,16 @@ int main(int argc, char *argv[])
         return -1;
     }
 
+    m = initMessenger();
+
     msync(parent_id, crypto_box_PUBLICKEYBYTES, MS_SYNC);
-    m_callback_statusmessage(parent_confirm_status);
-    m_callback_friendmessage(parent_confirm_message);
+    m_callback_statusmessage(m, parent_confirm_status, NULL);
+    m_callback_friendmessage(m, parent_confirm_message, NULL);
 
     /* hacky way to give the child time to set up */
     c_sleep(50);
 
-    initMessenger();
-    Messenger_save(parent_id);
+    Messenger_save(m, parent_id);
 
     if(parent_friend_request() == -1)
         return -1;
diff --git a/auto_tests/messenger_test.c b/auto_tests/messenger_test.c
index af902083..64b44d5f 100644
--- a/auto_tests/messenger_test.c
+++ b/auto_tests/messenger_test.c
@@ -34,6 +34,8 @@ unsigned char *bad_id    = NULL;
 
 int friend_id_num = 0;
 
+Messenger *m;
+
 unsigned char * hex_string_to_bin(char hex_string[])
 {
     size_t len = strlen(hex_string);
@@ -52,22 +54,22 @@ START_TEST(test_m_sendmesage)
     int bad_len = MAX_DATA_SIZE;
 
 
-    ck_assert(m_sendmessage(-1, (uint8_t *)message, good_len) == 0);
-    ck_assert(m_sendmessage(REALLY_BIG_NUMBER, (uint8_t *)message, good_len) == 0);
-    ck_assert(m_sendmessage(17, (uint8_t *)message, good_len) == 0);
-    ck_assert(m_sendmessage(friend_id_num, (uint8_t *)message, bad_len) == 0);
+    ck_assert(m_sendmessage(m, -1, (uint8_t *)message, good_len) == 0);
+    ck_assert(m_sendmessage(m, REALLY_BIG_NUMBER, (uint8_t *)message, good_len) == 0);
+    ck_assert(m_sendmessage(m, 17, (uint8_t *)message, good_len) == 0);
+    ck_assert(m_sendmessage(m, friend_id_num, (uint8_t *)message, bad_len) == 0);
 }
 END_TEST
 
 START_TEST(test_m_get_userstatus_size)
 {
     int rc = 0;
-    ck_assert_msg((m_get_statusmessage_size(-1) == -1),
+    ck_assert_msg((m_get_statusmessage_size(m, -1) == -1),
                 "m_get_statusmessage_size did NOT catch an argument of -1");
-    ck_assert_msg((m_get_statusmessage_size(REALLY_BIG_NUMBER) == -1),
+    ck_assert_msg((m_get_statusmessage_size(m, REALLY_BIG_NUMBER) == -1),
             "m_get_statusmessage_size did NOT catch the following argument: %d\n",
                                                             REALLY_BIG_NUMBER);
-    rc = m_get_statusmessage_size(friend_id_num);
+    rc = m_get_statusmessage_size(m, friend_id_num);
 
     /* this WILL error if the original m_addfriend_norequest() failed */
     ck_assert_msg((rc > 0 && rc <= MAX_STATUSMESSAGE_LENGTH),
@@ -83,11 +85,11 @@ START_TEST(test_m_set_userstatus)
     uint16_t good_length = strlen(status);
     uint16_t bad_length = REALLY_BIG_NUMBER;
 
-    if(m_set_statusmessage((uint8_t *)status, bad_length) != -1)
+    if(m_set_statusmessage(m, (uint8_t *)status, bad_length) != -1)
         ck_abort_msg("m_set_userstatus did NOT catch the following length: %d\n",
                                                             REALLY_BIG_NUMBER);
 
-    if((m_set_statusmessage((uint8_t *)status, good_length)) != 0)
+    if((m_set_statusmessage(m, (uint8_t *)status, good_length)) != 0)
         ck_abort_msg("m_set_userstatus did NOT return 0 on the following length: %d\n"
                      "MAX_STATUSMESSAGE_LENGTH: %d\n", good_length, MAX_STATUSMESSAGE_LENGTH);
 }
@@ -95,9 +97,9 @@ END_TEST
 
 START_TEST(test_m_friendstatus)
 {
-    ck_assert_msg((m_friendstatus(-1) == NOFRIEND),
+    ck_assert_msg((m_friendstatus(m, -1) == NOFRIEND),
         "m_friendstatus did NOT catch an argument of -1.\n");
-    ck_assert_msg((m_friendstatus(REALLY_BIG_NUMBER) == NOFRIEND),
+    ck_assert_msg((m_friendstatus(m, REALLY_BIG_NUMBER) == NOFRIEND),
         "m_friendstatus did NOT catch an argument of %d.\n",
                                         REALLY_BIG_NUMBER);
 }
@@ -105,9 +107,9 @@ END_TEST
 
 START_TEST(test_m_delfriend)
 {
-    ck_assert_msg((m_delfriend(-1) == -1),
+    ck_assert_msg((m_delfriend(m, -1) == -1),
         "m_delfriend did NOT catch an argument of -1\n");
-    ck_assert_msg((m_delfriend(REALLY_BIG_NUMBER) == -1),
+    ck_assert_msg((m_delfriend(m, REALLY_BIG_NUMBER) == -1),
         "m_delfriend did NOT catch the following number: %d\n",
                                             REALLY_BIG_NUMBER);
 }
@@ -124,16 +126,16 @@ START_TEST(test_m_addfriend)
                      - crypto_box_NONCEBYTES - crypto_box_BOXZEROBYTES
                                          + crypto_box_ZEROBYTES + 100);
 
-    if(m_addfriend((uint8_t *)friend_id, (uint8_t *)good_data, really_bad_len) != FAERR_TOOLONG)
+    if(m_addfriend(m, (uint8_t *)friend_id, (uint8_t *)good_data, really_bad_len) != FAERR_TOOLONG)
         ck_abort_msg("m_addfriend did NOT catch the following length: %d\n", really_bad_len);
 
     /* this will error if the original m_addfriend_norequest() failed */
-    if(m_addfriend((uint8_t *)friend_id, (uint8_t *)good_data, good_len) != FAERR_ALREADYSENT)
+    if(m_addfriend(m, (uint8_t *)friend_id, (uint8_t *)good_data, good_len) != FAERR_ALREADYSENT)
         ck_abort_msg("m_addfriend did NOT catch adding a friend we already have.\n"
                      "(this can be caused by the error of m_addfriend_norequest in"
                      " the beginning of the suite)\n");
 
-    if(m_addfriend((uint8_t *)good_id_b, (uint8_t *)bad_data, bad_len) != FAERR_NOMESSAGE)
+    if(m_addfriend(m, (uint8_t *)good_id_b, (uint8_t *)bad_data, bad_len) != FAERR_NOMESSAGE)
         ck_abort_msg("m_addfriend did NOT catch the following length: %d\n", bad_len);
 
     /* this should REALLY error */
@@ -152,10 +154,10 @@ START_TEST(test_setname)
     int good_length = strlen(good_name);
     int bad_length = REALLY_BIG_NUMBER;
 
-    if(setname((uint8_t *)good_name, bad_length) != -1)
+    if(setname(m, (uint8_t *)good_name, bad_length) != -1)
         ck_abort_msg("setname() did NOT error on %d as a length argument!\n",
                                                                 bad_length);
-    if(setname((uint8_t *)good_name, good_length) != 0)
+    if(setname(m, (uint8_t *)good_name, good_length) != 0)
         ck_abort_msg("setname() did NOT return 0 on good arguments!\n");
 }
 END_TEST
@@ -166,8 +168,8 @@ START_TEST(test_getself_name)
     int len = strlen(nickname);
     char nick_check[len];
 
-    setname((uint8_t *)nickname, len);
-    getself_name((uint8_t *)nick_check);
+    setname(m, (uint8_t *)nickname, len);
+    getself_name(m, (uint8_t *)nick_check);
 
     ck_assert_msg((!STRINGS_EQUAL(nickname, nick_check)),
         "getself_name failed to return the known name!\n"
@@ -256,13 +258,15 @@ int main(int argc, char *argv[])
     good_id_b = hex_string_to_bin(good_id_b_str);
     bad_id    = hex_string_to_bin(bad_id_str);
 
+    m = initMessenger();
+
     /* setup a default friend and friendnum */
-    if(m_addfriend_norequest((uint8_t *)friend_id) < 0)
+    if(m_addfriend_norequest(m, (uint8_t *)friend_id) < 0)
         fputs("m_addfriend_norequest() failed on a valid ID!\n"
               "this was CRITICAL to the test, and the build WILL fail.\n"
               "the tests will continue now...\n\n", stderr);
 
-    if((friend_id_num = getfriend_id((uint8_t *)friend_id)) < 0)
+    if((friend_id_num = getfriend_id(m, (uint8_t *)friend_id)) < 0)
         fputs("getfriend_id() failed on a valid ID!\n"
               "this was CRITICAL to the test, and the build WILL fail.\n"
               "the tests will continue now...\n\n", stderr);
@@ -276,5 +280,7 @@ int main(int argc, char *argv[])
     free(good_id_b);
     free(bad_id);
 
+    cleanupMessenger(m);
+
     return number_failed;
 }