From: Roy Marples <roy@marples.name>
Date: Mon, 5 Sep 2016 22:35:29 +0000 (+0000)
Subject: Fix more iovec to arrays.
X-Git-Tag: v6.11.4~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70a8bd8892ac7137b36098acab1dc82a5539bae9;p=thirdparty%2Fdhcpcd.git

Fix more iovec to arrays.
---

diff --git a/ipv6.c b/ipv6.c
index 4e594bb5..9a391774 100644
--- a/ipv6.c
+++ b/ipv6.c
@@ -154,13 +154,13 @@ ipv6_init(struct dhcpcd_ctx *dhcpcd_ctx)
 	TAILQ_INIT(&ctx->kroutes);
 
 	ctx->sndhdr.msg_namelen = sizeof(struct sockaddr_in6);
-	ctx->sndhdr.msg_iov = &ctx->sndiov;
+	ctx->sndhdr.msg_iov = ctx->sndiov;
 	ctx->sndhdr.msg_iovlen = 1;
 	ctx->sndhdr.msg_control = ctx->sndbuf;
 	ctx->sndhdr.msg_controllen = sizeof(ctx->sndbuf);
 	ctx->rcvhdr.msg_name = &ctx->from;
 	ctx->rcvhdr.msg_namelen = sizeof(ctx->from);
-	ctx->rcvhdr.msg_iov = &dhcpcd_ctx->iov;
+	ctx->rcvhdr.msg_iov = dhcpcd_ctx->iov;
 	ctx->rcvhdr.msg_iovlen = 1;
 	ctx->rcvhdr.msg_control = ctx->ctlbuf;
 	// controllen is set at recieve
diff --git a/ipv6.h b/ipv6.h
index 4a1248b9..4c77e335 100644
--- a/ipv6.h
+++ b/ipv6.h
@@ -265,7 +265,7 @@ struct ipv6_ctx {
 	unsigned char ctlbuf[IP6BUFLEN];
 	struct sockaddr_in6 from;
 	struct msghdr sndhdr;
-	struct iovec sndiov;
+	struct iovec sndiov[1];
 	unsigned char sndbuf[CMSG_SPACE(sizeof(struct in6_pktinfo))];
 	struct msghdr rcvhdr;
 	char ntopbuf[INET6_ADDRSTRLEN];