dhcpv6: don't initialize IA-handing when turning down interface

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

diff --git a/src/odhcpd.c b/src/odhcpd.c
index 0edf63e..aad5b37 100644 (file)
--- a/src/odhcpd.c
+++ b/src/odhcpd.c
@@ -113,11 +113,11 @@ int odhcpd_open_rtnl(void)
 
 
 // Read IPv6 MTU for interface
-int odhcpd_get_interface_mtu(const char *ifname)
+int odhcpd_get_interface_config(const char *ifname, const char *what)
 {
        char buf[64];
-       const char *sysctl_pattern = "/proc/sys/net/ipv6/conf/%s/mtu";
-       snprintf(buf, sizeof(buf), sysctl_pattern, ifname);
+       const char *sysctl_pattern = "/proc/sys/net/ipv6/conf/%s/%s";
+       snprintf(buf, sizeof(buf), sysctl_pattern, ifname, what);
 
        int fd = open(buf, O_RDONLY);
        ssize_t len = read(fd, buf, sizeof(buf) - 1);
@@ -126,10 +126,8 @@ int odhcpd_get_interface_mtu(const char *ifname)
        if (len < 0)
                return -1;
 
-
        buf[len] = 0;
        return atoi(buf);
-
 }
 
 
@@ -153,8 +151,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,20 +254,31 @@ 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;
        }
 
        return ret;
 }
 
+int odhcpd_get_preferred_interface_address(int ifindex, struct in6_addr *addr)
+{
+       struct odhcpd_ipaddr ipaddrs[8];
+       ssize_t ip_cnt = odhcpd_get_interface_addresses(ifindex, ipaddrs, ARRAY_SIZE(ipaddrs));
+       uint32_t preferred = 0;
+       int ret = 0;
+
+       for (ssize_t i = 0; i < ip_cnt; i++) {
+               struct odhcpd_ipaddr *ipaddr = &ipaddrs[i];
+
+               if (ipaddr->preferred > preferred || !preferred) {
+                       preferred = ipaddr->preferred;
+                       *addr = ipaddr->addr;
+                       ret = 1;
+               }
+       }
+
+       return ret;
+}
 
 struct interface* odhcpd_get_interface_by_index(int ifindex)
 {
@@ -312,8 +328,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) {
@@ -390,9 +413,9 @@ void odhcpd_process(struct odhcpd_event *event)
        odhcpd_receive_packets(&event->uloop, 0);
 }
 
-void odhcpd_urandom(void *data, size_t len)
+int odhcpd_urandom(void *data, size_t len)
 {
-       read(urandom_fd, data, len);
+       return read(urandom_fd, data, len);
 }