From: Simon Schubert <corecode@dragonflybsd.org>
Date: Sat, 3 Oct 2009 19:35:29 +0000 (+0200)
Subject: dma: don't use sockaddr_storage.ss_len
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32d3ec652feedc41325a049b7c7f6904dc460073;p=people%2Fms%2Fdma.git

dma: don't use sockaddr_storage.ss_len

sockaddr_storage.ss_len is not mandated by POSIX, so we shouldn't use
it.  Instead, use addrinfo.ai_addrlen.
---

diff --git a/dns.c b/dns.c
index 8cfdd04..5a72dfe 100644
--- a/dns.c
+++ b/dns.c
@@ -97,7 +97,7 @@ add_host(int pref, const char *host, int port, struct mx_hostentry **he, size_t
 		p->ai.ai_addr = NULL;
 		bcopy(res->ai_addr, &p->sa, p->ai.ai_addrlen);
 
-		getnameinfo((struct sockaddr *)&p->sa, p->sa.ss_len,
+		getnameinfo((struct sockaddr *)&p->sa, p->ai.ai_addrlen,
 			    p->addr, sizeof(p->addr),
 			    NULL, 0, NI_NUMERICHOST);
 
diff --git a/net.c b/net.c
index 607b992..55d06cf 100644
--- a/net.c
+++ b/net.c
@@ -291,7 +291,7 @@ open_connection(struct mx_hostentry *h)
 		return (-1);
 	}
 
-	if (connect(fd, (struct sockaddr *)&h->sa, h->sa.ss_len) < 0) {
+	if (connect(fd, (struct sockaddr *)&h->sa, h->ai.ai_addrlen) < 0) {
 		syslog(LOG_INFO, "connect to %s [%s] failed: %m",
 		       h->host, h->addr);
 		close(fd);