X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv6-ia.c;h=84f368ee17e0bffd0bf7ae6b63f5ccb9f17b8be9;hp=4c077db8730e3f2c99260d42de47c9166186e3c6;hb=51c756cfc15c63322df9fdb70d5c701cfb6b9a9f;hpb=16cd87e8a76884802896495eb0e39461d8303c0f

diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c
index 4c077db..84f368e 100644
--- a/src/dhcpv6-ia.c
+++ b/src/dhcpv6-ia.c
@@ -146,6 +146,11 @@ static void free_dhcpv6_assignment(struct dhcpv6_assignment *c)
 	free(c);
 }
 
+static inline bool valid_prefix_length(const struct dhcpv6_assignment *a, const uint8_t prefix_length)
+{
+	return (a->managed_size || a->length > prefix_length);
+}
+
 static inline bool valid_addr(const struct odhcpd_ipaddr *addr, time_t now)
 {
 	return (addr->prefix <= 96 && addr->preferred > (uint32_t)now);
@@ -280,15 +285,22 @@ void dhcpv6_write_statefile(void)
 
 					for (size_t i = 0; i < addrlen; ++i) {
 						if (!valid_addr(&addrs[i], now) ||
-							    (!INFINITE_VALID(c->valid_until) && c->valid_until <= now) ||
-							    !ADDR_ENTRY_VALID_IA_ADDR(iface, i, m, addrs))
+							    (!INFINITE_VALID(c->valid_until) && c->valid_until <= now))
 							continue;
 
 						addr = addrs[i].addr;
-						if (c->length == 128)
+						if (c->length == 128) {
+							if (!ADDR_ENTRY_VALID_IA_ADDR(iface, i, m, addrs))
+								continue;
+
 							addr.s6_addr32[3] = htonl(c->assigned);
-						else
+						}
+						else {
+							if (!valid_prefix_length(c, addrs[i].prefix))
+								continue;
+
 							addr.s6_addr32[1] |= htonl(c->assigned);
+						}
 
 						inet_ntop(AF_INET6, &addr, ipbuf, sizeof(ipbuf) - 1);
 
@@ -519,7 +531,10 @@ static bool assign_pd(struct interface *iface, struct dhcpv6_assignment *assign)
 
 			if (assign->assigned >= current && assign->assigned + asize < c->assigned) {
 				list_add_tail(&assign->head, &c->head);
-				apply_lease(iface, assign, true);
+
+				if (assign->flags & OAF_BOUND)
+					apply_lease(iface, assign, true);
+
 				return true;
 			}
 
@@ -538,7 +553,10 @@ static bool assign_pd(struct interface *iface, struct dhcpv6_assignment *assign)
 		if (current + asize < c->assigned) {
 			assign->assigned = current;
 			list_add_tail(&assign->head, &c->head);
-			apply_lease(iface, assign, true);
+
+			if (assign->flags & OAF_BOUND)
+				apply_lease(iface, assign, true);
+
 			return true;
 		}
 
@@ -588,7 +606,7 @@ void dhcpv6_ia_preupdate(struct interface *iface)
 			&iface->ia_assignments, struct dhcpv6_assignment, head);
 
 	list_for_each_entry(c, &iface->ia_assignments, head)
-		if (c != border && !iface->managed)
+		if (c != border && !iface->managed && (c->flags & OAF_BOUND))
 			apply_lease(iface, c, false);
 }
 
@@ -622,7 +640,7 @@ void dhcpv6_ia_postupdate(struct interface *iface, time_t now)
 
 		if (c->length < 128 && c->assigned >= border->assigned && c != border)
 			list_move(&c->head, &reassign);
-		else if (c != border)
+		else if (c != border && (c->flags & OAF_BOUND))
 			apply_lease(iface, c, true);
 
 		if (c->accept_reconf && c->reconf_cnt == 0) {
@@ -746,7 +764,7 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 
 					if (datalen + entrlen + 4 > buflen ||
 							(a->assigned == 0 && a->managed_size == 0) ||
-							(!a->managed_size && a->length <= addrs[i].prefix))
+							!valid_prefix_length(a, addrs[i].prefix))
 						continue;
 
 					memcpy(buf + datalen, &p, sizeof(p));
@@ -944,8 +962,12 @@ static void dhcpv6_log(uint8_t msgtype, struct interface *iface, time_t now,
 
 				addr.s6_addr32[3] = htonl(a->assigned);
 			}
-			else
+			else {
+				if (!valid_prefix_length(a, addrs[i].prefix))
+					continue;
+
 				addr.s6_addr32[1] |= htonl(a->assigned);
+			}
 
 			inet_ntop(AF_INET6, &addr, addrbuf, sizeof(addrbuf));
 			lbsize += snprintf(leasebuf + lbsize, sizeof(leasebuf) - lbsize, "%s/%d ", addrbuf, prefix);
@@ -1052,7 +1074,9 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 				a = c;
 
 				/* Reset state */
-				apply_lease(iface, a, false);
+				if (a->flags & OAF_BOUND)
+					apply_lease(iface, a, false);
+
 				memcpy(a->clid_data, clid_data, clid_len);
 				a->clid_len = clid_len;
 				a->iaid = ia->iaid;
@@ -1174,8 +1198,10 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 				if (!(a->flags & OAF_STATIC))
 					a->valid_until = now - 1;
 
-				a->flags &= ~OAF_BOUND;
-				apply_lease(iface, a, false);
+				if (a->flags & OAF_BOUND) {
+					apply_lease(iface, a, false);
+					a->flags &= ~OAF_BOUND;
+				}
 			} else if (hdr->msg_type == DHCPV6_MSG_DECLINE && a->length == 128) {
 				a->flags &= ~OAF_BOUND;