Added and implemented file_id parameter to file tranfers.

file_id is a 32byte identifier that can be used by users to identify
file tranfers across core/client restarts in order to resume broken
file tranfers.

In avatar tranfers it corresponds to the hash of the avatar.

Added tox_file_get_file_id() function to api to obtain the file_id
of an ongoing file transfer.

If not set, core will generate a random one.

1 files changed, 27 insertions, 2 deletions

diff --git a/auto_tests/tox_test.c b/auto_tests/tox_test.c
index dc23040d..942931a1 100644
--- a/auto_tests/tox_test.c
+++ b/auto_tests/tox_test.c
@@ -100,6 +100,7 @@ void handle_custom_packet(Tox *m, uint32_t friend_num, const uint8_t *data, size
     return;
 }
 
+uint8_t file_cmp_id[TOX_FILE_ID_LENGTH];
 uint8_t filenum;
 uint32_t file_accepted;
 uint64_t file_size;
@@ -119,6 +120,22 @@ void tox_file_receive(Tox *tox, uint32_t friend_number, uint32_t file_number, ui
         return;
     }
 
+    uint8_t file_id[TOX_FILE_ID_LENGTH];
+
+    if (!tox_file_get_file_id(tox, friend_number, file_number, file_id, 0)) {
+        ck_abort_msg("tox_file_get_file_id error");
+    }
+
+    if (memcmp(file_id, file_cmp_id, TOX_FILE_ID_LENGTH) != 0) {
+        ck_abort_msg("bad file_id");
+    }
+
+    uint8_t empty[TOX_FILE_ID_LENGTH] = {0};
+
+    if (memcmp(empty, file_cmp_id, TOX_FILE_ID_LENGTH) == 0) {
+        ck_abort_msg("empty file_id");
+    }
+
     file_size = filesize;
 
     TOX_ERR_FILE_CONTROL error;
@@ -520,10 +537,18 @@ START_TEST(test_few_clients)
     tox_callback_file_recv_control(tox3, file_print_control, &to_compare);
     tox_callback_file_receive(tox3, tox_file_receive, &to_compare);
     uint64_t totalf_size = 100 * 1024 * 1024;
-    uint32_t fnum = tox_file_send(tox2, 0, TOX_FILE_KIND_DATA, totalf_size, (uint8_t *)"Gentoo.exe", sizeof("Gentoo.exe"),
-                                  0);
+    uint32_t fnum = tox_file_send(tox2, 0, TOX_FILE_KIND_DATA, totalf_size, 0, (uint8_t *)"Gentoo.exe",
+                                  sizeof("Gentoo.exe"), 0);
     ck_assert_msg(fnum != UINT32_MAX, "tox_new_file_sender fail");
 
+    TOX_ERR_FILE_GET gfierr;
+    ck_assert_msg(!tox_file_get_file_id(tox2, 1, fnum, file_cmp_id, &gfierr), "tox_file_get_file_id didn't fail");
+    ck_assert_msg(gfierr == TOX_ERR_FILE_GET_FRIEND_NOT_FOUND, "wrong error");
+    ck_assert_msg(!tox_file_get_file_id(tox2, 0, fnum + 1, file_cmp_id, &gfierr), "tox_file_get_file_id didn't fail");
+    ck_assert_msg(gfierr == TOX_ERR_FILE_GET_NOT_FOUND, "wrong error");
+    ck_assert_msg(tox_file_get_file_id(tox2, 0, fnum, file_cmp_id, &gfierr), "tox_file_get_file_id failed");
+    ck_assert_msg(gfierr == TOX_ERR_FILE_GET_OK, "wrong error");
+
 
     while (1) {
         tox_iterate(tox1);