From: Azat Khuzhin <azat@libevent.org>
Date: Mon, 27 Jul 2020 22:19:28 +0000 (+0300)
Subject: test/dns: fix initialize_nameservers when there is ipv6 in /etc/resolv.conf
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eeeed1e1bbc5ffd38c53a31899e7da77ea96b7bb;p=libevent

test/dns: fix initialize_nameservers when there is ipv6 in /etc/resolv.conf

Fixes: #1060
---

diff --git a/test/regress_dns.c b/test/regress_dns.c
index abad1b47..f97e755d 100644
--- a/test/regress_dns.c
+++ b/test/regress_dns.c
@@ -1051,6 +1051,8 @@ dns_initialize_nameservers_test(void *arg)
 	struct basic_test_data *data = arg;
 	struct event_base *base = data->base;
 	struct evdns_base *dns = NULL;
+	struct sockaddr_storage ss;
+	int size;
 
 	dns = evdns_base_new(base, 0);
 	tt_assert(dns);
@@ -1059,7 +1061,14 @@ dns_initialize_nameservers_test(void *arg)
 
 	dns = evdns_base_new(base, EVDNS_BASE_INITIALIZE_NAMESERVERS);
 	tt_assert(dns);
-	tt_int_op(evdns_base_get_nameserver_addr(dns, 0, NULL, 0), ==, sizeof(struct sockaddr));
+
+	size = evdns_base_get_nameserver_addr(dns, 0, (struct sockaddr *)&ss, sizeof(ss));
+	tt_int_op(size, >, 0);
+	if (ss.ss_family == AF_INET)
+		tt_int_op(size, ==, sizeof(struct sockaddr_in));
+	else
+		tt_int_op(size, ==, sizeof(struct sockaddr_in6));
+
 
 end:
 	if (dns)