X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv6-ia.c;h=7e8e53520036ebab024101705838877c958a04df;hp=74e344195710888b5fb37e598a4ce49dea1a7861;hb=33858d341fa7eff6e7245a2486fc42aee64c81ff;hpb=73a7133b6e42edc218da5b8011c580ed48c7731a

diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c
index 74e3441..7e8e535 100644
--- a/src/dhcpv6-ia.c
+++ b/src/dhcpv6-ia.c
@@ -596,7 +596,10 @@ static void update(struct interface *iface)
 	}
 
 	struct dhcpv6_assignment *border = list_last_entry(&iface->ia_assignments, struct dhcpv6_assignment, head);
-	border->assigned = 1 << (64 - minprefix);
+	if (minprefix > 32 && minprefix <= 64)
+		border->assigned = 1U << (64 - minprefix);
+	else
+		border->assigned = 0;
 
 	bool change = len != (int)iface->ia_addr_len;
 	for (int i = 0; !change && i < len; ++i)
@@ -728,13 +731,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),