summaryrefslogtreecommitdiff
path: root/auto_tests/dht_test.c
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2018-02-14 20:51:55 +0000
committeriphydf <iphydf@users.noreply.github.com>2018-02-14 20:51:55 +0000
commit35f13ef51dbf99c3d45d04f572e9e88795df7ae6 (patch)
tree8213605775c5f749fdabe683fbdea9106a6c32c1 /auto_tests/dht_test.c
parent17a0b617f299c34563960bd4e9ed9a88e76ba92f (diff)
Get rid of the only GNU extension we used.
Diffstat (limited to 'auto_tests/dht_test.c')
-rw-r--r--auto_tests/dht_test.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/auto_tests/dht_test.c b/auto_tests/dht_test.c
index 8e735dbd..10c9c7bf 100644
--- a/auto_tests/dht_test.c
+++ b/auto_tests/dht_test.c
@@ -38,10 +38,10 @@ static inline IP get_loopback()
38 IP ip; 38 IP ip;
39#if USE_IPV6 39#if USE_IPV6
40 ip.family = TOX_AF_INET6; 40 ip.family = TOX_AF_INET6;
41 ip.ip6 = get_ip6_loopback(); 41 ip.ip.v6 = get_ip6_loopback();
42#else 42#else
43 ip.family = TOX_AF_INET; 43 ip.family = TOX_AF_INET;
44 ip.ip4 = get_ip4_loopback(); 44 ip.ip.v4 = get_ip4_loopback();
45#endif 45#endif
46 return ip; 46 return ip;
47} 47}
@@ -489,7 +489,7 @@ static void test_list_main(void)
489 489
490 IP_Port ip_port; 490 IP_Port ip_port;
491 ip_init(&ip_port.ip, 0); 491 ip_init(&ip_port.ip, 0);
492 ip_port.ip.ip4.uint32 = rand(); 492 ip_port.ip.ip.v4.uint32 = rand();
493 ip_port.port = rand() % (UINT16_MAX - 1); 493 ip_port.port = rand() % (UINT16_MAX - 1);
494 ++ip_port.port; 494 ++ip_port.port;
495 addto_lists(dhts[j], ip_port, dhts[i]->self_public_key); 495 addto_lists(dhts[j], ip_port, dhts[i]->self_public_key);
@@ -723,11 +723,11 @@ static void random_ip(IP_Port *ipp, int family)
723 size_t size; 723 size_t size;
724 724
725 if (family == TOX_AF_INET || family == TCP_INET) { 725 if (family == TOX_AF_INET || family == TCP_INET) {
726 ip = (uint8_t *)&ipp->ip.ip4; 726 ip = (uint8_t *)&ipp->ip.ip.v4;
727 size = sizeof(ipp->ip.ip4); 727 size = sizeof(ipp->ip.ip.v4);
728 } else if (family == TOX_AF_INET6 || family == TCP_INET6) { 728 } else if (family == TOX_AF_INET6 || family == TCP_INET6) {
729 ip = (uint8_t *)&ipp->ip.ip6; 729 ip = (uint8_t *)&ipp->ip.ip.v6;
730 size = sizeof(ipp->ip.ip6); 730 size = sizeof(ipp->ip.ip.v6);
731 } else { 731 } else {
732 return; 732 return;
733 } 733 }