main: fix missing parameter while iterating neighbors
[project/odhcpd.git] / src / odhcpd.c
index 3c384e8..9374052 100644 (file)
@@ -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);
@@ -189,6 +194,61 @@ ssize_t odhcpd_send(int socket, struct sockaddr_in6 *dest,
 }
 
 
+int odhcpd_iterate_interface_neighbors(const struct interface *iface,
+               void(*cb_neigh)(const struct in6_addr *addr,
+                               const struct interface *iface, void *data), void *data)
+{
+       struct {
+               struct nlmsghdr nhm;
+               struct ndmsg ndm;
+       } req = {{sizeof(req), RTM_GETNEIGH, NLM_F_REQUEST | NLM_F_DUMP,
+                       ++rtnl_seq, 0}, {AF_INET6, 0, 0, iface->ifindex, 0, 0, 0}};
+
+       if (send(rtnl_socket, &req, sizeof(req), 0) < (ssize_t)sizeof(req))
+               return -1;
+
+       uint8_t buf[8192];
+       ssize_t len = 0;
+
+       for (struct nlmsghdr *nhm = NULL; ; nhm = NLMSG_NEXT(nhm, len)) {
+               while (len < 0 || !NLMSG_OK(nhm, (size_t)len)) {
+                       len = recv(rtnl_socket, buf, sizeof(buf), 0);
+                       nhm = (struct nlmsghdr*)buf;
+                       if (len < 0 || !NLMSG_OK(nhm, (size_t)len)) {
+                               if (errno == EINTR)
+                                       continue;
+                               else
+                                       return -1;
+                       }
+               }
+
+               if (nhm->nlmsg_type != RTM_NEWNEIGH)
+                       break;
+
+               struct ndmsg *ndm = NLMSG_DATA(nhm);
+               if (ndm->ndm_ifindex != iface->ifindex ||
+                               (ndm->ndm_state & NUD_FAILED))
+                       continue;
+
+               struct rtattr *rta = (struct rtattr*)&ndm[1];
+               size_t alen = NLMSG_PAYLOAD(nhm, sizeof(*ndm));
+
+               while (RTA_OK(rta, alen)) {
+                       if (rta->rta_type == NDA_DST &&
+                                       RTA_PAYLOAD(rta) == sizeof(struct in6_addr)) {
+                               cb_neigh(RTA_DATA(rta), iface, data);
+                               break;
+                       } else {
+                               rta = RTA_NEXT(rta, alen);
+                       }
+               }
+
+       }
+
+       return 0;
+}
+
+
 // Detect an IPV6-address currently assigned to the given interface
 ssize_t odhcpd_get_interface_addresses(int ifindex,
                struct odhcpd_ipaddr *addrs, size_t cnt)
@@ -249,14 +309,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 +383,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) {
@@ -409,9 +468,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);
 }