X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv6-ia.c;h=de445816116693d0aa70343a2a9fc75fcfcfa7e8;hp=f850b020f5e1648c030b65fc135eb2be1399cc44;hb=9bdbc5a4be1ab75145431bc728159a55c723e2ca;hpb=bc14cf3779925eadefbced51b70bc6f90b90a79e

diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c
index f850b02..de44581 100644
--- a/src/dhcpv6-ia.c
+++ b/src/dhcpv6-ia.c
@@ -219,7 +219,7 @@ void dhcpv6_write_statefile(void)
 			return;
 
 		lockf(fd, F_LOCK, 0);
-		ftruncate(fd, 0);
+		if (ftruncate(fd, 0) < 0) {}
 
 		FILE *fp = fdopen(fd, "w");
 		if (!fp) {
@@ -264,7 +264,8 @@ void dhcpv6_write_statefile(void)
 
 					for (size_t i = 0; i < addrlen; ++i) {
 						if (addrs[i].prefix > 96 || c->valid_until <= now ||
-								(iface->managed < RELAYD_MANAGED_NO_AFLAG && i != m))
+								(iface->managed < RELAYD_MANAGED_NO_AFLAG && i != m &&
+										addrs[i].prefix == 64))
 							continue;
 
 						addr = addrs[i].addr;
@@ -727,13 +728,19 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 					m = i;
 
 			for (size_t i = 0; i < addrlen; ++i) {
-				uint32_t prefix_pref = addrs[i].preferred - now;
-				uint32_t prefix_valid = addrs[i].valid - now;
+				uint32_t prefix_pref = addrs[i].preferred;
+				uint32_t prefix_valid = addrs[i].valid;
 
 				if (addrs[i].prefix > 96 ||
 						addrs[i].preferred <= (uint32_t)now)
 					continue;
 
+				if (prefix_pref != UINT32_MAX)
+					prefix_pref -= now;
+
+				if (prefix_valid != UINT32_MAX)
+					prefix_valid -= now;
+
 				if (a->length < 128) {
 					struct dhcpv6_ia_prefix p = {
 						.type = htons(DHCPV6_OPT_IA_PREFIX),
@@ -764,7 +771,8 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 					n.addr.s6_addr32[3] = htonl(a->assigned);
 					size_t entrlen = sizeof(n) - 4;
 
-					if (iface->managed < RELAYD_MANAGED_NO_AFLAG && i != m)
+					if (iface->managed < RELAYD_MANAGED_NO_AFLAG && i != m &&
+							addrs[i].prefix == 64)
 						continue;
 
 					if (datalen + entrlen + 4 > buflen || a->assigned == 0)