X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv6-ia.c;h=b1931ef5f55ba225fe344826f08edc55defa6b55;hp=88840a43e430f37ea376c3967381646dadf76305;hb=4b6fb015e3124ad1fbb266f70b5aea5c4d6cbc87;hpb=0a41d480c058b68fe09ac7de044c561dee955233

diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c
index 88840a4..b1931ef 100644
--- a/src/dhcpv6-ia.c
+++ b/src/dhcpv6-ia.c
@@ -101,6 +101,7 @@ int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
 			list_for_each_entry(c, &iface->ia_assignments, head) {
 				if (c->length != 128 || c->assigned > a->assigned) {
 					list_add_tail(&a->head, &c->head);
+					break;
 				} else if (c->assigned == a->assigned) {
 					// Already an assignment with that number
 					break;
@@ -232,7 +233,7 @@ void dhcpv6_write_statefile(void)
 
 					struct in6_addr addr;
 					for (size_t i = 0; i < iface->ia_addr_len; ++i) {
-						if (iface->ia_addr[i].prefix > 64)
+						if (iface->ia_addr[i].prefix > 96)
 							continue;
 
 						addr = iface->ia_addr[i].addr;
@@ -450,7 +451,6 @@ static void update(struct interface *iface)
 		if (addr[i].prefix > minprefix)
 			minprefix = addr[i].prefix;
 
-		addr[i].addr.s6_addr32[2] = 0;
 		addr[i].addr.s6_addr32[3] = 0;
 
 		if (addr[i].preferred < UINT32_MAX - now)
@@ -603,7 +603,7 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 				uint32_t prefix_pref = iface->ia_addr[i].preferred - now;
 				uint32_t prefix_valid = iface->ia_addr[i].valid - now;
 
-				if (iface->ia_addr[i].prefix > 64 ||
+				if (iface->ia_addr[i].prefix > 96 ||
 						iface->ia_addr[i].preferred <= (uint32_t)now)
 					continue;
 
@@ -711,7 +711,7 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 				bool found = false;
 				if (a) {
 					for (size_t i = 0; i < iface->ia_addr_len; ++i) {
-						if (iface->ia_addr[i].prefix > 64 ||
+						if (iface->ia_addr[i].prefix > 96 ||
 								iface->ia_addr[i].preferred <= (uint32_t)now)
 							continue;
 
@@ -719,13 +719,13 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 						if (ia->type == htons(DHCPV6_OPT_IA_PD)) {
 							addr.s6_addr32[1] |= htonl(a->assigned);
 
-							if (IN6_ARE_ADDR_EQUAL(&p->addr, &addr) &&
+							if (!memcmp(&p->addr, &addr, sizeof(addr)) &&
 									p->prefix == a->length)
 								found = true;
 						} else {
 							addr.s6_addr32[3] = htonl(a->assigned);
 
-							if (IN6_ARE_ADDR_EQUAL(&n->addr, &addr))
+							if (!memcmp(&n->addr, &addr, sizeof(addr)))
 								found = true;
 						}
 					}