X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv6.c;h=4ecb54ab35c441de190b55792dfe8e9272c65bea;hp=81eae06059481a6b046eca711ab68f8552071fbe;hb=f4d38e0a853e933a4da54fde8ec2711b5dc5b741;hpb=c5040fea540479b731b040986a9c3a62e34afc37

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 81eae06..4ecb54a 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -229,7 +229,7 @@ static void handle_client_request(void *addr, void *data, size_t len,
 	size_t dns_cnt = iface->dns_cnt;
 
 	if ((dns_cnt == 0) &&
-		!odhcpd_get_linklocal_interface_address(iface->ifindex, &dns_addr)) {
+		!odhcpd_get_interface_dns_addr(iface, &dns_addr)) {
 		dns_addr_ptr = &dns_addr;
 		dns_cnt = 1;
 	}
@@ -332,14 +332,15 @@ static void handle_client_request(void *addr, void *data, size_t len,
 			iov[IOV_CERID].iov_len = sizeof(cerid);
 
 			if (IN6_IS_ADDR_UNSPECIFIED(&cerid.addr)) {
-				struct odhcpd_ipaddr addrs[32];
-				ssize_t len = odhcpd_get_interface_addresses(0, addrs,
-						ARRAY_SIZE(addrs));
+				struct odhcpd_ipaddr *addrs;
+				ssize_t len = odhcpd_get_interface_addresses(0, true, &addrs);
 
 				for (ssize_t i = 0; i < len; ++i)
 					if (IN6_IS_ADDR_UNSPECIFIED(&cerid.addr)
 							|| memcmp(&addrs[i].addr, &cerid.addr, sizeof(cerid.addr)) < 0)
 						cerid.addr = addrs[i].addr;
+
+				free(addrs);
 			}
 #endif
 		}
@@ -461,7 +462,7 @@ static void relay_server_response(uint8_t *data, size_t len)
 		size_t rewrite_cnt = iface->dns_cnt;
 
 		if (rewrite_cnt == 0) {
-			if (odhcpd_get_linklocal_interface_address(iface->ifindex, &addr))
+			if (odhcpd_get_interface_dns_addr(iface, &addr))
 				return; // Unable to get interface address
 
 			rewrite = &addr;
@@ -479,6 +480,26 @@ static void relay_server_response(uint8_t *data, size_t len)
 	odhcpd_send(iface->dhcpv6_event.uloop.fd, &target, &iov, 1, iface);
 }
 
+static struct odhcpd_ipaddr *relay_link_address(struct interface *iface)
+{
+	struct odhcpd_ipaddr *addr = NULL;
+	time_t now = odhcpd_time();
+
+	for (size_t i = 0; i < iface->ia_addr_len; i++) {
+		if (iface->ia_addr[i].valid <= (uint32_t)now)
+			continue;
+
+		if (iface->ia_addr[i].preferred > (uint32_t)now) {
+			addr = &iface->ia_addr[i];
+			break;
+		}
+
+		if (!addr || (iface->ia_addr[i].valid > addr->valid))
+			addr = &iface->ia_addr[i];
+	}
+
+	return addr;
+}
 
 // Relay client request (regular DHCPv6-relay)
 static void relay_client_request(struct sockaddr_in6 *source,
@@ -518,17 +539,19 @@ static void relay_client_request(struct sockaddr_in6 *source,
 	memcpy(&hdr.interface_id_data, &ifindex, sizeof(ifindex));
 
 	// Detect public IP of slave interface to use as link-address
-	struct odhcpd_ipaddr ip;
-	if (odhcpd_get_interface_addresses(iface->ifindex, &ip, 1) < 1) {
+	struct odhcpd_ipaddr *ip = relay_link_address(iface);
+	if (!ip) {
 		// No suitable address! Is the slave not configured yet?
 		// Detect public IP of master interface and use it instead
 		// This is WRONG and probably violates the RFC. However
 		// otherwise we have a hen and egg problem because the
 		// slave-interface cannot be auto-configured.
-		if (odhcpd_get_interface_addresses(master->ifindex, &ip, 1) < 1)
+		ip = relay_link_address(master);
+		if (!ip)
 			return; // Could not obtain a suitable address
 	}
-	memcpy(&hdr.link_address, &ip.addr, sizeof(hdr.link_address));
+
+	memcpy(&hdr.link_address, &ip->addr.in6, sizeof(hdr.link_address));
 
 	struct sockaddr_in6 dhcpv6_servers = {AF_INET6,
 			htons(DHCPV6_SERVER_PORT), 0, ALL_DHCPV6_SERVERS, 0};