diff options
Diffstat (limited to 'auto_tests/dht_test.c')
-rw-r--r-- | auto_tests/dht_test.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/auto_tests/dht_test.c b/auto_tests/dht_test.c index c04b67e4..5a4f8005 100644 --- a/auto_tests/dht_test.c +++ b/auto_tests/dht_test.c | |||
@@ -99,7 +99,7 @@ static void test_addto_lists_update(DHT *dht, | |||
99 | int used, test, test1, test2, found; | 99 | int used, test, test1, test2, found; |
100 | IP_Port test_ipp; | 100 | IP_Port test_ipp; |
101 | uint8_t test_id[CRYPTO_PUBLIC_KEY_SIZE]; | 101 | uint8_t test_id[CRYPTO_PUBLIC_KEY_SIZE]; |
102 | uint8_t ipv6 = ip_port->ip.family == AF_INET6 ? 1 : 0; | 102 | uint8_t ipv6 = ip_port->ip.family == TOX_AF_INET6 ? 1 : 0; |
103 | 103 | ||
104 | // check id update for existing ip_port | 104 | // check id update for existing ip_port |
105 | test = rand() % length; | 105 | test = rand() % length; |
@@ -174,7 +174,7 @@ static void test_addto_lists_bad(DHT *dht, | |||
174 | int used, test1, test2, test3; | 174 | int used, test1, test2, test3; |
175 | uint8_t public_key[CRYPTO_PUBLIC_KEY_SIZE], test_id1[CRYPTO_PUBLIC_KEY_SIZE], test_id2[CRYPTO_PUBLIC_KEY_SIZE], | 175 | uint8_t public_key[CRYPTO_PUBLIC_KEY_SIZE], test_id1[CRYPTO_PUBLIC_KEY_SIZE], test_id2[CRYPTO_PUBLIC_KEY_SIZE], |
176 | test_id3[CRYPTO_PUBLIC_KEY_SIZE]; | 176 | test_id3[CRYPTO_PUBLIC_KEY_SIZE]; |
177 | uint8_t ipv6 = ip_port->ip.family == AF_INET6 ? 1 : 0; | 177 | uint8_t ipv6 = ip_port->ip.family == TOX_AF_INET6 ? 1 : 0; |
178 | 178 | ||
179 | random_bytes(public_key, sizeof(public_key)); | 179 | random_bytes(public_key, sizeof(public_key)); |
180 | mark_all_good(list, length, ipv6); | 180 | mark_all_good(list, length, ipv6); |
@@ -218,7 +218,7 @@ static void test_addto_lists_possible_bad(DHT *dht, | |||
218 | int used, test1, test2, test3; | 218 | int used, test1, test2, test3; |
219 | uint8_t public_key[CRYPTO_PUBLIC_KEY_SIZE], test_id1[CRYPTO_PUBLIC_KEY_SIZE], test_id2[CRYPTO_PUBLIC_KEY_SIZE], | 219 | uint8_t public_key[CRYPTO_PUBLIC_KEY_SIZE], test_id1[CRYPTO_PUBLIC_KEY_SIZE], test_id2[CRYPTO_PUBLIC_KEY_SIZE], |
220 | test_id3[CRYPTO_PUBLIC_KEY_SIZE]; | 220 | test_id3[CRYPTO_PUBLIC_KEY_SIZE]; |
221 | uint8_t ipv6 = ip_port->ip.family == AF_INET6 ? 1 : 0; | 221 | uint8_t ipv6 = ip_port->ip.family == TOX_AF_INET6 ? 1 : 0; |
222 | 222 | ||
223 | random_bytes(public_key, sizeof(public_key)); | 223 | random_bytes(public_key, sizeof(public_key)); |
224 | mark_all_good(list, length, ipv6); | 224 | mark_all_good(list, length, ipv6); |
@@ -280,7 +280,7 @@ static void test_addto_lists_good(DHT *dht, | |||
280 | const uint8_t *comp_client_id) | 280 | const uint8_t *comp_client_id) |
281 | { | 281 | { |
282 | uint8_t public_key[CRYPTO_PUBLIC_KEY_SIZE]; | 282 | uint8_t public_key[CRYPTO_PUBLIC_KEY_SIZE]; |
283 | uint8_t ipv6 = ip_port->ip.family == AF_INET6 ? 1 : 0; | 283 | uint8_t ipv6 = ip_port->ip.family == TOX_AF_INET6 ? 1 : 0; |
284 | 284 | ||
285 | mark_all_good(list, length, ipv6); | 285 | mark_all_good(list, length, ipv6); |
286 | 286 | ||
@@ -703,10 +703,10 @@ static void random_ip(IP_Port *ipp, int family) | |||
703 | uint8_t *ip = NULL; | 703 | uint8_t *ip = NULL; |
704 | size_t size; | 704 | size_t size; |
705 | 705 | ||
706 | if (family == AF_INET || family == TCP_INET) { | 706 | if (family == TOX_AF_INET || family == TCP_INET) { |
707 | ip = (uint8_t *)&ipp->ip.ip4; | 707 | ip = (uint8_t *)&ipp->ip.ip4; |
708 | size = sizeof(ipp->ip.ip4); | 708 | size = sizeof(ipp->ip.ip4); |
709 | } else if (family == AF_INET6 || family == TCP_INET6) { | 709 | } else if (family == TOX_AF_INET6 || family == TCP_INET6) { |
710 | ip = (uint8_t *)&ipp->ip.ip6; | 710 | ip = (uint8_t *)&ipp->ip.ip6; |
711 | size = sizeof(ipp->ip.ip6); | 711 | size = sizeof(ipp->ip.ip6); |
712 | } else { | 712 | } else { |
@@ -734,18 +734,18 @@ START_TEST(test_dht_node_packing) | |||
734 | random_bytes(nodes[1].public_key, pk_size); | 734 | random_bytes(nodes[1].public_key, pk_size); |
735 | random_bytes(nodes[2].public_key, pk_size); | 735 | random_bytes(nodes[2].public_key, pk_size); |
736 | 736 | ||
737 | random_ip(&nodes[0].ip_port, AF_INET); | 737 | random_ip(&nodes[0].ip_port, TOX_AF_INET); |
738 | random_ip(&nodes[1].ip_port, AF_INET); | 738 | random_ip(&nodes[1].ip_port, TOX_AF_INET); |
739 | random_ip(&nodes[2].ip_port, AF_INET); | 739 | random_ip(&nodes[2].ip_port, TOX_AF_INET); |
740 | dht_pack_unpack(nodes, 3, data, length); | 740 | dht_pack_unpack(nodes, 3, data, length); |
741 | 741 | ||
742 | random_ip(&nodes[0].ip_port, AF_INET); | 742 | random_ip(&nodes[0].ip_port, TOX_AF_INET); |
743 | random_ip(&nodes[1].ip_port, AF_INET); | 743 | random_ip(&nodes[1].ip_port, TOX_AF_INET); |
744 | random_ip(&nodes[2].ip_port, TCP_INET); | 744 | random_ip(&nodes[2].ip_port, TCP_INET); |
745 | dht_pack_unpack(nodes, 3, data, length); | 745 | dht_pack_unpack(nodes, 3, data, length); |
746 | 746 | ||
747 | random_ip(&nodes[0].ip_port, AF_INET); | 747 | random_ip(&nodes[0].ip_port, TOX_AF_INET); |
748 | random_ip(&nodes[1].ip_port, AF_INET6); | 748 | random_ip(&nodes[1].ip_port, TOX_AF_INET6); |
749 | random_ip(&nodes[2].ip_port, TCP_INET6); | 749 | random_ip(&nodes[2].ip_port, TCP_INET6); |
750 | dht_pack_unpack(nodes, 3, data, length); | 750 | dht_pack_unpack(nodes, 3, data, length); |
751 | 751 | ||
@@ -754,9 +754,9 @@ START_TEST(test_dht_node_packing) | |||
754 | random_ip(&nodes[2].ip_port, TCP_INET); | 754 | random_ip(&nodes[2].ip_port, TCP_INET); |
755 | dht_pack_unpack(nodes, 3, data, length); | 755 | dht_pack_unpack(nodes, 3, data, length); |
756 | 756 | ||
757 | random_ip(&nodes[0].ip_port, AF_INET6); | 757 | random_ip(&nodes[0].ip_port, TOX_AF_INET6); |
758 | random_ip(&nodes[1].ip_port, AF_INET6); | 758 | random_ip(&nodes[1].ip_port, TOX_AF_INET6); |
759 | random_ip(&nodes[2].ip_port, AF_INET6); | 759 | random_ip(&nodes[2].ip_port, TOX_AF_INET6); |
760 | dht_pack_unpack(nodes, 3, data, length); | 760 | dht_pack_unpack(nodes, 3, data, length); |
761 | 761 | ||
762 | free(data); | 762 | free(data); |