2 files changed, 12 insertions, 11 deletions

diff --git a/auto_tests/TCP_test.c b/auto_tests/TCP_test.c
index 5c656541..898c5e08 100644
--- a/auto_tests/TCP_test.c
+++ b/auto_tests/TCP_test.c
@@ -35,7 +35,7 @@ START_TEST(test_basic)
     Socket sock = net_socket(TOX_AF_INET6, TOX_SOCK_STREAM, TOX_PROTO_TCP);
     IP_Port ip_port_loopback;
     ip_port_loopback.ip.family = TOX_AF_INET6;
-    ip_port_loopback.ip.ip6 = IP6_LOOPBACK;
+    ip_port_loopback.ip.ip6 = get_ip6_loopback();
     ip_port_loopback.port = net_htons(ports[rand() % NUM_PORTS]);
 
     int ret = net_connect(sock, ip_port_loopback);
@@ -135,8 +135,7 @@ static struct sec_TCP_con *new_TCP_con(TCP_Server *tcp_s)
     IP_Port ip_port_loopback;
     ip_port_loopback.ip.family = TOX_AF_INET6;
     ip_port_loopback.ip.ip6.uint64[0] = 0;
-    ip_port_loopback.ip.ip6.uint64[1] = 0;
-    ip_port_loopback.ip.ip6.uint8[15] = 1; // ::1
+    ip_port_loopback.ip.ip4 = get_ip4_loopback();
     ip_port_loopback.port = net_htons(ports[rand() % NUM_PORTS]);
 
     int ret = net_connect(sock, ip_port_loopback);
@@ -404,7 +403,7 @@ START_TEST(test_client)
 
     ip_port_tcp_s.port = net_htons(ports[rand() % NUM_PORTS]);
     ip_port_tcp_s.ip.family = TOX_AF_INET6;
-    ip_port_tcp_s.ip.ip6 = IP6_LOOPBACK;
+    ip_port_tcp_s.ip.ip6 = get_ip6_loopback();
     TCP_Client_Connection *conn = new_TCP_connection(ip_port_tcp_s, self_public_key, f_public_key, f_secret_key, 0);
     c_sleep(50);
     do_TCP_connection(conn, NULL);
@@ -502,7 +501,7 @@ START_TEST(test_client_invalid)
 
     ip_port_tcp_s.port = net_htons(ports[rand() % NUM_PORTS]);
     ip_port_tcp_s.ip.family = TOX_AF_INET6;
-    ip_port_tcp_s.ip.ip6 = IP6_LOOPBACK;
+    ip_port_tcp_s.ip.ip6 = get_ip6_loopback();
     TCP_Client_Connection *conn = new_TCP_connection(ip_port_tcp_s, self_public_key, f_public_key, f_secret_key, 0);
     c_sleep(50);
     do_TCP_connection(conn, NULL);
@@ -571,7 +570,7 @@ START_TEST(test_tcp_connection)
 
     ip_port_tcp_s.port = net_htons(ports[rand() % NUM_PORTS]);
     ip_port_tcp_s.ip.family = TOX_AF_INET6;
-    ip_port_tcp_s.ip.ip6 = IP6_LOOPBACK;
+    ip_port_tcp_s.ip.ip6 = get_ip6_loopback();
 
     int connection = new_tcp_connection_to(tc_1, tcp_connections_public_key(tc_2), 123);
     ck_assert_msg(connection == 0, "Connection id wrong");
@@ -680,7 +679,7 @@ START_TEST(test_tcp_connection2)
 
     ip_port_tcp_s.port = net_htons(ports[rand() % NUM_PORTS]);
     ip_port_tcp_s.ip.family = TOX_AF_INET6;
-    ip_port_tcp_s.ip.ip6 = IP6_LOOPBACK;
+    ip_port_tcp_s.ip.ip6 = get_ip6_loopback();
 
     int connection = new_tcp_connection_to(tc_1, tcp_connections_public_key(tc_2), 123);
     ck_assert_msg(connection == 0, "Connection id wrong");
diff --git a/auto_tests/network_test.c b/auto_tests/network_test.c
index 200c04db..4713528d 100644
--- a/auto_tests/network_test.c
+++ b/auto_tests/network_test.c
@@ -38,7 +38,7 @@ START_TEST(test_addr_resolv_localhost)
 
     char ip_str[IP_NTOA_LEN];
     ck_assert_msg(ip.family == TOX_AF_INET, "Expected family TOX_AF_INET, got %u.", ip.family);
-    const uint32_t loopback = net_htonl(IP4_LOOPBACK.uint32);
+    const uint32_t loopback = get_ip4_loopback().uint32;
     ck_assert_msg(ip.ip4.uint32 == loopback, "Expected 127.0.0.1, got %s.",
                   ip_ntoa(&ip, ip_str, sizeof(ip_str)));
 
@@ -53,7 +53,8 @@ START_TEST(test_addr_resolv_localhost)
     ck_assert_msg(res > 0, "Resolver failed: %u, %s (%x, %x)", errno, strerror(errno));
 
     ck_assert_msg(ip.family == TOX_AF_INET6, "Expected family TOX_AF_INET6 (%u), got %u.", TOX_AF_INET6, ip.family);
-    ck_assert_msg(!memcmp(&ip.ip6, &IP6_LOOPBACK, sizeof(IP6)), "Expected ::1, got %s.",
+    IP6 ip6_loopback = get_ip6_loopback();
+    ck_assert_msg(!memcmp(&ip.ip6, &ip6_loopback, sizeof(IP6)), "Expected ::1, got %s.",
                   ip_ntoa(&ip, ip_str, sizeof(ip_str)));
 
     if (localhost_split) {
@@ -69,7 +70,7 @@ START_TEST(test_addr_resolv_localhost)
     ck_assert_msg(res > 0, "Resolver failed: %u, %s (%x, %x)", errno, strerror(errno));
 
     ck_assert_msg(ip.family == TOX_AF_INET6, "Expected family TOX_AF_INET6 (%u), got %u.", TOX_AF_INET6, ip.family);
-    ck_assert_msg(!memcmp(&ip.ip6, &IP6_LOOPBACK, sizeof(IP6)), "Expected ::1, got %s.",
+    ck_assert_msg(!memcmp(&ip.ip6, &ip6_loopback, sizeof(IP6)), "Expected ::1, got %s.",
                   ip_ntoa(&ip, ip_str, sizeof(ip_str)));
 
     ck_assert_msg(extra.family == TOX_AF_INET, "Expected family TOX_AF_INET (%u), got %u.", TOX_AF_INET, extra.family);
@@ -127,7 +128,8 @@ START_TEST(test_ip_equal)
     ck_assert_msg(res != 0, "ip_equal( {TOX_AF_INET, 127.0.0.1}, {TOX_AF_INET6, ::ffff:127.0.0.1} ): "
                   "expected result != 0, got 0.");
 
-    memcpy(&ip2.ip6, &IP6_LOOPBACK, sizeof(IP6));
+    IP6 ip6_loopback = get_ip6_loopback();
+    memcpy(&ip2.ip6, &ip6_loopback, sizeof(IP6));
     res = ip_equal(&ip1, &ip2);
     ck_assert_msg(res == 0, "ip_equal( {TOX_AF_INET, 127.0.0.1}, {TOX_AF_INET6, ::1} ): expected result 0, got %u.", res);