5 files changed, 84 insertions, 7 deletions

diff --git a/auto_tests/TCP_test.c b/auto_tests/TCP_test.c
index 566013d7..e222cf01 100644
--- a/auto_tests/TCP_test.c
+++ b/auto_tests/TCP_test.c
@@ -118,6 +118,7 @@ START_TEST(test_basic)
     ck_assert_msg(packet_resp_plain[0] == 1, "wrong packet id %u", packet_resp_plain[0]);
     ck_assert_msg(packet_resp_plain[1] == 0, "connection not refused %u", packet_resp_plain[1]);
     ck_assert_msg(memcmp(packet_resp_plain + 2, f_public_key, crypto_box_PUBLICKEYBYTES) == 0, "key in packet wrong");
+    kill_TCP_server(tcp_s);
 }
 END_TEST
 
@@ -175,6 +176,12 @@ struct sec_TCP_con *new_TCP_con(TCP_Server *tcp_s)
     return sec_c;
 }
 
+void kill_TCP_con(struct sec_TCP_con *con)
+{
+    kill_sock(con->sock);
+    free(con);
+}
+
 int write_packet_TCP_secure_connection(struct sec_TCP_con *con, uint8_t *data, uint16_t length)
 {
     uint8_t packet[sizeof(uint16_t) + length + crypto_box_MACBYTES];
@@ -290,6 +297,10 @@ START_TEST(test_some)
     ck_assert_msg(len == sizeof(ping_packet), "wrong len %u", len);
     ck_assert_msg(data[0] == 5, "wrong packet id %u", data[0]);
     ck_assert_msg(memcmp(ping_packet + 1, data + 1, sizeof(uint64_t)) == 0, "wrong packet data");
+    kill_TCP_server(tcp_s);
+    kill_TCP_con(con1);
+    kill_TCP_con(con2);
+    kill_TCP_con(con3);
 }
 END_TEST
 
@@ -457,6 +468,9 @@ START_TEST(test_client)
     do_TCP_connection(conn2);
     ck_assert_msg(status_callback_good == 1, "status callback not called");
     ck_assert_msg(status_callback_status == 1, "wrong status");
+    kill_TCP_server(tcp_s);
+    kill_TCP_connection(conn);
+    kill_TCP_connection(conn2);
 }
 END_TEST
 
@@ -488,6 +502,8 @@ START_TEST(test_client_invalid)
     do_TCP_connection(conn);
     ck_assert_msg(conn->status == TCP_CLIENT_DISCONNECTED, "Wrong status. Expected: %u, is: %u", TCP_CLIENT_DISCONNECTED,
                   conn->status);
+
+    kill_TCP_connection(conn);
 }
 END_TEST
 
diff --git a/auto_tests/assoc_test.c b/auto_tests/assoc_test.c
index b377cadf..bcf5d3fa 100644
--- a/auto_tests/assoc_test.c
+++ b/auto_tests/assoc_test.c
@@ -55,6 +55,7 @@ START_TEST(test_basics)
 
     uint8_t found = Assoc_get_close_entries(assoc, &close_entries);
     ck_assert_msg(found == 1, "get_close_entries(): expected %u, got %u", 1, found);
+    kill_Assoc(assoc);
 }
 END_TEST
 
@@ -130,6 +131,7 @@ START_TEST(test_fillup)
 
     ck_assert_msg(good == 8, "Entries found were not the closest ones. Only %u/8 were.", good);
     //printf("good: %u %u %u\n", good, a, ((uint32_t)current_time() - a));
+    kill_Assoc(assoc);
 }
 END_TEST
 
diff --git a/auto_tests/encryptsave_test.c b/auto_tests/encryptsave_test.c
index aa5bef3f..338c9ef1 100644
--- a/auto_tests/encryptsave_test.c
+++ b/auto_tests/encryptsave_test.c
@@ -114,6 +114,12 @@ START_TEST(test_save_friend)
     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_kill(tox1);
+    tox_kill(tox2);
+    tox_kill(tox3);
+    tox_kill(tox4);
+    tox_kill(tox5);
 }
 END_TEST
 
@@ -160,8 +166,8 @@ Suite *encryptsave_suite(void)
     Suite *s = suite_create("encryptsave");
 
     DEFTESTCASE_SLOW(known_kdf, 60); /* is 5-10 seconds on my computer, but is directly dependent on CPU */
-    DEFTESTCASE(save_friend);
-    DEFTESTCASE(keys);
+    DEFTESTCASE_SLOW(save_friend, 20);
+    DEFTESTCASE_SLOW(keys, 30);
 
     return s;
 }
diff --git a/auto_tests/onion_test.c b/auto_tests/onion_test.c
index 8e10eb11..f27fefb8 100644
--- a/auto_tests/onion_test.c
+++ b/auto_tests/onion_test.c
@@ -138,12 +138,12 @@ START_TEST(test_basic)
 
     IP_Port on1 = {ip, onion1->net->port};
     Node_format n1;
-    memcpy(n1.client_id, onion1->dht->self_public_key, crypto_box_PUBLICKEYBYTES);
+    memcpy(n1.public_key, onion1->dht->self_public_key, crypto_box_PUBLICKEYBYTES);
     n1.ip_port = on1;
 
     IP_Port on2 = {ip, onion2->net->port};
     Node_format n2;
-    memcpy(n2.client_id, onion2->dht->self_public_key, crypto_box_PUBLICKEYBYTES);
+    memcpy(n2.public_key, onion2->dht->self_public_key, crypto_box_PUBLICKEYBYTES);
     n2.ip_port = on2;
 
     Node_format nodes[4];
@@ -180,7 +180,7 @@ START_TEST(test_basic)
     randombytes(sb_data, sizeof(sb_data));
     uint64_t s;
     memcpy(&s, sb_data, sizeof(uint64_t));
-    memcpy(test_3_pub_key, nodes[3].client_id, crypto_box_PUBLICKEYBYTES);
+    memcpy(test_3_pub_key, nodes[3].public_key, crypto_box_PUBLICKEYBYTES);
     ret = send_announce_request(onion1->net, &path, nodes[3], onion1->dht->self_public_key,
                                 onion1->dht->self_secret_key,
                                 zeroes, onion1->dht->self_public_key, onion1->dht->self_public_key, s);
@@ -224,6 +224,39 @@ START_TEST(test_basic)
         do_onion(onion2);
         c_sleep(50);
     }
+
+    kill_onion_announce(onion1_a);
+    kill_onion_announce(onion2_a);
+
+    {
+        Onion *onion = onion1;
+
+        Networking_Core *net = onion->dht->net;
+        DHT *dht = onion->dht;
+        kill_onion(onion);
+        kill_DHT(dht);
+        kill_networking(net);
+    }
+
+    {
+        Onion *onion = onion2;
+
+        Networking_Core *net = onion->dht->net;
+        DHT *dht = onion->dht;
+        kill_onion(onion);
+        kill_DHT(dht);
+        kill_networking(net);
+    }
+
+    {
+        Onion *onion = onion3;
+
+        Networking_Core *net = onion->dht->net;
+        DHT *dht = onion->dht;
+        kill_onion(onion);
+        kill_DHT(dht);
+        kill_networking(net);
+    }
 }
 END_TEST
 
@@ -257,6 +290,18 @@ void do_onions(Onions *on)
     do_onion_client(on->onion_c);
 }
 
+void kill_onions(Onions *on)
+{
+    Networking_Core *net = on->onion->dht->net;
+    DHT *dht = on->onion->dht;
+    kill_onion_client(on->onion_c);
+    kill_onion_announce(on->onion_a);
+    kill_onion(on->onion);
+    kill_DHT(dht);
+    kill_networking(net);
+    free(on);
+}
+
 #define NUM_ONIONS 50
 
 START_TEST(test_announce)
@@ -334,6 +379,10 @@ START_TEST(test_announce)
     }
 
     ck_assert_msg(ip_port.port == onions[7]->onion->net->port, "Port in returned ip not correct.");
+
+    for (i = 0; i < NUM_ONIONS; ++i) {
+        kill_onions(onions[i]);
+    }
 }
 END_TEST
 
diff --git a/auto_tests/toxav_basic_test.c b/auto_tests/toxav_basic_test.c
index db1db3fb..3139c844 100644
--- a/auto_tests/toxav_basic_test.c
+++ b/auto_tests/toxav_basic_test.c
@@ -595,8 +595,12 @@ START_TEST(test_AV_flows)
         printf("\n");
     }
 
-
-
+    vpx_img_free(sample_image);
+    toxav_kill(status_control.Alice.av);
+    toxav_kill(status_control.Bob.av);
+    tox_kill(bootstrap_node);
+    tox_kill(Alice);
+    tox_kill(Bob);
 
     printf("Calls ended!\n");
 }