3 files changed, 71 insertions, 41 deletions

diff --git a/auto_tests/dht_test.c b/auto_tests/dht_test.c
index 6d7e70ad..3e90fb1c 100644
--- a/auto_tests/dht_test.c
+++ b/auto_tests/dht_test.c
@@ -45,6 +45,7 @@ void mark_good(IPPTsPng *ipptp)
 void mark_all_good(Client_data *list, uint32_t length, uint8_t ipv6)
 {
     uint32_t i;
+
     for (i = 0; i < length; ++i) {
         if (ipv6)
             mark_good(&list[i].assoc6);
@@ -58,18 +59,22 @@ void mark_all_good(Client_data *list, uint32_t length, uint8_t ipv6)
 uint8_t is_furthest(const uint8_t *comp_client_id, Client_data *list, uint32_t length, const uint8_t *client_id)
 {
     uint32_t i;
+
     for (i = 0; i < length; ++i)
         if (id_closest(comp_client_id, client_id, list[i].client_id) == 1)
             return 0;
+
     return 1;
 }
 
 int client_in_list(Client_data *list, uint32_t length, const uint8_t *client_id)
 {
     int i;
+
     for (i = 0; i < (int)length; ++i)
         if (id_equal(client_id, list[i].client_id))
             return i;
+
     return -1;
 }
 
@@ -93,7 +98,8 @@ void test_addto_lists_update(DHT            *dht,
     // it is possible to have ip_port duplicates in the list, so ip_port @ found not always equal to ip_port @ test
     found = client_in_list(list, length, test_id);
     ck_assert_msg(found >= 0, "Client id is not in the list");
-    ck_assert_msg(ipport_equal(&test_ipp, ipv6 ? &list[found].assoc6.ip_port : &list[found].assoc4.ip_port), "Client IP_Port is incorrect");
+    ck_assert_msg(ipport_equal(&test_ipp, ipv6 ? &list[found].assoc6.ip_port : &list[found].assoc4.ip_port),
+                  "Client IP_Port is incorrect");
 
     // check ip_port update for existing id
     test = rand() % length;
@@ -104,7 +110,8 @@ void test_addto_lists_update(DHT            *dht,
     ck_assert_msg(used >= 1, "Wrong number of added clients");
     // it is not possible to have id duplicates in the list, so id @ found must be equal id @ test
     ck_assert_msg(client_in_list(list, length, test_id) == test, "Client id is not in the list");
-    ck_assert_msg(ipport_equal(&test_ipp, ipv6 ? &list[test].assoc6.ip_port : &list[test].assoc4.ip_port), "Client IP_Port is incorrect");
+    ck_assert_msg(ipport_equal(&test_ipp, ipv6 ? &list[test].assoc6.ip_port : &list[test].assoc4.ip_port),
+                  "Client IP_Port is incorrect");
 
     // check ip_port update for existing id and ip_port (... port ... id ...)
     test1 = rand() % (length / 2);
@@ -112,11 +119,15 @@ void test_addto_lists_update(DHT            *dht,
 
     ipport_copy(&test_ipp, ipv6 ? &list[test1].assoc6.ip_port : &list[test1].assoc4.ip_port);
     id_copy(test_id, list[test2].client_id);
-    if (ipv6) list[test2].assoc6.ip_port.port = -1; else list[test2].assoc4.ip_port.port = -1;
+
+    if (ipv6) list[test2].assoc6.ip_port.port = -1;
+    else list[test2].assoc4.ip_port.port = -1;
+
     used = addto_lists(dht, test_ipp, test_id);
     ck_assert_msg(used >= 1, "Wrong number of added clients");
     ck_assert_msg(client_in_list(list, length, test_id) == test2, "Client id is not in the list");
-    ck_assert_msg(ipport_equal(&test_ipp, ipv6 ? &list[test2].assoc6.ip_port : &list[test2].assoc4.ip_port), "Client IP_Port is incorrect");
+    ck_assert_msg(ipport_equal(&test_ipp, ipv6 ? &list[test2].assoc6.ip_port : &list[test2].assoc4.ip_port),
+                  "Client IP_Port is incorrect");
 
     // check ip_port update for existing id and ip_port (... id ... port ...)
     test1 = rand() % (length / 2);
@@ -124,11 +135,15 @@ void test_addto_lists_update(DHT            *dht,
 
     ipport_copy(&test_ipp, ipv6 ? &list[test2].assoc6.ip_port : &list[test2].assoc4.ip_port);
     id_copy(test_id, list[test1].client_id);
-    if (ipv6) list[test1].assoc6.ip_port.port = -1; else list[test1].assoc4.ip_port.port = -1;
+
+    if (ipv6) list[test1].assoc6.ip_port.port = -1;
+    else list[test1].assoc4.ip_port.port = -1;
+
     used = addto_lists(dht, test_ipp, test_id);
     ck_assert_msg(used >= 1, "Wrong number of added clients");
     ck_assert_msg(client_in_list(list, length, test_id) == test1, "Client id is not in the list");
-    ck_assert_msg(ipport_equal(&test_ipp, ipv6 ? &list[test1].assoc6.ip_port : &list[test1].assoc4.ip_port), "Client IP_Port is incorrect");
+    ck_assert_msg(ipport_equal(&test_ipp, ipv6 ? &list[test1].assoc6.ip_port : &list[test1].assoc4.ip_port),
+                  "Client IP_Port is incorrect");
 }
 
 void test_addto_lists_bad(DHT            *dht,
@@ -149,9 +164,9 @@ void test_addto_lists_bad(DHT            *dht,
     test3 = rand() % (length / 3) + 2 * length / 3;
     ck_assert_msg(!(test1 == test2 || test1 == test3 || test2 == test3), "Wrong test indices are chosen");
 
-    id_copy((uint8_t*)&test_id1, list[test1].client_id);
-    id_copy((uint8_t*)&test_id2, list[test2].client_id);
-    id_copy((uint8_t*)&test_id3, list[test3].client_id);
+    id_copy((uint8_t *)&test_id1, list[test1].client_id);
+    id_copy((uint8_t *)&test_id2, list[test2].client_id);
+    id_copy((uint8_t *)&test_id3, list[test3].client_id);
 
     // mark nodes as "bad"
     if (ipv6) {
@@ -193,9 +208,9 @@ void test_addto_lists_possible_bad(DHT            *dht,
     test3 = rand() % (length / 3) + 2 * length / 3;
     ck_assert_msg(!(test1 == test2 || test1 == test3 || test2 == test3), "Wrong test indices are chosen");
 
-    id_copy((uint8_t*)&test_id1, list[test1].client_id);
-    id_copy((uint8_t*)&test_id2, list[test2].client_id);
-    id_copy((uint8_t*)&test_id3, list[test3].client_id);
+    id_copy((uint8_t *)&test_id1, list[test1].client_id);
+    id_copy((uint8_t *)&test_id2, list[test2].client_id);
+    id_copy((uint8_t *)&test_id3, list[test3].client_id);
 
     // mark nodes as "possibly bad"
     if (ipv6) {
@@ -221,14 +236,20 @@ void test_addto_lists_possible_bad(DHT            *dht,
     ck_assert_msg(inlist_id1 + inlist_id2 + inlist_id3 == 2, "Wrong client removed");
 
     if (!inlist_id1) {
-        ck_assert_msg(id_closest(comp_client_id, test_id2, test_id1) == 1, "Id has been removed but is closer to than another one");
-        ck_assert_msg(id_closest(comp_client_id, test_id3, test_id1) == 1, "Id has been removed but is closer to than another one");
+        ck_assert_msg(id_closest(comp_client_id, test_id2, test_id1) == 1,
+                      "Id has been removed but is closer to than another one");
+        ck_assert_msg(id_closest(comp_client_id, test_id3, test_id1) == 1,
+                      "Id has been removed but is closer to than another one");
     } else if (!inlist_id2) {
-        ck_assert_msg(id_closest(comp_client_id, test_id1, test_id2) == 1, "Id has been removed but is closer to than another one");
-        ck_assert_msg(id_closest(comp_client_id, test_id3, test_id2) == 1, "Id has been removed but is closer to than another one");
+        ck_assert_msg(id_closest(comp_client_id, test_id1, test_id2) == 1,
+                      "Id has been removed but is closer to than another one");
+        ck_assert_msg(id_closest(comp_client_id, test_id3, test_id2) == 1,
+                      "Id has been removed but is closer to than another one");
     } else if (!inlist_id3) {
-        ck_assert_msg(id_closest(comp_client_id, test_id1, test_id3) == 1, "Id has been removed but is closer to than another one");
-        ck_assert_msg(id_closest(comp_client_id, test_id2, test_id3) == 1, "Id has been removed but is closer to than another one");
+        ck_assert_msg(id_closest(comp_client_id, test_id1, test_id3) == 1,
+                      "Id has been removed but is closer to than another one");
+        ck_assert_msg(id_closest(comp_client_id, test_id2, test_id3) == 1,
+                      "Id has been removed but is closer to than another one");
     }
 }
 
@@ -247,6 +268,7 @@ void test_addto_lists_good(DHT            *dht,
     do {
         randombytes(client_id, sizeof(client_id));
     } while (is_furthest(comp_client_id, list, length, client_id));
+
     ip_port->port += 1;
     addto_lists(dht, *ip_port, client_id);
     ck_assert_msg(client_in_list(list, length, client_id) >= 0, "Good client id is not in the list");
@@ -263,10 +285,10 @@ void test_addto_lists_good(DHT            *dht,
 
 void test_addto_lists(IP ip)
 {
-    Networking_Core* net = new_networking(ip, TOX_PORT_DEFAULT);
+    Networking_Core *net = new_networking(ip, TOX_PORT_DEFAULT);
     ck_assert_msg(net != 0, "Failed to create Networking_Core");
 
-    DHT* dht = new_DHT(net);
+    DHT *dht = new_DHT(net);
     ck_assert_msg(dht != 0, "Failed to create DHT");
 
     IP_Port ip_port = { .ip = ip, .port = TOX_PORT_DEFAULT };
@@ -296,23 +318,29 @@ void test_addto_lists(IP ip)
     /*check: Current behavior if there are two clients with the same id is
      * to replace the first ip by the second. */
     test_addto_lists_update(dht, dht->close_clientlist, LCLIENT_LIST, &ip_port);
+
     for (i = 0; i < dht->num_friends; ++i)
         test_addto_lists_update(dht, dht->friends_list[i].client_list, MAX_FRIEND_CLIENTS, &ip_port);
 
     // check "bad" entries
     test_addto_lists_bad(dht, dht->close_clientlist, LCLIENT_LIST, &ip_port);
+
     for (i = 0; i < dht->num_friends; ++i)
         test_addto_lists_bad(dht, dht->friends_list[i].client_list, MAX_FRIEND_CLIENTS, &ip_port);
 
     // check "possibly bad" entries
     test_addto_lists_possible_bad(dht, dht->close_clientlist, LCLIENT_LIST, &ip_port, dht->self_public_key);
+
     for (i = 0; i < dht->num_friends; ++i)
-        test_addto_lists_possible_bad(dht, dht->friends_list[i].client_list, MAX_FRIEND_CLIENTS, &ip_port, dht->friends_list[i].client_id);
+        test_addto_lists_possible_bad(dht, dht->friends_list[i].client_list, MAX_FRIEND_CLIENTS, &ip_port,
+                                      dht->friends_list[i].client_id);
 
     // check "good" entries
     test_addto_lists_good(dht, dht->close_clientlist, LCLIENT_LIST, &ip_port, dht->self_public_key);
+
     for (i = 0; i < dht->num_friends; ++i)
-        test_addto_lists_good(dht, dht->friends_list[i].client_list, MAX_FRIEND_CLIENTS, &ip_port, dht->friends_list[i].client_id);
+        test_addto_lists_good(dht, dht->friends_list[i].client_list, MAX_FRIEND_CLIENTS, &ip_port,
+                              dht->friends_list[i].client_id);
 
     kill_DHT(dht);
     kill_networking(net);
diff --git a/auto_tests/encryptsave_test.c b/auto_tests/encryptsave_test.c
index 3045fbfa..aa5bef3f 100644
--- a/auto_tests/encryptsave_test.c
+++ b/auto_tests/encryptsave_test.c
@@ -20,12 +20,12 @@
 #include "../toxencryptsave/crypto_pwhash_scryptsalsa208sha256/utils.h" /* sodium_memzero */
 #endif
 
-unsigned char salt[32] = {0xB1,0xC2,0x09,0xEE,0x50,0x6C,0xF0,0x20,0xC4,0xD6,0xEB,0xC0,0x44,0x51,0x3B,0x60,0x4B,0x39,0x4A,0xCF,0x09,0x53,0x4F,0xEA,0x08,0x41,0xFA,0xCA,0x66,0xD2,0x68,0x7F};
+unsigned char salt[32] = {0xB1, 0xC2, 0x09, 0xEE, 0x50, 0x6C, 0xF0, 0x20, 0xC4, 0xD6, 0xEB, 0xC0, 0x44, 0x51, 0x3B, 0x60, 0x4B, 0x39, 0x4A, 0xCF, 0x09, 0x53, 0x4F, 0xEA, 0x08, 0x41, 0xFA, 0xCA, 0x66, 0xD2, 0x68, 0x7F};
 unsigned char known_key[crypto_box_BEFORENMBYTES] = {0x29, 0x36, 0x1c, 0x9e, 0x65, 0xbb, 0x46, 0x8b, 0xde, 0xa1, 0xac, 0xf, 0xd5, 0x11, 0x81, 0xc8, 0x29, 0x28, 0x17, 0x23, 0xa6, 0xc3, 0x6b, 0x77, 0x2e, 0xd7, 0xd3, 0x10, 0xeb, 0xd2, 0xf7, 0xc8};
-char* pw = "hunter2";
+char *pw = "hunter2";
 unsigned int pwlen = 7;
 
-unsigned char known_key2[crypto_box_BEFORENMBYTES] = {0x7a, 0xfa, 0x95, 0x45, 0x36, 0x8a, 0xa2, 0x5c, 0x40, 0xfd, 0xc0, 0xe2, 0x35, 0x8, 0x7, 0x88, 0xfa, 0xf9, 0x37, 0x86, 0xeb, 0xff, 0x50, 0x4f, 0x3, 0xe2, 0xf6, 0xd9, 0xef, 0x9, 0x17, 0x1}; 
+unsigned char known_key2[crypto_box_BEFORENMBYTES] = {0x7a, 0xfa, 0x95, 0x45, 0x36, 0x8a, 0xa2, 0x5c, 0x40, 0xfd, 0xc0, 0xe2, 0x35, 0x8, 0x7, 0x88, 0xfa, 0xf9, 0x37, 0x86, 0xeb, 0xff, 0x50, 0x4f, 0x3, 0xe2, 0xf6, 0xd9, 0xef, 0x9, 0x17, 0x1};
 // 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 */
@@ -49,7 +49,7 @@ START_TEST(test_known_kdf)
                                        salt,
                                        crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE * 8,
                                        crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE);
-     ck_assert_msg(memcmp(out, known_key, crypto_box_BEFORENMBYTES) == 0, "derived key is wrong");
+    ck_assert_msg(memcmp(out, known_key, crypto_box_BEFORENMBYTES) == 0, "derived key is wrong");
 }
 END_TEST
 
@@ -82,13 +82,14 @@ START_TEST(test_save_friend)
     size = tox_encrypted_size(tox3);
     uint8_t data2[size];
     uint8_t key[32 + crypto_box_BEFORENMBYTES];
-    memcpy(key, salt, 32); memcpy(key+32, known_key2, crypto_box_BEFORENMBYTES);
+    memcpy(key, salt, 32);
+    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);
+    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];
@@ -106,7 +107,7 @@ 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);
+    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];
@@ -120,29 +121,29 @@ START_TEST(test_keys)
 {
     uint8_t key[tox_pass_key_length()];
     tox_derive_key_from_pass("123qweasdzxc", 12, key);
-    uint8_t* string = "No Patrick, mayonnaise is not an instrument."; // 44
+    uint8_t *string = "No Patrick, mayonnaise is not an instrument."; // 44
 
-    uint8_t encrypted[44+tox_pass_encryption_extra_length()];
+    uint8_t encrypted[44 + tox_pass_encryption_extra_length()];
     int sz = tox_pass_key_encrypt(string, 44, key, encrypted);
 
-    uint8_t encrypted2[44+tox_pass_encryption_extra_length()];
+    uint8_t encrypted2[44 + tox_pass_encryption_extra_length()];
     int sz2 = tox_pass_encrypt(string, 44, "123qweasdzxc", 12, encrypted2);
 
     ck_assert_msg(sz == sz2, "an encryption failed");
 
-    uint8_t out1[44+tox_pass_encryption_extra_length()];
-    uint8_t out2[44+tox_pass_encryption_extra_length()];
+    uint8_t out1[44 + tox_pass_encryption_extra_length()];
+    uint8_t out2[44 + tox_pass_encryption_extra_length()];
 
-    sz = tox_pass_key_decrypt(encrypted, 44+tox_pass_encryption_extra_length(), key, out1);
+    sz = tox_pass_key_decrypt(encrypted, 44 + tox_pass_encryption_extra_length(), key, out1);
     ck_assert_msg(sz == 44, "sz isn't right");
     ck_assert_msg(memcmp(out1, string, 44) == 0, "decryption 1 failed");
 
-    sz2 = tox_pass_decrypt(encrypted2, 44+tox_pass_encryption_extra_length(), "123qweasdzxc", 12, out2);
+    sz2 = tox_pass_decrypt(encrypted2, 44 + tox_pass_encryption_extra_length(), "123qweasdzxc", 12, out2);
     ck_assert_msg(sz2 == 44, "sz2 isn't right");
     ck_assert_msg(memcmp(out2, string, 44) == 0, "decryption 2 failed");
 
     // test that pass_decrypt can decrypt things from pass_key_encrypt
-    sz = tox_pass_decrypt(encrypted, 44+tox_pass_encryption_extra_length(), "123qweasdzxc", 12, out1);
+    sz = tox_pass_decrypt(encrypted, 44 + tox_pass_encryption_extra_length(), "123qweasdzxc", 12, out1);
     ck_assert_msg(sz == 44, "sz isn't right");
     ck_assert_msg(memcmp(out1, string, 44) == 0, "decryption 3 failed");
 
@@ -154,7 +155,7 @@ START_TEST(test_keys)
 }
 END_TEST
 
-Suite * encryptsave_suite(void)
+Suite *encryptsave_suite(void)
 {
     Suite *s = suite_create("encryptsave");
 
@@ -169,7 +170,7 @@ int main(int argc, char *argv[])
 {
     srand((unsigned int) time(NULL));
 
-    Suite * encryptsave =  encryptsave_suite();
+    Suite *encryptsave =  encryptsave_suite();
     SRunner *test_runner = srunner_create(encryptsave);
 
     int number_failed = 0;
diff --git a/auto_tests/tox_test.c b/auto_tests/tox_test.c
index 6d837661..65ce304c 100644
--- a/auto_tests/tox_test.c
+++ b/auto_tests/tox_test.c
@@ -79,10 +79,11 @@ int handle_custom_packet(void *object, const uint8_t *data, uint32_t len)
 
     uint8_t f_data[len];
     memset(f_data, number, len);
+
     if (memcmp(f_data, data, len) == 0) {
         ++custom_packet;
     } else {
-        printf("Custom packet fail. %u\n",number );
+        printf("Custom packet fail. %u\n", number );
     }
 
     return 0;
@@ -277,7 +278,7 @@ START_TEST(test_few_clients)
 
         c_sleep(50);
     }
-    
+
     packet_number = 200;
     ret = tox_lossy_packet_registerhandler(tox3, 0, packet_number, handle_custom_packet, &packet_number);
     ck_assert_msg(ret == 0, "tox_lossy_packet_registerhandler fail %i", ret);