]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Fix more iovec to arrays.
authorRoy Marples <roy@marples.name>
Mon, 5 Sep 2016 22:35:29 +0000 (22:35 +0000)
committerRoy Marples <roy@marples.name>
Mon, 5 Sep 2016 22:35:29 +0000 (22:35 +0000)
ipv6.c
ipv6.h

diff --git a/ipv6.c b/ipv6.c
index 4e594bb514983da4ca71b412096b8575b47cd062..9a391774af87fb7191374f7e0360ad8f633ea481 100644 (file)
--- 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 4a1248b97302277d2a799a0ea86c36f06f51177e..4c77e3350a56c6b60dd98ac9e2b27c751af03ef5 100644 (file)
--- 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];