5 files changed, 38 insertions, 30 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);
 
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 47d6d57a..4dd7d0c4 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -2527,7 +2527,7 @@ void do_messenger(Messenger *m, void *userdata)
             IP_Port local_ip_port;
             local_ip_port.port = m->options.tcp_server_port;
             local_ip_port.ip.family = TOX_AF_INET;
-            local_ip_port.ip.ip4 = IP4_LOOPBACK;
+            local_ip_port.ip.ip4 = get_ip4_loopback();
             add_tcp_relay(m->net_crypto, local_ip_port,
                           tcp_server_public_key(m->tcp_server));
         }
diff --git a/toxcore/network.c b/toxcore/network.c
index aeaf4d79..5c43bf57 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -138,21 +138,6 @@ static int inet_pton(Family family, const char *addrString, void *addrbuf)
 
 #endif
 
-#if !defined(INADDR_LOOPBACK)
-#define INADDR_LOOPBACK 0x7f000001
-#endif
-
-const IP4 IP4_LOOPBACK = { INADDR_LOOPBACK };
-const IP6 IP6_LOOPBACK = {
-    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }
-};
-
-
-const IP4 IP4_BROADCAST = { INADDR_BROADCAST };
-const IP6 IP6_BROADCAST = {
-    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }
-};
-
 #if TOX_INET6_ADDRSTRLEN < INET6_ADDRSTRLEN
 #error TOX_INET6_ADDRSTRLEN should be greater or equal to INET6_ADDRSTRLEN (#INET6_ADDRSTRLEN)
 #endif
@@ -188,6 +173,29 @@ static void fill_addr6(IP6 ip, struct in6_addr *addr)
     memcpy(addr->s6_addr, ip.uint8, sizeof(ip.uint8));
 }
 
+#if !defined(INADDR_LOOPBACK)
+#define INADDR_LOOPBACK 0x7f000001
+#endif
+
+const IP4 IP4_BROADCAST = { INADDR_BROADCAST };
+const IP6 IP6_BROADCAST = {
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }
+};
+
+IP4 get_ip4_loopback()
+{
+    IP4 loopback;
+    loopback.uint32 = htonl(INADDR_LOOPBACK);
+    return loopback;
+}
+
+IP6 get_ip6_loopback()
+{
+    IP6 loopback;
+    get_ip6(&loopback, &in6addr_loopback);
+    return loopback;
+}
+
 /* Check if socket is valid.
  *
  * return 1 if valid
@@ -1436,4 +1444,3 @@ uint16_t net_ntohs(uint16_t hostshort)
 {
     return ntohs(hostshort);
 }
-
diff --git a/toxcore/network.h b/toxcore/network.h
index 3c98c168..0b9da5a4 100644
--- a/toxcore/network.h
+++ b/toxcore/network.h
@@ -132,7 +132,7 @@ typedef union {
 }
 IP4;
 
-extern const IP4 IP4_LOOPBACK;
+IP4 get_ip4_loopback(void);
 extern const IP4 IP4_BROADCAST;
 
 typedef union {
@@ -143,7 +143,7 @@ typedef union {
 }
 IP6;
 
-extern const IP6 IP6_LOOPBACK;
+IP6 get_ip6_loopback(void);
 extern const IP6 IP6_BROADCAST;
 
 typedef struct {