X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fodhcpd.c;h=9c7f27c4f4ac43b206e8030a05fae44ddba27e2b;hb=1ef3103b7a9ac37bd2967ae57c5f0bc6e697bb7f;hp=c4115424e73bd850c57b9b00eef950162372d5f0;hpb=10fc5665634151fbd8bfd6503db25a4652a0839a;p=project%2Fodhcpd.git

diff --git a/src/odhcpd.c b/src/odhcpd.c
index c411542..9c7f27c 100644
--- a/src/odhcpd.c
+++ b/src/odhcpd.c
@@ -188,61 +188,6 @@ 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_STALE | NUD_REACHABLE | NUD_PERMANENT)))
-			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)
@@ -309,24 +254,21 @@ ssize_t odhcpd_get_interface_addresses(int ifindex,
 	return ret;
 }
 
-int odhcpd_get_preferred_interface_address(int ifindex, struct in6_addr *addr)
+int odhcpd_get_linklocal_interface_address(int ifindex, struct in6_addr *lladdr)
 {
-	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;
+		int status = -1;
+		struct sockaddr_in6 addr = {AF_INET6, 0, 0, ALL_IPV6_ROUTERS, ifindex};
+		socklen_t alen = sizeof(addr);
+		int sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
+
+		if (!connect(sock, (struct sockaddr*)&addr, sizeof(addr)) &&
+				!getsockname(sock, (struct sockaddr*)&addr, &alen)) {
+			*lladdr = addr.sin6_addr;
+			status = 0;
 		}
-	}
 
-	return ret;
+		close(sock);
+		return status;
 }
 
 void odhcpd_setup_route(const struct in6_addr *addr, int prefixlen,