odhcpd: remove old workaround

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

diff --git a/src/odhcpd.c b/src/odhcpd.c
index 52bca13..56f4498 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);
-
 }
 
 
@@ -176,12 +174,6 @@ ssize_t odhcpd_send(int socket, struct sockaddr_in6 *dest,
                        || IN6_IS_ADDR_MC_LINKLOCAL(&dest->sin6_addr))
                dest->sin6_scope_id = iface->ifindex;
 
-       // IPV6_PKTINFO doesn't really work for IPv6-raw sockets (bug?)
-       if (dest->sin6_port == 0) {
-               msg.msg_control = NULL;
-               msg.msg_controllen = 0;
-       }
-
        char ipbuf[INET6_ADDRSTRLEN];
        inet_ntop(AF_INET6, &dest->sin6_addr, ipbuf, sizeof(ipbuf));
 
@@ -196,6 +188,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)