dhcpv6: prefer ula over other globals

[project/odhcpd.git] / src / odhcpd.c

diff --git a/src/odhcpd.c b/src/odhcpd.c
index 3c384e8..76dee9e 100644 (file)
--- a/src/odhcpd.c
+++ b/src/odhcpd.c
@@ -153,8 +153,15 @@ ssize_t odhcpd_send(int socket, struct sockaddr_in6 *dest,
 {
        // Construct headers
        uint8_t cmsg_buf[CMSG_SPACE(sizeof(struct in6_pktinfo))] = {0};
-       struct msghdr msg = {(void*)dest, sizeof(*dest), iov, iov_len,
-                               cmsg_buf, sizeof(cmsg_buf), 0};
+       struct msghdr msg = {
+               .msg_name = (void *) dest,
+               .msg_namelen = sizeof(*dest),
+               .msg_iov = iov,
+               .msg_iovlen = iov_len,
+               .msg_control = cmsg_buf,
+               .msg_controllen = sizeof(cmsg_buf),
+               .msg_flags = 0
+       };
 
        // Set control data (define destination interface)
        struct cmsghdr *chdr = CMSG_FIRSTHDR(&msg);
@@ -249,14 +256,6 @@ ssize_t odhcpd_get_interface_addresses(int ifindex,
                if (ifa->ifa_flags & IFA_F_DEPRECATED)
                        addrs[ret].preferred = 0;
 
-               addrs[ret].has_class = false;
-               addrs[ret].class = 0;
-#ifdef WITH_UBUS
-               struct interface *iface = odhcpd_get_interface_by_index(ifindex);
-               if (iface)
-                       addrs[ret].has_class = ubus_get_class(iface->ifname,
-                                       &addrs[ret].addr, &addrs[ret].class);
-#endif
                ++ret;
        }
 
@@ -331,8 +330,15 @@ static void odhcpd_receive_packets(struct uloop_fd *u, _unused unsigned int even
 
        while (true) {
                struct iovec iov = {data_buf, sizeof(data_buf)};
-               struct msghdr msg = {&addr, sizeof(addr), &iov, 1,
-                               cmsg_buf, sizeof(cmsg_buf), 0};
+               struct msghdr msg = {
+                       .msg_name = (void *) &addr,
+                       .msg_namelen = sizeof(addr),
+                       .msg_iov = &iov,
+                       .msg_iovlen = 1,
+                       .msg_control = cmsg_buf,
+                       .msg_controllen = sizeof(cmsg_buf),
+                       .msg_flags = 0
+               };
 
                ssize_t len = recvmsg(u->fd, &msg, MSG_DONTWAIT);
                if (len < 0) {