8 files changed, 98 insertions, 95 deletions

diff --git a/auto_tests/encryptsave_test.c b/auto_tests/encryptsave_test.c
index 338c9ef1..de78a0c2 100644
--- a/auto_tests/encryptsave_test.c
+++ b/auto_tests/encryptsave_test.c
@@ -29,13 +29,13 @@ unsigned char known_key2[crypto_box_BEFORENMBYTES] = {0x7a, 0xfa, 0x95, 0x45, 0x
 // same as above, except standard opslimit instead of extra ops limit for test_known_kdf, and hash pw before kdf for compat
 
 /* cause I'm shameless */
-void accept_friend_request(Tox *m, const uint8_t *public_key, const uint8_t *data, uint16_t length, void *userdata)
+void accept_friend_request(Tox *m, const uint8_t *public_key, const uint8_t *data, size_t length, void *userdata)
 {
     if (*((uint32_t *)userdata) != 974536)
         return;
 
     if (length == 7 && memcmp("Gentoo", data, 7) == 0) {
-        tox_add_friend_norequest(m, public_key);
+        tox_friend_add_norequest(m, public_key, 0);
     }
 }
 
@@ -55,29 +55,29 @@ END_TEST
 
 START_TEST(test_save_friend)
 {
-    Tox *tox1 = tox_new(0);
-    Tox *tox2 = tox_new(0);
+    TOX_ERR_NEW err = TOX_ERR_NEW_OK;
+    Tox *tox1 = tox_new(0, 0, 0, 0);
+    Tox *tox2 = tox_new(0, 0, 0, 0);
     ck_assert_msg(tox1 || tox2, "Failed to create 2 tox instances");
     uint32_t to_compare = 974536;
     tox_callback_friend_request(tox2, accept_friend_request, &to_compare);
-    uint8_t address[TOX_FRIEND_ADDRESS_SIZE];
-    tox_get_address(tox2, address);
-    int test = tox_add_friend(tox1, address, (uint8_t *)"Gentoo", 7);
+    uint8_t address[TOX_ADDRESS_SIZE];
+    tox_self_get_address(tox2, address);
+    int test = tox_friend_add(tox1, address, (uint8_t *)"Gentoo", 7, 0);
     ck_assert_msg(test == 0, "Failed to add friend error code: %i", test);
 
     uint32_t size = tox_encrypted_size(tox1);
     uint8_t data[size];
     test = tox_encrypted_save(tox1, data, "correcthorsebatterystaple", 25);
     ck_assert_msg(test == 0, "failed to encrypted save");
-    ck_assert_msg(tox_is_save_encrypted(data) == 1, "magic number missing");
+    //ck_assert_msg(tox_is_save_encrypted(data) == 1, "magic number missing");
 
-    Tox *tox3 = tox_new(0);
-    test = tox_encrypted_load(tox3, data, size, "correcthorsebatterystaple", 25);
-    ck_assert_msg(test == 0, "failed to encrypted load");
-    uint8_t address2[TOX_CLIENT_ID_SIZE];
-    test = tox_get_client_id(tox3, 0, address2);
-    ck_assert_msg(test == 0, "no friends!");
-    ck_assert_msg(memcmp(address, address2, TOX_CLIENT_ID_SIZE) == 0, "addresses don't match!");
+    Tox *tox3 = tox_encrypted_new(0, data, size, "correcthorsebatterystaple", 25, &err);
+    ck_assert_msg(err == TOX_ERR_NEW_OK, "failed to encrypted new");
+    uint8_t address2[TOX_PUBLIC_KEY_SIZE];
+    test = tox_friend_get_public_key(tox3, 0, address2, 0);
+    ck_assert_msg(test == 1, "no friends!");
+    ck_assert_msg(memcmp(address, address2, TOX_PUBLIC_KEY_SIZE) == 0, "addresses don't match!");
 
     size = tox_encrypted_size(tox3);
     uint8_t data2[size];
@@ -86,20 +86,19 @@ START_TEST(test_save_friend)
     memcpy(key + 32, known_key2, crypto_box_BEFORENMBYTES);
     test = tox_encrypted_key_save(tox3, data2, key);
     ck_assert_msg(test == 0, "failed to encrypted save the second");
-    ck_assert_msg(tox_is_save_encrypted(data2) == 1, "magic number the second missing");
-
-    // first test tox_encrypted_key_load
-    Tox *tox4 = tox_new(0);
-    test = tox_encrypted_key_load(tox4, data2, size, key);
-    ck_assert_msg(test == 0, "failed to encrypted load the second");
-    uint8_t address4[TOX_CLIENT_ID_SIZE];
-    test = tox_get_client_id(tox4, 0, address4);
-    ck_assert_msg(test == 0, "no friends! the second");
-    ck_assert_msg(memcmp(address, address2, TOX_CLIENT_ID_SIZE) == 0, "addresses don't match! the second");
-
-    // now test compaitibilty with tox_encrypted_load, first manually...
+    //ck_assert_msg(tox_is_save_encrypted(data2) == 1, "magic number the second missing");
+
+    // first test tox_encrypted_key_new
+    Tox *tox4 = tox_encrypted_key_new(0, data2, size, key, &err);
+    ck_assert_msg(err == TOX_ERR_NEW_OK, "failed to encrypted new the second");
+    uint8_t address4[TOX_PUBLIC_KEY_SIZE];
+    test = tox_friend_get_public_key(tox4, 0, address4, 0);
+    ck_assert_msg(test == 1, "no friends! the second");
+    ck_assert_msg(memcmp(address, address2, TOX_PUBLIC_KEY_SIZE) == 0, "addresses don't match! the second");
+
+    // now test compaitibilty with tox_encrypted_new, first manually...
     uint8_t out1[size], out2[size];
-    printf("Trying to decrypt from pw:\n");
+    //printf("Trying to decrypt from pw:\n");
     uint32_t sz1 = tox_pass_decrypt(data2, size, pw, pwlen, out1);
     uint32_t sz2 = tox_pass_key_decrypt(data2, size, key, out2);
     ck_assert_msg(sz1 == sz2, "differing output sizes");
@@ -107,13 +106,12 @@ START_TEST(test_save_friend)
 
     // and now with the code in use (I only bothered with manually to debug this, and it seems a waste
     // to remove the manual check now that it's there)
-    Tox *tox5 = tox_new(0);
-    test = tox_encrypted_load(tox5, data2, size, pw, pwlen);
-    ck_assert_msg(test == 0, "failed to encrypted load the third");
-    uint8_t address5[TOX_CLIENT_ID_SIZE];
-    test = tox_get_client_id(tox4, 0, address5);
-    ck_assert_msg(test == 0, "no friends! the third");
-    ck_assert_msg(memcmp(address, address2, TOX_CLIENT_ID_SIZE) == 0, "addresses don't match! the third");
+    Tox *tox5 = tox_encrypted_new(0, data2, size, pw, pwlen, &err);
+    ck_assert_msg(err == TOX_ERR_NEW_OK, "failed to encrypted new the third");
+    uint8_t address5[TOX_PUBLIC_KEY_SIZE];
+    test = tox_friend_get_public_key(tox4, 0, address5, 0);
+    ck_assert_msg(test == 1, "no friends! the third");
+    ck_assert_msg(memcmp(address, address2, TOX_PUBLIC_KEY_SIZE) == 0, "addresses don't match! the third");
 
     tox_kill(tox1);
     tox_kill(tox2);
diff --git a/auto_tests/tox_test.c b/auto_tests/tox_test.c
index d9cb46db..d7a44fb2 100644
--- a/auto_tests/tox_test.c
+++ b/auto_tests/tox_test.c
@@ -503,13 +503,13 @@ END_TEST
 
 #define NUM_GROUP_TOX 32
 
-void g_accept_friend_request(Tox *m, const uint8_t *public_key, const uint8_t *data, uint16_t length, void *userdata)
+void g_accept_friend_request(Tox *m, const uint8_t *public_key, const uint8_t *data, size_t length, void *userdata)
 {
     if (*((uint32_t *)userdata) != 234212)
         return;
 
     if (length == 7 && memcmp("Gentoo", data, 7) == 0) {
-        tox_add_friend_norequest(m, public_key);
+        tox_friend_add_norequest(m, public_key, 0);
     }
 }
 
@@ -560,24 +560,24 @@ START_TEST(test_many_group)
     uint32_t to_comp = 234212;
 
     for (i = 0; i < NUM_GROUP_TOX; ++i) {
-        toxes[i] = tox_new(0);
+        toxes[i] = tox_new(0, 0, 0, 0);
         ck_assert_msg(toxes[i] != 0, "Failed to create tox instances %u", i);
         tox_callback_friend_request(toxes[i], &g_accept_friend_request, &to_comp);
         tox_callback_group_invite(toxes[i], &print_group_invite_callback, &to_comp);
     }
 
-    uint8_t address[TOX_FRIEND_ADDRESS_SIZE];
-    tox_get_address(toxes[NUM_GROUP_TOX - 1], address);
+    uint8_t address[TOX_ADDRESS_SIZE];
+    tox_self_get_address(toxes[NUM_GROUP_TOX - 1], address);
 
     for (i = 0; i < NUM_GROUP_TOX; ++i) {
-        ck_assert_msg(tox_add_friend(toxes[i], address, (uint8_t *)"Gentoo", 7) == 0, "Failed to add friend");
+        ck_assert_msg(tox_friend_add(toxes[i], address, (uint8_t *)"Gentoo", 7, 0) == 0, "Failed to add friend");
 
-        tox_get_address(toxes[i], address);
+        tox_self_get_address(toxes[i], address);
     }
 
     while (1) {
         for (i = 0; i < NUM_GROUP_TOX; ++i) {
-            if (tox_get_friend_connection_status(toxes[i], 0) != 1) {
+            if (tox_friend_get_connection_status(toxes[i], 0, 0) != TOX_CONNECTION_UDP) {
                 break;
             }
         }
@@ -586,7 +586,7 @@ START_TEST(test_many_group)
             break;
 
         for (i = 0; i < NUM_GROUP_TOX; ++i) {
-            tox_do(toxes[i]);
+            tox_iteration(toxes[i]);
         }
 
         c_sleep(50);
@@ -604,7 +604,7 @@ START_TEST(test_many_group)
 
     while (1) {
         for (i = 0; i < NUM_GROUP_TOX; ++i) {
-            tox_do(toxes[i]);
+            tox_iteration(toxes[i]);
         }
 
         if (!invite_counter) {
@@ -642,7 +642,7 @@ START_TEST(test_many_group)
 
     for (j = 0; j < 20; ++j) {
         for (i = 0; i < NUM_GROUP_TOX; ++i) {
-            tox_do(toxes[i]);
+            tox_iteration(toxes[i]);
         }
 
         c_sleep(50);
@@ -655,7 +655,7 @@ START_TEST(test_many_group)
 
         for (j = 0; j < 10; ++j) {
             for (i = 0; i < NUM_GROUP_TOX; ++i) {
-                tox_do(toxes[i]);
+                tox_iteration(toxes[i]);
             }
 
             c_sleep(50);
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 544b8b0d..f6c37ac4 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -1002,8 +1002,8 @@ void callback_file_data(Messenger *m, void (*function)(Messenger *m, uint32_t, u
  *  return 1 on success
  *  return 0 on failure
  */
-int file_sendrequest(const Messenger *m, int32_t friendnumber, uint8_t filenumber, uint64_t filesize,
-                     const uint8_t *filename, uint16_t filename_length)
+static int file_sendrequest(const Messenger *m, int32_t friendnumber, uint8_t filenumber, uint64_t filesize,
+                            const uint8_t *filename, uint16_t filename_length)
 {
     if (friend_not_valid(m, friendnumber))
         return 0;
@@ -1612,11 +1612,6 @@ static int handle_packet(void *object, int i, uint8_t *temp, uint16_t len)
         if (packet_id == PACKET_ID_ONLINE && len == 1) {
             set_friend_status(m, i, FRIEND_ONLINE);
             send_online_packet(m, i);
-        } else if (packet_id == PACKET_ID_NICKNAME || packet_id == PACKET_ID_STATUSMESSAGE
-                   || packet_id == PACKET_ID_USERSTATUS) {
-            /* Some backward compatibility, TODO: remove. */
-            set_friend_status(m, i, FRIEND_ONLINE);
-            send_online_packet(m, i);
         } else {
             return -1;
         }
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index 4659ddf9..541894ab 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -578,14 +578,6 @@ void callback_file_data(Messenger *m, void (*function)(Messenger *m, uint32_t, u
 
 /* Send a file send request.
  * Maximum filename length is 255 bytes.
- *  return 1 on success
- *  return 0 on failure
- */
-int file_sendrequest(const Messenger *m, int32_t friendnumber, uint8_t filenumber, uint64_t filesize,
-                     const uint8_t *filename, uint16_t filename_length);
-
-/* Send a file send request.
- * Maximum filename length is 255 bytes.
  *  return file number on success
  *  return -1 on failure
  */
diff --git a/toxcore/network.c b/toxcore/network.c
index 9433e368..1488d980 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -488,17 +488,14 @@ Networking_Core *new_networking_ex(IP ip, uint16_t port_from, uint16_t port_to)
      * If one is 0 and the other is non-0, use the non-0 value as only port
      * If from > to, swap
      */
-    if(port_from == 0 && port_to == 0) {
+    if (port_from == 0 && port_to == 0) {
         port_from = TOX_PORTRANGE_FROM;
         port_to = TOX_PORTRANGE_TO;
-    }
-    else if(port_from == 0 && port_to != 0) {
+    } else if (port_from == 0 && port_to != 0) {
         port_from = port_to;
-    }
-    else if(port_from != 0 && port_to == 0) {
+    } else if (port_from != 0 && port_to == 0) {
         port_to = port_from;
-    }
-    else if(port_from > port_to) {
+    } else if (port_from > port_to) {
         uint16_t temp = port_from;
         port_from = port_to;
         port_to = temp;
diff --git a/toxcore/tox.h b/toxcore/tox.h
index a66bcb17..8a489411 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -463,6 +463,14 @@ enum TOX_ERR_NEW {
      */
     TOX_ERR_NEW_LOAD_ENCRYPTED,
     /**
+     * The encrypted byte array could not be decrypted. Either the data was
+     * corrupt or the password/key was incorrect.
+     *
+     * NOTE: This error code is only set by tox_encrypted_new() and
+     * tox_encrypted_key_new(), in the toxencryptsave module.
+     */
+    TOX_ERR_NEW_LOAD_DECRYPTION_FAILED,
+    /**
      * The data format was invalid. This can happen when loading data that was
      * saved by an older version of Tox, or when the data has been corrupted.
      * When loading from badly formatted data, some data may have been loaded,
diff --git a/toxencryptsave/toxencryptsave.c b/toxencryptsave/toxencryptsave.c
index 13a34dea..f9846ac9 100644
--- a/toxencryptsave/toxencryptsave.c
+++ b/toxencryptsave/toxencryptsave.c
@@ -29,6 +29,7 @@
 #include "defines.h"
 #include "../toxcore/crypto_core.h"
 #include "../toxcore/tox.h"
+#define SET_ERROR_PARAMETER(param, x) {if(param) {*param = x;}}
 
 #ifdef VANILLA_NACL
 #include "crypto_pwhash_scryptsalsa208sha256/crypto_pwhash_scryptsalsa208sha256.h"
@@ -293,38 +294,44 @@ int tox_pass_decrypt(const uint8_t *data, uint32_t length, uint8_t *passphrase,
     return tox_pass_key_decrypt(data, length, key, out);
 }
 
-/* Load the messenger from encrypted data of size length.
+/* Load the new messenger from encrypted data of size length.
+ * All other arguments are like toxcore/tox_new().
  *
- * returns 0 on success
- * returns -1 on failure
+ * returns NULL on failure; see the documentation in toxcore/tox.h.
  */
-int tox_encrypted_load(Tox *tox, const uint8_t *data, uint32_t length, uint8_t *passphrase, uint32_t pplength)
+Tox *tox_encrypted_new(const struct Tox_Options *options, const uint8_t *data, size_t length, uint8_t *passphrase,
+                       size_t pplength, TOX_ERR_NEW *error)
 {
     uint32_t decrypt_length = length - TOX_PASS_ENCRYPTION_EXTRA_LENGTH;
     uint8_t temp_data[decrypt_length];
 
     if (tox_pass_decrypt(data, length, passphrase, pplength, temp_data)
-            != decrypt_length)
-        return -1;
+            != decrypt_length) {
+        SET_ERROR_PARAMETER(error, TOX_ERR_NEW_LOAD_DECRYPTION_FAILED);
+        return NULL;
+    }
 
-    return tox_load(tox, temp_data, decrypt_length);
+    return tox_new(options, temp_data, decrypt_length, error);
 }
 
 /* Load the messenger from encrypted data of size length, with key from tox_derive_key.
+ * All other arguments are like toxcore/tox_new().
  *
- * returns 0 on success
- * returns -1 on failure
+ * returns NULL on failure; see the documentation in toxcore/tox.h.
  */
-int tox_encrypted_key_load(Tox *tox, const uint8_t *data, uint32_t length, uint8_t *key)
+Tox *tox_encrypted_key_new(const struct Tox_Options *options, const uint8_t *data, size_t length, uint8_t *key,
+                           TOX_ERR_NEW *error)
 {
     uint32_t decrypt_length = length - TOX_PASS_ENCRYPTION_EXTRA_LENGTH;
     uint8_t temp_data[decrypt_length];
 
     if (tox_pass_key_decrypt(data, length, key, temp_data)
-            != decrypt_length)
-        return -1;
+            != decrypt_length) {
+        SET_ERROR_PARAMETER(error, TOX_ERR_NEW_LOAD_DECRYPTION_FAILED);
+        return NULL;
+    }
 
-    return tox_load(tox, temp_data, decrypt_length);
+    return tox_new(options, temp_data, decrypt_length, error);
 }
 
 /* Determines whether or not the given data is encrypted (by checking the magic number)
@@ -339,8 +346,3 @@ int tox_is_data_encrypted(const uint8_t *data)
     else
         return 0;
 }
-
-int tox_is_save_encrypted(const uint8_t *data)
-{
-    return tox_is_data_encrypted(data);
-}
diff --git a/toxencryptsave/toxencryptsave.h b/toxencryptsave/toxencryptsave.h
index da13f312..5ceeefdd 100644
--- a/toxencryptsave/toxencryptsave.h
+++ b/toxencryptsave/toxencryptsave.h
@@ -29,10 +29,13 @@ extern "C" {
 #endif
 
 #include <stdint.h>
+#include <stddef.h>
 
 #ifndef TOX_DEFINED
 #define TOX_DEFINED
 typedef struct Tox Tox;
+struct Tox_Options;
+typedef uint8_t TOX_ERR_NEW;
 #endif
 
 // these functions provide access to these defines in toxencryptsave.c, which
@@ -88,6 +91,9 @@ int tox_pass_encrypt(const uint8_t *data, uint32_t data_len, uint8_t *passphrase
 /* Save the messenger data encrypted with the given password.
  * data must be at least tox_encrypted_size().
  *
+ * NOTE: Unlike tox_save(), this function may fail. Be sure to check its return
+ * value.
+ *
  * returns 0 on success
  * returns -1 on failure
  */
@@ -104,12 +110,13 @@ int tox_encrypted_save(const Tox *tox, uint8_t *data, uint8_t *passphrase, uint3
  */
 int tox_pass_decrypt(const uint8_t *data, uint32_t length, uint8_t *passphrase, uint32_t pplength, uint8_t *out);
 
-/* Load the messenger from encrypted data of size length.
+/* Load the new messenger from encrypted data of size length.
+ * All other arguments are like toxcore/tox_new().
  *
- * returns 0 on success
- * returns -1 on failure
+ * returns NULL on failure; see the documentation in toxcore/tox.h.
  */
-int tox_encrypted_load(Tox *tox, const uint8_t *data, uint32_t length, uint8_t *passphrase, uint32_t pplength);
+Tox *tox_encrypted_new(const struct Tox_Options *options, const uint8_t *data, size_t length, uint8_t *passphrase,
+                       size_t pplength, TOX_ERR_NEW *error);
 
 
 /******************************* BEGIN PART 1 *******************************
@@ -161,6 +168,9 @@ int tox_pass_key_encrypt(const uint8_t *data, uint32_t data_len, const uint8_t *
 /* Save the messenger data encrypted with the given key from tox_derive_key.
  * data must be at least tox_encrypted_size().
  *
+ * NOTE: Unlike tox_save(), this function may fail. Be sure to check its return
+ * value.
+ *
  * returns 0 on success
  * returns -1 on failure
  */
@@ -175,11 +185,13 @@ int tox_encrypted_key_save(const Tox *tox, uint8_t *data, uint8_t *key);
 int tox_pass_key_decrypt(const uint8_t *data, uint32_t length, const uint8_t *key, uint8_t *out);
 
 /* Load the messenger from encrypted data of size length, with key from tox_derive_key.
+ * All other arguments are like toxcore/tox_new().
  *
- * returns 0 on success
- * returns -1 on failure
+ * returns NULL on failure; see the documentation in toxcore/tox.h.
  */
-int tox_encrypted_key_load(Tox *tox, const uint8_t *data, uint32_t length, uint8_t *key);
+Tox *tox_encrypted_key_new(const struct Tox_Options *options, const uint8_t *data, size_t length, uint8_t *key,
+                           TOX_ERR_NEW *error);
+
 
 /* Determines whether or not the given data is encrypted (by checking the magic number)
  *
@@ -187,7 +199,6 @@ int tox_encrypted_key_load(Tox *tox, const uint8_t *data, uint32_t length, uint8
  * returns 0 otherwise
  */
 int tox_is_data_encrypted(const uint8_t *data);
-int tox_is_save_encrypted(const uint8_t *data); // poorly-named alias for backwards compat (oh irony...)
 
 #ifdef __cplusplus
 }