Test fix.

This commit is contained in:
irungentoo 2016-01-04 22:59:29 -05:00
parent 405854e1e7
commit b9ef24875c
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98

View File

@ -409,152 +409,123 @@ void test_add_to_list(uint8_t cmp_list[][crypto_box_PUBLICKEYBYTES + 1], unsigne
} }
} }
#define NUM_DHT 100
void test_list_main() void test_list_main()
{ {
uint8_t keys[DHT_LIST_LENGTH][crypto_box_PUBLICKEYBYTES]; DHT *dhts[NUM_DHT];
uint8_t cmp_list1[LCLIENT_LIST][crypto_box_PUBLICKEYBYTES + 1];
uint8_t cmp_list2[LCLIENT_LIST][crypto_box_PUBLICKEYBYTES + 1];
uint8_t cmp_list1[NUM_DHT][MAX_FRIEND_CLIENTS][crypto_box_PUBLICKEYBYTES + 1];
memset(cmp_list1, 0, sizeof(cmp_list1)); memset(cmp_list1, 0, sizeof(cmp_list1));
memset(cmp_list2, 0, sizeof(cmp_list2));
IP ip; IP ip;
ip_init(&ip, 1); ip_init(&ip, 1);
unsigned int i, j; unsigned int i, j, k, l;
for (i = 0; i < DHT_LIST_LENGTH; ++i) { for (i = 0; i < NUM_DHT; ++i) {
for (j = 0; j < crypto_box_PUBLICKEYBYTES; ++j) IP ip;
keys[i][j] = rand(); ip_init(&ip, 1);
dhts[i] = new_DHT(new_networking(ip, DHT_DEFAULT_PORT + i));
ck_assert_msg(dhts[i] != 0, "Failed to create dht instances %u", i);
ck_assert_msg(dhts[i]->net->port != DHT_DEFAULT_PORT + i, "Bound to wrong port");
} }
DHT *dht1 = new_DHT(new_networking(ip, DHT_DEFAULT_PORT)), *dht2 = new_DHT(new_networking(ip, DHT_DEFAULT_PORT + 1)); for (j = 0; j < NUM_DHT; ++j) {
for (i = 1; i < NUM_DHT; ++i) {
test_add_to_list(cmp_list1[j], MAX_FRIEND_CLIENTS, dhts[(i + j) % NUM_DHT]->self_public_key, dhts[j]->self_public_key);
}
}
ck_assert_msg(dht1 && dht2, "Failed to create DHTs"); for (j = 0; j < NUM_DHT; ++j) {
memcpy(dht2->self_public_key, dht1->self_public_key, crypto_box_PUBLICKEYBYTES); for (i = 0; i < NUM_DHT; ++i) {
memcpy(dht2->self_secret_key, dht1->self_secret_key, crypto_box_SECRETKEYBYTES); if (i == j)
continue;
for (i = 0; i < DHT_LIST_LENGTH; ++i) {
IP_Port ip_port; IP_Port ip_port;
ip_init(&ip_port.ip, 0); ip_init(&ip_port.ip, 0);
ip_port.ip.ip4.uint32 = rand(); ip_port.ip.ip4.uint32 = rand();
ip_port.port = rand() % (UINT16_MAX - 1); ip_port.port = rand() % (UINT16_MAX - 1);
++ip_port.port; ++ip_port.port;
addto_lists(dht1, ip_port, keys[i]); addto_lists(dhts[j], ip_port, dhts[i]->self_public_key);
}
ip_init(&ip_port.ip, 0);
ip_port.ip.ip4.uint32 = rand();
ip_port.port = rand() % (UINT16_MAX - 1);
++ip_port.port;
addto_lists(dht2, ip_port, keys[(DHT_LIST_LENGTH - (i + 1))]);
test_add_to_list(cmp_list1, LCLIENT_LIST, keys[i], dht1->self_public_key);
test_add_to_list(cmp_list2, LCLIENT_LIST, keys[(DHT_LIST_LENGTH - (i + 1))], dht2->self_public_key);
} }
/* /*
for (i = 0; i < LCLIENT_LIST; ++i) { print_pk(dhts[0]->self_public_key);
for (i = 0; i < MAX_FRIEND_CLIENTS; ++i) {
printf("----Entry %u----\n", i); printf("----Entry %u----\n", i);
print_pk(cmp_list1[i]); print_pk(cmp_list1[i]);
print_pk(cmp_list2[i]);
print_pk(dht1->close_clientlist[i].public_key);
print_pk(dht2->close_clientlist[i].public_key);
} }
*/ */
for (i = 0; i < LCLIENT_LIST; ++i) { unsigned int m_count = 0;
uint8_t *pk = cmp_list1[i];
for (l = 0; l < NUM_DHT; ++l) {
for (i = 0; i < MAX_FRIEND_CLIENTS; ++i) {
for (j = 1; j < NUM_DHT; ++j) {
if (memcmp(cmp_list1[l][i], dhts[(l + j) % NUM_DHT]->self_public_key, crypto_box_PUBLICKEYBYTES) != 0)
continue;
unsigned int count = 0; unsigned int count = 0;
for (j = 0; j < LCLIENT_LIST; ++j) { for (k = 0; k < LCLIENT_LIST; ++k) {
if (memcmp(pk, cmp_list2[j], crypto_box_PUBLICKEYBYTES) == 0) if (memcmp(dhts[l]->self_public_key, dhts[(l + j) % NUM_DHT]->close_clientlist[k].public_key,
crypto_box_PUBLICKEYBYTES) == 0)
++count; ++count;
} }
ck_assert_msg(count == 1, "Bad distance formula"); if (count != 1) {
print_pk(dhts[l]->self_public_key);
for (k = 0; k < MAX_FRIEND_CLIENTS; ++k) {
printf("----Entry %u----\n", k);
print_pk(cmp_list1[l][k]);
} }
for (i = 0; i < LCLIENT_LIST; ++i) { for (k = 0; k < LCLIENT_LIST; ++k) {
uint8_t *pk = cmp_list1[i]; printf("----Closel %u----\n", k);
print_pk(dhts[(l + j) % NUM_DHT]->close_clientlist[k].public_key);
}
unsigned int count = 0; print_pk(dhts[(l + j) % NUM_DHT]->self_public_key);
}
for (j = 0; j < LCLIENT_LIST; ++j) { ck_assert_msg(count == 1, "Nodes in search don't know ip of friend. %u %u %u", i, j, count);
if (memcmp(pk, dht1->close_clientlist[j].public_key, crypto_box_PUBLICKEYBYTES) == 0)
Node_format ln[MAX_SENT_NODES];
int n = get_close_nodes(dhts[(l + j) % NUM_DHT], dhts[l]->self_public_key, ln, 0, 1, 0);
ck_assert_msg(n == MAX_SENT_NODES, "bad num close %u | %u %u", n, i, j);
count = 0;
for (k = 0; k < MAX_SENT_NODES; ++k) {
if (memcmp(dhts[l]->self_public_key, ln[k].public_key, crypto_box_PUBLICKEYBYTES) == 0)
++count; ++count;
} }
ck_assert_msg(count == 1, "Keys not in first close list, %u, %X %X", i, cmp_list1[i][0], dht1->self_public_key[0]); ck_assert_msg(count == 1, "Nodes in search don't know ip of friend. %u %u %u", i, j, count);
for (j = 0; j < LCLIENT_LIST; ++j) {
if (memcmp(pk, dht2->close_clientlist[j].public_key, crypto_box_PUBLICKEYBYTES) == 0)
++count;
}
ck_assert_msg(count == 2, "Keys not in second close list, %u, %X %X", i, cmp_list1[i][0], dht2->self_public_key[0]);
}
uint8_t cmp_list3[MAX_SENT_NODES][crypto_box_PUBLICKEYBYTES + 1];
memset(cmp_list3, 0, sizeof(cmp_list3));
for (i = 0; i < DHT_LIST_LENGTH; ++i) {
test_add_to_list(cmp_list3, MAX_SENT_NODES, keys[i], dht1->self_public_key);
}
Node_format n_list[MAX_SENT_NODES];
ck_assert_msg(get_close_nodes(dht1, dht1->self_public_key, n_list, 0, 1, 0) == MAX_SENT_NODES,
"Wrong number of nodes returned");
/* /*
for (i = 0; i < MAX_SENT_NODES; ++i) { for (k = 0; k < MAX_SENT_NODES; ++k) {
printf("----Close %u----\n", i); printf("----gn %u----\n", k);
print_pk(ln[k].public_key);
print_pk(cmp_list3[i]); }*/
print_pk(n_list[i].public_key); ++m_count;
}
} }
*/
for (i = 0; i < MAX_SENT_NODES; ++i) {
uint8_t *pk = cmp_list3[i];
unsigned int count = 0;
for (j = 0; j < MAX_SENT_NODES; ++j) {
if (memcmp(pk, n_list[j].public_key, crypto_box_PUBLICKEYBYTES) == 0)
++count;
} }
ck_assert_msg(count == 1, "Bad get_close_nodes"); ck_assert_msg(m_count == (NUM_DHT) * (MAX_FRIEND_CLIENTS), "Bad count. %u != %u", m_count,
} (NUM_DHT) * (MAX_FRIEND_CLIENTS));
uint8_t cmp_new[crypto_box_PUBLICKEYBYTES]; for (i = 0; i < NUM_DHT; ++i) {
memcpy(cmp_new, cmp_list3[0], crypto_box_PUBLICKEYBYTES); void *n = dhts[i]->net;
ck_assert_msg(get_close_nodes(dht1, cmp_new, n_list, 0, 1, 0) == MAX_SENT_NODES, kill_DHT(dhts[i]);
"Wrong number of nodes returned");
memset(cmp_list3, 0, sizeof(cmp_list3));
for (i = 0; i < DHT_LIST_LENGTH; ++i) {
test_add_to_list(cmp_list3, MAX_SENT_NODES, keys[i], cmp_new);
}
for (i = 0; i < MAX_SENT_NODES; ++i) {
uint8_t *pk = cmp_list3[i];
unsigned int count = 0;
for (j = 0; j < MAX_SENT_NODES; ++j) {
if (memcmp(pk, n_list[j].public_key, crypto_box_PUBLICKEYBYTES) == 0)
++count;
}
ck_assert_msg(count == 1, "Bad get_close_nodes");
}
void *n = dht1->net;
kill_DHT(dht1);
kill_networking(n);
n = dht2->net;
kill_DHT(dht2);
kill_networking(n); kill_networking(n);
}
} }
@ -581,7 +552,6 @@ void ip_callback(void *data, int32_t number, IP_Port ip_port)
#define c_sleep(x) usleep(1000*x) #define c_sleep(x) usleep(1000*x)
#endif #endif
#define NUM_DHT 100
#define NUM_DHT_FRIENDS 20 #define NUM_DHT_FRIENDS 20
START_TEST(test_DHT_test) START_TEST(test_DHT_test)
@ -669,7 +639,7 @@ Suite *dht_suite(void)
//DEFTESTCASE(addto_lists_ipv4); //DEFTESTCASE(addto_lists_ipv4);
//DEFTESTCASE(addto_lists_ipv6); //DEFTESTCASE(addto_lists_ipv6);
DEFTESTCASE(list); DEFTESTCASE_SLOW(list, 20);
DEFTESTCASE_SLOW(DHT_test, 50); DEFTESTCASE_SLOW(DHT_test, 50);
return s; return s;
} }