diff options
author | Diadlo <polsha3@gmail.com> | 2017-03-18 22:22:28 +0300 |
---|---|---|
committer | Diadlo <polsha3@gmail.com> | 2017-08-24 21:09:40 +0300 |
commit | f084f2c621b75a146ccefecbffa9be5f514297e3 (patch) | |
tree | 5613f5a66c3c37f3c5982c08b54ed45cfa9d209a /auto_tests | |
parent | 491d03c229d5fe684a38bac2abc4ef2617da2bba (diff) |
Add loopback and broadcast constants
Diffstat (limited to 'auto_tests')
-rw-r--r-- | auto_tests/TCP_test.c | 12 | ||||
-rw-r--r-- | auto_tests/network_test.c | 11 |
2 files changed, 11 insertions, 12 deletions
diff --git a/auto_tests/TCP_test.c b/auto_tests/TCP_test.c index fbbb08cd..5c656541 100644 --- a/auto_tests/TCP_test.c +++ b/auto_tests/TCP_test.c | |||
@@ -35,9 +35,7 @@ START_TEST(test_basic) | |||
35 | Socket sock = net_socket(TOX_AF_INET6, TOX_SOCK_STREAM, TOX_PROTO_TCP); | 35 | Socket sock = net_socket(TOX_AF_INET6, TOX_SOCK_STREAM, TOX_PROTO_TCP); |
36 | IP_Port ip_port_loopback; | 36 | IP_Port ip_port_loopback; |
37 | ip_port_loopback.ip.family = TOX_AF_INET6; | 37 | ip_port_loopback.ip.family = TOX_AF_INET6; |
38 | ip_port_loopback.ip.ip6.uint64[0] = 0; | 38 | ip_port_loopback.ip.ip6 = IP6_LOOPBACK; |
39 | ip_port_loopback.ip.ip6.uint64[1] = 0; | ||
40 | ip_port_loopback.ip.ip6.uint8[15] = 1; // ::1 | ||
41 | ip_port_loopback.port = net_htons(ports[rand() % NUM_PORTS]); | 39 | ip_port_loopback.port = net_htons(ports[rand() % NUM_PORTS]); |
42 | 40 | ||
43 | int ret = net_connect(sock, ip_port_loopback); | 41 | int ret = net_connect(sock, ip_port_loopback); |
@@ -406,7 +404,7 @@ START_TEST(test_client) | |||
406 | 404 | ||
407 | ip_port_tcp_s.port = net_htons(ports[rand() % NUM_PORTS]); | 405 | ip_port_tcp_s.port = net_htons(ports[rand() % NUM_PORTS]); |
408 | ip_port_tcp_s.ip.family = TOX_AF_INET6; | 406 | ip_port_tcp_s.ip.family = TOX_AF_INET6; |
409 | get_ip6(&ip_port_tcp_s.ip.ip6, &in6addr_loopback); | 407 | ip_port_tcp_s.ip.ip6 = IP6_LOOPBACK; |
410 | TCP_Client_Connection *conn = new_TCP_connection(ip_port_tcp_s, self_public_key, f_public_key, f_secret_key, 0); | 408 | TCP_Client_Connection *conn = new_TCP_connection(ip_port_tcp_s, self_public_key, f_public_key, f_secret_key, 0); |
411 | c_sleep(50); | 409 | c_sleep(50); |
412 | do_TCP_connection(conn, NULL); | 410 | do_TCP_connection(conn, NULL); |
@@ -504,7 +502,7 @@ START_TEST(test_client_invalid) | |||
504 | 502 | ||
505 | ip_port_tcp_s.port = net_htons(ports[rand() % NUM_PORTS]); | 503 | ip_port_tcp_s.port = net_htons(ports[rand() % NUM_PORTS]); |
506 | ip_port_tcp_s.ip.family = TOX_AF_INET6; | 504 | ip_port_tcp_s.ip.family = TOX_AF_INET6; |
507 | get_ip6(&ip_port_tcp_s.ip.ip6, &in6addr_loopback); | 505 | ip_port_tcp_s.ip.ip6 = IP6_LOOPBACK; |
508 | TCP_Client_Connection *conn = new_TCP_connection(ip_port_tcp_s, self_public_key, f_public_key, f_secret_key, 0); | 506 | TCP_Client_Connection *conn = new_TCP_connection(ip_port_tcp_s, self_public_key, f_public_key, f_secret_key, 0); |
509 | c_sleep(50); | 507 | c_sleep(50); |
510 | do_TCP_connection(conn, NULL); | 508 | do_TCP_connection(conn, NULL); |
@@ -573,7 +571,7 @@ START_TEST(test_tcp_connection) | |||
573 | 571 | ||
574 | ip_port_tcp_s.port = net_htons(ports[rand() % NUM_PORTS]); | 572 | ip_port_tcp_s.port = net_htons(ports[rand() % NUM_PORTS]); |
575 | ip_port_tcp_s.ip.family = TOX_AF_INET6; | 573 | ip_port_tcp_s.ip.family = TOX_AF_INET6; |
576 | get_ip6(&ip_port_tcp_s.ip.ip6, &in6addr_loopback); | 574 | ip_port_tcp_s.ip.ip6 = IP6_LOOPBACK; |
577 | 575 | ||
578 | int connection = new_tcp_connection_to(tc_1, tcp_connections_public_key(tc_2), 123); | 576 | int connection = new_tcp_connection_to(tc_1, tcp_connections_public_key(tc_2), 123); |
579 | ck_assert_msg(connection == 0, "Connection id wrong"); | 577 | ck_assert_msg(connection == 0, "Connection id wrong"); |
@@ -682,7 +680,7 @@ START_TEST(test_tcp_connection2) | |||
682 | 680 | ||
683 | ip_port_tcp_s.port = net_htons(ports[rand() % NUM_PORTS]); | 681 | ip_port_tcp_s.port = net_htons(ports[rand() % NUM_PORTS]); |
684 | ip_port_tcp_s.ip.family = TOX_AF_INET6; | 682 | ip_port_tcp_s.ip.family = TOX_AF_INET6; |
685 | get_ip6(&ip_port_tcp_s.ip.ip6, &in6addr_loopback); | 683 | ip_port_tcp_s.ip.ip6 = IP6_LOOPBACK; |
686 | 684 | ||
687 | int connection = new_tcp_connection_to(tc_1, tcp_connections_public_key(tc_2), 123); | 685 | int connection = new_tcp_connection_to(tc_1, tcp_connections_public_key(tc_2), 123); |
688 | ck_assert_msg(connection == 0, "Connection id wrong"); | 686 | ck_assert_msg(connection == 0, "Connection id wrong"); |
diff --git a/auto_tests/network_test.c b/auto_tests/network_test.c index 31521cbc..200c04db 100644 --- a/auto_tests/network_test.c +++ b/auto_tests/network_test.c | |||
@@ -38,7 +38,8 @@ START_TEST(test_addr_resolv_localhost) | |||
38 | 38 | ||
39 | char ip_str[IP_NTOA_LEN]; | 39 | char ip_str[IP_NTOA_LEN]; |
40 | ck_assert_msg(ip.family == TOX_AF_INET, "Expected family TOX_AF_INET, got %u.", ip.family); | 40 | ck_assert_msg(ip.family == TOX_AF_INET, "Expected family TOX_AF_INET, got %u.", ip.family); |
41 | ck_assert_msg(ip.ip4.uint32 == net_htonl(0x7F000001), "Expected 127.0.0.1, got %s.", | 41 | const uint32_t loopback = net_htonl(IP4_LOOPBACK.uint32); |
42 | ck_assert_msg(ip.ip4.uint32 == loopback, "Expected 127.0.0.1, got %s.", | ||
42 | ip_ntoa(&ip, ip_str, sizeof(ip_str))); | 43 | ip_ntoa(&ip, ip_str, sizeof(ip_str))); |
43 | 44 | ||
44 | ip_init(&ip, 1); // ipv6enabled = 1 | 45 | ip_init(&ip, 1); // ipv6enabled = 1 |
@@ -52,7 +53,7 @@ START_TEST(test_addr_resolv_localhost) | |||
52 | ck_assert_msg(res > 0, "Resolver failed: %u, %s (%x, %x)", errno, strerror(errno)); | 53 | ck_assert_msg(res > 0, "Resolver failed: %u, %s (%x, %x)", errno, strerror(errno)); |
53 | 54 | ||
54 | ck_assert_msg(ip.family == TOX_AF_INET6, "Expected family TOX_AF_INET6 (%u), got %u.", TOX_AF_INET6, ip.family); | 55 | ck_assert_msg(ip.family == TOX_AF_INET6, "Expected family TOX_AF_INET6 (%u), got %u.", TOX_AF_INET6, ip.family); |
55 | ck_assert_msg(!memcmp(&ip.ip6, &in6addr_loopback, sizeof(IP6)), "Expected ::1, got %s.", | 56 | ck_assert_msg(!memcmp(&ip.ip6, &IP6_LOOPBACK, sizeof(IP6)), "Expected ::1, got %s.", |
56 | ip_ntoa(&ip, ip_str, sizeof(ip_str))); | 57 | ip_ntoa(&ip, ip_str, sizeof(ip_str))); |
57 | 58 | ||
58 | if (localhost_split) { | 59 | if (localhost_split) { |
@@ -68,11 +69,11 @@ START_TEST(test_addr_resolv_localhost) | |||
68 | ck_assert_msg(res > 0, "Resolver failed: %u, %s (%x, %x)", errno, strerror(errno)); | 69 | ck_assert_msg(res > 0, "Resolver failed: %u, %s (%x, %x)", errno, strerror(errno)); |
69 | 70 | ||
70 | ck_assert_msg(ip.family == TOX_AF_INET6, "Expected family TOX_AF_INET6 (%u), got %u.", TOX_AF_INET6, ip.family); | 71 | ck_assert_msg(ip.family == TOX_AF_INET6, "Expected family TOX_AF_INET6 (%u), got %u.", TOX_AF_INET6, ip.family); |
71 | ck_assert_msg(!memcmp(&ip.ip6, &in6addr_loopback, sizeof(IP6)), "Expected ::1, got %s.", | 72 | ck_assert_msg(!memcmp(&ip.ip6, &IP6_LOOPBACK, sizeof(IP6)), "Expected ::1, got %s.", |
72 | ip_ntoa(&ip, ip_str, sizeof(ip_str))); | 73 | ip_ntoa(&ip, ip_str, sizeof(ip_str))); |
73 | 74 | ||
74 | ck_assert_msg(extra.family == TOX_AF_INET, "Expected family TOX_AF_INET (%u), got %u.", TOX_AF_INET, extra.family); | 75 | ck_assert_msg(extra.family == TOX_AF_INET, "Expected family TOX_AF_INET (%u), got %u.", TOX_AF_INET, extra.family); |
75 | ck_assert_msg(extra.ip4.uint32 == net_htonl(0x7F000001), "Expected 127.0.0.1, got %s.", | 76 | ck_assert_msg(extra.ip4.uint32 == loopback, "Expected 127.0.0.1, got %s.", |
76 | ip_ntoa(&ip, ip_str, sizeof(ip_str))); | 77 | ip_ntoa(&ip, ip_str, sizeof(ip_str))); |
77 | } | 78 | } |
78 | END_TEST | 79 | END_TEST |
@@ -126,7 +127,7 @@ START_TEST(test_ip_equal) | |||
126 | ck_assert_msg(res != 0, "ip_equal( {TOX_AF_INET, 127.0.0.1}, {TOX_AF_INET6, ::ffff:127.0.0.1} ): " | 127 | ck_assert_msg(res != 0, "ip_equal( {TOX_AF_INET, 127.0.0.1}, {TOX_AF_INET6, ::ffff:127.0.0.1} ): " |
127 | "expected result != 0, got 0."); | 128 | "expected result != 0, got 0."); |
128 | 129 | ||
129 | memcpy(&ip2.ip6, &in6addr_loopback, sizeof(IP6)); | 130 | memcpy(&ip2.ip6, &IP6_LOOPBACK, sizeof(IP6)); |
130 | res = ip_equal(&ip1, &ip2); | 131 | res = ip_equal(&ip1, &ip2); |
131 | ck_assert_msg(res == 0, "ip_equal( {TOX_AF_INET, 127.0.0.1}, {TOX_AF_INET6, ::1} ): expected result 0, got %u.", res); | 132 | ck_assert_msg(res == 0, "ip_equal( {TOX_AF_INET, 127.0.0.1}, {TOX_AF_INET6, ::1} ): expected result 0, got %u.", res); |
132 | 133 | ||