diff options
| author | Roy Marples <roy@marples.name> | 2020-04-26 21:05:06 +0100 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2020-04-26 21:05:06 +0100 |
| commit | 1e29ac03a30a4da556e1e9ad16af7b7872d6d7b0 (patch) | |
| tree | ffb90913287a48c1610eb1d7096f3d9246e16a8a /src/ipv6nd.c | |
| parent | 9c817dc5a5567ca735a713a76f5b62f8bb954ea9 (diff) | |
| download | dhcpcd-1e29ac03a30a4da556e1e9ad16af7b7872d6d7b0.tar.xz | |
Align more CMSG foo.
Diffstat (limited to 'src/ipv6nd.c')
| -rw-r--r-- | src/ipv6nd.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/ipv6nd.c b/src/ipv6nd.c index faf31561..99e92aaf 100644 --- a/src/ipv6nd.c +++ b/src/ipv6nd.c @@ -328,11 +328,14 @@ ipv6nd_sendrsprobe(void *arg) .sin6_scope_id = ifp->index, }; struct iovec iov = { .iov_base = state->rs, .iov_len = state->rslen }; - unsigned char ctl[CMSG_SPACE(sizeof(struct in6_pktinfo))] = { 0 }; + union { + struct cmsghdr hdr; + uint8_t buf[CMSG_SPACE(sizeof(struct in6_pktinfo))]; + } cmsgbuf = { .buf = { 0 } }; struct msghdr msg = { .msg_name = &dst, .msg_namelen = sizeof(dst), .msg_iov = &iov, .msg_iovlen = 1, - .msg_control = ctl, .msg_controllen = sizeof(ctl), + .msg_control = cmsgbuf.buf, .msg_controllen = sizeof(cmsgbuf.buf), }; struct cmsghdr *cm; struct in6_pktinfo pi = { .ipi6_ifindex = ifp->index }; @@ -402,11 +405,14 @@ ipv6nd_sendadvertisement(void *arg) .sin6_scope_id = ifp->index, }; struct iovec iov = { .iov_base = ia->na, .iov_len = ia->na_len }; - unsigned char ctl[CMSG_SPACE(sizeof(struct in6_pktinfo))] = { 0 }; + union { + struct cmsghdr hdr; + uint8_t buf[CMSG_SPACE(sizeof(struct in6_pktinfo))]; + } cmsgbuf = { .buf = { 0 } }; struct msghdr msg = { .msg_name = &dst, .msg_namelen = sizeof(dst), .msg_iov = &iov, .msg_iovlen = 1, - .msg_control = ctl, .msg_controllen = sizeof(ctl), + .msg_control = cmsgbuf.buf, .msg_controllen = sizeof(cmsgbuf.buf), }; struct cmsghdr *cm; struct in6_pktinfo pi = { .ipi6_ifindex = ifp->index }; |