diff options
author | iphydf <iphydf@users.noreply.github.com> | 2018-07-05 10:31:29 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2018-07-05 23:09:28 +0000 |
commit | 8739f7fccb7cafc54ca0f5fa074c9a740f7048ba (patch) | |
tree | 88e9f53fa6e734cd8095487d1896c56f844c782c /auto_tests/dht_test.c | |
parent | 64d0297acc7d6a1697683052e15cc76383312c38 (diff) |
Make tox.c unambiguously parseable.
Rules:
1. Constants are uppercase names: THE_CONSTANT.
2. SUE[1] types start with an uppercase letter and have at least one
lowercase letter in it: The_Type, THE_Type.
3. Function types end in "_cb": tox_friend_connection_cb.
4. Variable and function names are all lowercase: the_function.
This makes it easier for humans reading the code to determine what an
identifier means. I'm not convinced by the enum type name change, but I
don't know a better rule. Currently, a lot of enum types are spelled like
constants, which is confusing.
[1] struct/union/enum
Diffstat (limited to 'auto_tests/dht_test.c')
-rw-r--r-- | auto_tests/dht_test.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/auto_tests/dht_test.c b/auto_tests/dht_test.c index d51825ab..a63a55b0 100644 --- a/auto_tests/dht_test.c +++ b/auto_tests/dht_test.c | |||
@@ -330,7 +330,7 @@ static void test_addto_lists(IP ip) | |||
330 | Networking_Core *net = new_networking(log, ip, TOX_PORT_DEFAULT); | 330 | Networking_Core *net = new_networking(log, ip, TOX_PORT_DEFAULT); |
331 | ck_assert_msg(net != nullptr, "Failed to create Networking_Core"); | 331 | ck_assert_msg(net != nullptr, "Failed to create Networking_Core"); |
332 | 332 | ||
333 | DHT *dht = new_DHT(log, net, true); | 333 | DHT *dht = new_dht(log, net, true); |
334 | ck_assert_msg(dht != nullptr, "Failed to create DHT"); | 334 | ck_assert_msg(dht != nullptr, "Failed to create DHT"); |
335 | 335 | ||
336 | IP_Port ip_port; | 336 | IP_Port ip_port; |
@@ -391,7 +391,7 @@ static void test_addto_lists(IP ip) | |||
391 | test_addto_lists_good(dht, dht->friends_list[i].client_list, MAX_FRIEND_CLIENTS, &ip_port, | 391 | test_addto_lists_good(dht, dht->friends_list[i].client_list, MAX_FRIEND_CLIENTS, &ip_port, |
392 | dht->friends_list[i].public_key); | 392 | dht->friends_list[i].public_key); |
393 | 393 | ||
394 | kill_DHT(dht); | 394 | kill_dht(dht); |
395 | kill_networking(net); | 395 | kill_networking(net); |
396 | logger_kill(log); | 396 | logger_kill(log); |
397 | } | 397 | } |
@@ -475,7 +475,7 @@ static void test_list_main(void) | |||
475 | index[i] = i + 1; | 475 | index[i] = i + 1; |
476 | logger_callback_log(logs[i], (logger_cb *)print_debug_log, nullptr, &index[i]); | 476 | logger_callback_log(logs[i], (logger_cb *)print_debug_log, nullptr, &index[i]); |
477 | 477 | ||
478 | dhts[i] = new_DHT(logs[i], new_networking(logs[i], ip, DHT_DEFAULT_PORT + i), true); | 478 | dhts[i] = new_dht(logs[i], new_networking(logs[i], ip, DHT_DEFAULT_PORT + i), true); |
479 | ck_assert_msg(dhts[i] != nullptr, "Failed to create dht instances %u", i); | 479 | ck_assert_msg(dhts[i] != nullptr, "Failed to create dht instances %u", i); |
480 | ck_assert_msg(net_port(dhts[i]->net) != DHT_DEFAULT_PORT + i, | 480 | ck_assert_msg(net_port(dhts[i]->net) != DHT_DEFAULT_PORT + i, |
481 | "Bound to wrong port: %d", net_port(dhts[i]->net)); | 481 | "Bound to wrong port: %d", net_port(dhts[i]->net)); |
@@ -580,7 +580,7 @@ static void test_list_main(void) | |||
580 | 580 | ||
581 | for (i = 0; i < NUM_DHT; ++i) { | 581 | for (i = 0; i < NUM_DHT; ++i) { |
582 | Networking_Core *n = dhts[i]->net; | 582 | Networking_Core *n = dhts[i]->net; |
583 | kill_DHT(dhts[i]); | 583 | kill_dht(dhts[i]); |
584 | kill_networking(n); | 584 | kill_networking(n); |
585 | logger_kill(logs[i]); | 585 | logger_kill(logs[i]); |
586 | } | 586 | } |
@@ -620,7 +620,7 @@ START_TEST(test_DHT_test) | |||
620 | index[i] = i + 1; | 620 | index[i] = i + 1; |
621 | logger_callback_log(logs[i], (logger_cb *)print_debug_log, nullptr, &index[i]); | 621 | logger_callback_log(logs[i], (logger_cb *)print_debug_log, nullptr, &index[i]); |
622 | 622 | ||
623 | dhts[i] = new_DHT(logs[i], new_networking(logs[i], ip, DHT_DEFAULT_PORT + i), true); | 623 | dhts[i] = new_dht(logs[i], new_networking(logs[i], ip, DHT_DEFAULT_PORT + i), true); |
624 | ck_assert_msg(dhts[i] != nullptr, "Failed to create dht instances %u", i); | 624 | ck_assert_msg(dhts[i] != nullptr, "Failed to create dht instances %u", i); |
625 | ck_assert_msg(net_port(dhts[i]->net) != DHT_DEFAULT_PORT + i, "Bound to wrong port"); | 625 | ck_assert_msg(net_port(dhts[i]->net) != DHT_DEFAULT_PORT + i, "Bound to wrong port"); |
626 | } | 626 | } |
@@ -642,7 +642,7 @@ loop_top: | |||
642 | } | 642 | } |
643 | 643 | ||
644 | uint16_t lock_count = 0; | 644 | uint16_t lock_count = 0; |
645 | ck_assert_msg(DHT_addfriend(dhts[pairs[i].tox2], dhts[pairs[i].tox1]->self_public_key, &ip_callback, &to_comp, 1337, | 645 | ck_assert_msg(dht_addfriend(dhts[pairs[i].tox2], dhts[pairs[i].tox1]->self_public_key, &ip_callback, &to_comp, 1337, |
646 | &lock_count) == 0, "Failed to add friend"); | 646 | &lock_count) == 0, "Failed to add friend"); |
647 | ck_assert_msg(lock_count == 1, "bad lock count: %u %u", lock_count, i); | 647 | ck_assert_msg(lock_count == 1, "bad lock count: %u %u", lock_count, i); |
648 | } | 648 | } |
@@ -651,7 +651,7 @@ loop_top: | |||
651 | IP_Port ip_port; | 651 | IP_Port ip_port; |
652 | ip_port.ip = get_loopback(); | 652 | ip_port.ip = get_loopback(); |
653 | ip_port.port = net_htons(DHT_DEFAULT_PORT + i); | 653 | ip_port.port = net_htons(DHT_DEFAULT_PORT + i); |
654 | DHT_bootstrap(dhts[(i - 1) % NUM_DHT], ip_port, dhts[i]->self_public_key); | 654 | dht_bootstrap(dhts[(i - 1) % NUM_DHT], ip_port, dhts[i]->self_public_key); |
655 | } | 655 | } |
656 | 656 | ||
657 | while (1) { | 657 | while (1) { |
@@ -660,7 +660,7 @@ loop_top: | |||
660 | for (i = 0; i < NUM_DHT_FRIENDS; ++i) { | 660 | for (i = 0; i < NUM_DHT_FRIENDS; ++i) { |
661 | IP_Port a; | 661 | IP_Port a; |
662 | 662 | ||
663 | if (DHT_getfriendip(dhts[pairs[i].tox2], dhts[pairs[i].tox1]->self_public_key, &a) == 1) { | 663 | if (dht_getfriendip(dhts[pairs[i].tox2], dhts[pairs[i].tox1]->self_public_key, &a) == 1) { |
664 | ++counter; | 664 | ++counter; |
665 | } | 665 | } |
666 | } | 666 | } |
@@ -671,7 +671,7 @@ loop_top: | |||
671 | 671 | ||
672 | for (i = 0; i < NUM_DHT; ++i) { | 672 | for (i = 0; i < NUM_DHT; ++i) { |
673 | networking_poll(dhts[i]->net, nullptr); | 673 | networking_poll(dhts[i]->net, nullptr); |
674 | do_DHT(dhts[i]); | 674 | do_dht(dhts[i]); |
675 | } | 675 | } |
676 | 676 | ||
677 | c_sleep(500); | 677 | c_sleep(500); |
@@ -679,7 +679,7 @@ loop_top: | |||
679 | 679 | ||
680 | for (i = 0; i < NUM_DHT; ++i) { | 680 | for (i = 0; i < NUM_DHT; ++i) { |
681 | Networking_Core *n = dhts[i]->net; | 681 | Networking_Core *n = dhts[i]->net; |
682 | kill_DHT(dhts[i]); | 682 | kill_dht(dhts[i]); |
683 | kill_networking(n); | 683 | kill_networking(n); |
684 | logger_kill(logs[i]); | 684 | logger_kill(logs[i]); |
685 | } | 685 | } |
@@ -694,7 +694,7 @@ START_TEST(test_dht_create_packet) | |||
694 | uint8_t key[CRYPTO_SYMMETRIC_KEY_SIZE]; | 694 | uint8_t key[CRYPTO_SYMMETRIC_KEY_SIZE]; |
695 | new_symmetric_key(key); | 695 | new_symmetric_key(key); |
696 | 696 | ||
697 | int length = DHT_create_packet(key, key, NET_PACKET_GET_NODES, plain, sizeof(plain), pkt); | 697 | int length = dht_create_packet(key, key, NET_PACKET_GET_NODES, plain, sizeof(plain), pkt); |
698 | 698 | ||
699 | ck_assert_msg(pkt[0] == NET_PACKET_GET_NODES, "Malformed packet."); | 699 | ck_assert_msg(pkt[0] == NET_PACKET_GET_NODES, "Malformed packet."); |
700 | ck_assert_msg(memcmp(pkt + 1, key, CRYPTO_SYMMETRIC_KEY_SIZE) == 0, "Malformed packet."); | 700 | ck_assert_msg(memcmp(pkt + 1, key, CRYPTO_SYMMETRIC_KEY_SIZE) == 0, "Malformed packet."); |