X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv6-ia.c;h=c8786c3672c32d925e1da1d21d76ace66493de2c;hp=e1d0278e013c56a03e9d7ae2bd2d73ef0e92edff;hb=561890e1ce8aa467a83db5f05e563a00d4d9aa47;hpb=60c396937959aff9b5358e7a5ab788f0f5f30ed4

diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c
index e1d0278..c8786c3 100644
--- a/src/dhcpv6-ia.c
+++ b/src/dhcpv6-ia.c
@@ -141,6 +141,25 @@ static void free_dhcpv6_assignment(struct dhcpv6_assignment *c)
 	free(c);
 }
 
+static inline bool valid_addr(const struct odhcpd_ipaddr *addr, time_t now)
+{
+	return (addr->prefix <= 96 && addr->preferred > (uint32_t)now);
+}
+
+static size_t elect_addr(const struct odhcpd_ipaddr *addrs, const size_t addrlen)
+{
+	size_t i, m;
+
+	for (i = 0, m = 0; i < addrlen; ++i) {
+		if (addrs[i].preferred > addrs[m].preferred ||
+			(addrs[i].preferred == addrs[m].preferred &&
+			 memcmp(&addrs[i].addr, &addrs[m].addr, 16) > 0))
+			m = i;
+	}
+
+	return m;
+}
+
 static int send_reconf(struct interface *iface, struct dhcpv6_assignment *assign)
 {
 	struct {
@@ -252,18 +271,12 @@ void dhcpv6_write_statefile(void)
 					struct in6_addr addr;
 					struct odhcpd_ipaddr *addrs = (c->managed) ? c->managed : iface->ia_addr;
 					size_t addrlen = (c->managed) ? (size_t)c->managed_size : iface->ia_addr_len;
-					size_t m = 0;
-
-					for (size_t i = 0; i < addrlen; ++i)
-						if (addrs[i].preferred > addrs[m].preferred ||
-								(addrs[i].preferred == addrs[m].preferred &&
-										memcmp(&addrs[i].addr, &addrs[m].addr, 16) > 0))
-							m = i;
+					size_t m = elect_addr(addrs, addrlen);
 
 					for (size_t i = 0; i < addrlen; ++i) {
-						if (addrs[i].prefix > 96 || (!INFINITE_VALID(c->valid_until) && c->valid_until <= now) ||
+						if (!valid_addr(&addrs[i], now) || (!INFINITE_VALID(c->valid_until) && c->valid_until <= now) ||
 								(iface->managed < RELAYD_MANAGED_NO_AFLAG && i != m &&
-										addrs[i].prefix == 64))
+										addrs[i].prefix <= 64))
 							continue;
 
 						addr = addrs[i].addr;
@@ -437,7 +450,7 @@ static void managed_handle_pd_data(struct ustream *s, _unused int bytes_new)
 
 	if (first && c->managed_size == 0)
 		free_dhcpv6_assignment(c);
-	else if (first)
+	else if (first & !(c->flags & OAF_STATIC))
 		c->valid_until = now + 150;
 }
 
@@ -447,7 +460,9 @@ static void managed_handle_pd_done(struct ustream *s)
 {
 	struct dhcpv6_assignment *c = container_of(s, struct dhcpv6_assignment, managed_sock);
 
-	c->valid_until = odhcpd_time() + 15;
+	if (!(c->flags & OAF_STATIC))
+		c->valid_until = odhcpd_time() + 15;
+
 	c->managed_size = 0;
 
 	if (c->accept_reconf)
@@ -471,7 +486,10 @@ static bool assign_pd(struct interface *iface, struct dhcpv6_assignment *assign)
 					iaidbuf, assign->iaid, assign->length);
 			ustream_write_pending(&assign->managed_sock.stream);
 			assign->managed_size = -1;
-			assign->valid_until = odhcpd_time() + 15;
+
+			if (!(assign->flags & OAF_STATIC))
+				assign->valid_until = odhcpd_time() + 15;
+
 			list_add(&assign->head, &iface->ia_assignments);
 
 			/* Wait initial period of up to 250ms for immediate assignment */
@@ -640,10 +658,9 @@ static void reconf_timer(struct uloop_timeout *event)
 		list_for_each_entry_safe(a, n, &iface->ia_assignments, head) {
 			if (!INFINITE_VALID(a->valid_until) && a->valid_until < now) {
 				if ((a->length < 128 && a->clid_len > 0) ||
-						(a->length == 128 && a->clid_len == 0)) {
-					list_del(&a->head);
+						(a->length == 128 && a->clid_len == 0))
 					free_dhcpv6_assignment(a);
-				}
+
 			} else if (a->reconf_cnt > 0 && a->reconf_cnt < 8 &&
 					now > a->reconf_sent + (1 << a->reconf_cnt)) {
 				++a->reconf_cnt;
@@ -694,20 +711,13 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 
 			struct odhcpd_ipaddr *addrs = (a->managed) ? a->managed : iface->ia_addr;
 			size_t addrlen = (a->managed) ? (size_t)a->managed_size : iface->ia_addr_len;
-			size_t m = 0;
-
-			for (size_t i = 0; i < addrlen; ++i)
-				if (addrs[i].preferred > addrs[m].preferred ||
-						(addrs[i].preferred == addrs[m].preferred &&
-								memcmp(&addrs[i].addr, &addrs[m].addr, 16) > 0))
-					m = i;
+			size_t m = elect_addr(addrs, addrlen);
 
 			for (size_t i = 0; i < addrlen; ++i) {
 				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)
+				if (!valid_addr(&addrs[i], now))
 					continue;
 
 				if (prefix_pref != UINT32_MAX)
@@ -798,8 +808,7 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 					size_t addrlen = (a->managed) ? (size_t)a->managed_size : iface->ia_addr_len;
 
 					for (size_t i = 0; i < addrlen; ++i) {
-						if (addrs[i].prefix > 96 ||
-								addrs[i].preferred <= (uint32_t)now)
+						if (!valid_addr(&addrs[i], now))
 							continue;
 
 						struct in6_addr addr = addrs[i].addr;
@@ -919,7 +928,7 @@ static void dhcpv6_log(uint8_t msgtype, struct interface *iface, time_t now,
 		char addrbuf[INET6_ADDRSTRLEN];
 
 		for (size_t i = 0; i < addrlen; ++i) {
-			if (addrs[i].prefix > 96 || addrs[i].preferred <= (uint32_t)now)
+			if (!valid_addr(&addrs[i], now))
 				continue;
 
 			struct in6_addr addr = addrs[i].addr;