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

diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c
index 1476e02..4c077db 100644
--- a/src/dhcpv6-ia.c
+++ b/src/dhcpv6-ia.c
@@ -1,5 +1,6 @@
 /**
  * Copyright (C) 2013 Steven Barth <steven@midlink.org>
+ * Copyright (C) 2016 Hans Dedecker <dedeckeh@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License v2 as published by
@@ -33,49 +34,34 @@
 #include <arpa/inet.h>
 #include <sys/timerfd.h>
 
+#define ADDR_ENTRY_VALID_IA_ADDR(iface, i, m, addrs) \
+    ((iface)->managed == RELAYD_MANAGED_NO_AFLAG || (i) == (m) || \
+     (addrs)[(i)].prefix > 64)
 
-static void update(struct interface *iface);
+static void free_dhcpv6_assignment(struct dhcpv6_assignment *c);
 static void reconf_timer(struct uloop_timeout *event);
 static struct uloop_timeout reconf_event = {.cb = reconf_timer};
 static uint32_t serial = 0;
 static uint8_t statemd5[16];
 
-
 int dhcpv6_ia_init(void)
 {
 	uloop_timeout_set(&reconf_event, 2000);
 	return 0;
 }
 
-
-void free_dhcpv6_assignment(struct dhcpv6_assignment *c)
-{
-	if (c->managed_sock.fd.registered) {
-		ustream_free(&c->managed_sock.stream);
-		close(c->managed_sock.fd.fd);
-	}
-
-	if (c->head.next)
-		list_del(&c->head);
-
-	free(c->managed);
-	free(c->hostname);
-	free(c->classes);
-	free(c);
-}
-
-
 int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
 {
 	if (!enable && iface->ia_assignments.next) {
 		struct dhcpv6_assignment *c;
+
 		while (!list_empty(&iface->ia_assignments)) {
 			c = list_first_entry(&iface->ia_assignments, struct dhcpv6_assignment, head);
 			free_dhcpv6_assignment(c);
 		}
 	}
 
-	if (iface->dhcpv6 == RELAYD_SERVER) {
+	if (enable && iface->dhcpv6 == RELAYD_SERVER) {
 		if (!iface->ia_assignments.next)
 			INIT_LIST_HEAD(&iface->ia_assignments);
 
@@ -85,25 +71,27 @@ int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
 				syslog(LOG_ERR, "Calloc failed for border on interface %s", iface->ifname);
 				return -1;
 			}
-			
+
 			border->length = 64;
 			list_add(&border->head, &iface->ia_assignments);
 		}
 
-		update(iface);
-
-		// Parse static entries
+		/* Parse static entries */
 		struct lease *lease;
 		list_for_each_entry(lease, &leases, head) {
-			// Construct entry
-			struct dhcpv6_assignment *a = calloc(1, sizeof(*a) + lease->duid_len);
+			/* Construct entry */
+			size_t duid_len = lease->duid_len ? lease->duid_len : 14;
+			struct dhcpv6_assignment *a = calloc(1, sizeof(*a) + duid_len);
 			if (!a) {
 				syslog(LOG_ERR, "Calloc failed for static lease assignment on interface %s",
 					iface->ifname);
 				return -1;
 			}
 
-			a->clid_len = lease->duid_len;
+			if (lease->dhcpv4_leasetime > 0)
+				a->leasetime = lease->dhcpv4_leasetime;
+
+			a->clid_len = duid_len;
 			a->length = 128;
 			if (lease->hostid) {
 				a->assigned = lease->hostid;
@@ -111,20 +99,24 @@ int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
 				uint32_t i4a = ntohl(lease->ipaddr.s_addr) & 0xff;
 				a->assigned = ((i4a / 100) << 8) | (((i4a % 100) / 10) << 4) | (i4a % 10);
 			}
+
 			odhcpd_urandom(a->key, sizeof(a->key));
-			memcpy(a->clid_data, lease->duid, a->clid_len);
+			memcpy(a->clid_data, lease->duid, lease->duid_len);
 			memcpy(a->mac, lease->mac.ether_addr_octet, sizeof(a->mac));
+			/* Static assignment */
+			a->flags |= OAF_STATIC;
+			/* Infinite valid */
+			a->valid_until = 0;
 
-			// Assign to all interfaces
+			/* Assign to all interfaces */
 			struct dhcpv6_assignment *c;
 			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
+				} else if (c->assigned == a->assigned)
+					/* Already an assignment with that number */
 					break;
-				}
 			}
 
 			if (a->head.next) {
@@ -132,16 +124,46 @@ int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
 					free(a->hostname);
 					a->hostname = strdup(lease->hostname);
 				}
-			} else {
-				free(a->classes);
-				free(a->hostname);
-				free(a);
-			}
+			} else
+				free_dhcpv6_assignment(a);
 		}
 	}
 	return 0;
 }
 
+static void free_dhcpv6_assignment(struct dhcpv6_assignment *c)
+{
+	if (c->managed_sock.fd.registered) {
+		ustream_free(&c->managed_sock.stream);
+		close(c->managed_sock.fd.fd);
+	}
+
+	if (c->head.next)
+		list_del(&c->head);
+
+	free(c->managed);
+	free(c->hostname);
+	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)
 {
@@ -206,7 +228,6 @@ static int send_reconf(struct interface *iface, struct dhcpv6_assignment *assign
 	return odhcpd_send(iface->dhcpv6_event.uloop.fd, &assign->peer, &iov, 1, iface);
 }
 
-
 void dhcpv6_write_statefile(void)
 {
 	md5_ctx_t md5;
@@ -235,7 +256,7 @@ void dhcpv6_write_statefile(void)
 			if (iface->dhcpv6 == RELAYD_SERVER && iface->ia_assignments.next) {
 				struct dhcpv6_assignment *c;
 				list_for_each_entry(c, &iface->ia_assignments, head) {
-					if (c->clid_len == 0 || c->managed_size < 0)
+					if (!(c->flags & OAF_BOUND) || c->managed_size < 0)
 						continue;
 
 					char ipbuf[INET6_ADDRSTRLEN];
@@ -243,29 +264,24 @@ void dhcpv6_write_statefile(void)
 					char duidbuf[264];
 					odhcpd_hexlify(duidbuf, c->clid_data, c->clid_len);
 
-					// iface DUID iaid hostname lifetime assigned length [addrs...]
-					int l = snprintf(leasebuf, sizeof(leasebuf), "# %s %s %x %s %u %x %u ",
+					/* iface DUID iaid hostname lifetime assigned length [addrs...] */
+					int l = snprintf(leasebuf, sizeof(leasebuf), "# %s %s %x %s %ld %x %u ",
 							iface->ifname, duidbuf, ntohl(c->iaid),
 							(c->hostname ? c->hostname : "-"),
-							(unsigned)(c->valid_until > now ?
-									(c->valid_until - now + wall_time) : 0),
+							(c->valid_until > now ?
+								(c->valid_until - now + wall_time) :
+								(INFINITE_VALID(c->valid_until) ? -1 : 0)),
 							c->assigned, (unsigned)c->length);
 
 					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 || c->valid_until <= now ||
-								(iface->managed < RELAYD_MANAGED_NO_AFLAG && i != m &&
-										addrs[i].prefix == 64))
+						if (!valid_addr(&addrs[i], now) ||
+							    (!INFINITE_VALID(c->valid_until) && c->valid_until <= now) ||
+							    !ADDR_ENTRY_VALID_IA_ADDR(iface, i, m, addrs))
 							continue;
 
 						addr = addrs[i].addr;
@@ -280,9 +296,9 @@ void dhcpv6_write_statefile(void)
 							fputs(ipbuf, fp);
 
 							char b[256];
-					                if (dn_expand(iface->search, iface->search + iface->search_len,
-					                		iface->search, b, sizeof(b)) > 0)
-					                	fprintf(fp, "\t%s.%s", c->hostname, b);
+							if (dn_expand(iface->search, iface->search + iface->search_len,
+									iface->search, b, sizeof(b)) > 0)
+								fprintf(fp, "\t%s.%s", c->hostname, b);
 
 							fprintf(fp, "\t%s\n", c->hostname);
 							md5_hash(ipbuf, strlen(ipbuf), &md5);
@@ -300,29 +316,33 @@ void dhcpv6_write_statefile(void)
 			if (iface->dhcpv4 == RELAYD_SERVER && iface->dhcpv4_assignments.next) {
 				struct dhcpv4_assignment *c;
 				list_for_each_entry(c, &iface->dhcpv4_assignments, head) {
+					if (!(c->flags & OAF_BOUND))
+						continue;
+
 					char ipbuf[INET6_ADDRSTRLEN];
 					char leasebuf[512];
 					char duidbuf[16];
 					odhcpd_hexlify(duidbuf, c->hwaddr, sizeof(c->hwaddr));
 
-					// iface DUID iaid hostname lifetime assigned length [addrs...]
-					int l = snprintf(leasebuf, sizeof(leasebuf), "# %s %s ipv4 %s %u %x 32 ",
+					/* iface DUID iaid hostname lifetime assigned length [addrs...] */
+					int l = snprintf(leasebuf, sizeof(leasebuf), "# %s %s ipv4 %s %ld %x 32 ",
 							iface->ifname, duidbuf,
 							(c->hostname ? c->hostname : "-"),
-							(unsigned)(c->valid_until > now ?
-									(c->valid_until - now + wall_time) : 0),
+							(c->valid_until > now ?
+								(c->valid_until - now + wall_time) :
+								(INFINITE_VALID(c->valid_until) ? -1 : 0)),
 							c->addr);
 
 					struct in_addr addr = {htonl(c->addr)};
 					inet_ntop(AF_INET, &addr, ipbuf, sizeof(ipbuf) - 1);
 
-					if (c->hostname[0]) {
+					if (c->hostname) {
 						fputs(ipbuf, fp);
 
 						char b[256];
-				                if (dn_expand(iface->search, iface->search + iface->search_len,
-				                		iface->search, b, sizeof(b)) > 0)
-				                	fprintf(fp, "\t%s.%s", c->hostname, b);
+						if (dn_expand(iface->search, iface->search + iface->search_len,
+								iface->search, b, sizeof(b)) > 0)
+							fprintf(fp, "\t%s.%s", c->hostname, b);
 
 						fprintf(fp, "\t%s\n", c->hostname);
 						md5_hash(ipbuf, strlen(ipbuf), &md5);
@@ -365,12 +385,11 @@ static void apply_lease(struct interface *iface, struct dhcpv6_assignment *a, bo
 		struct in6_addr prefix = addrs[i].addr;
 		prefix.s6_addr32[1] |= htonl(a->assigned);
 		odhcpd_setup_route(&prefix, (a->managed_size) ? addrs[i].prefix : a->length,
-				iface, &a->peer.sin6_addr, add);
+				iface, &a->peer.sin6_addr, 1024, add);
 	}
 }
 
-
-// More data was received from TCP connection
+/* More data was received from TCP connection */
 static void managed_handle_pd_data(struct ustream *s, _unused int bytes_new)
 {
 	struct dhcpv6_assignment *c = container_of(s, struct dhcpv6_assignment, managed_sock);
@@ -436,23 +455,25 @@ 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;
 }
 
 
-// TCP transmission has ended, either because of success or timeout or other error
+/* TCP transmission has ended, either because of success or timeout or other error */
 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)
 		c->reconf_cnt = 1;
 }
 
-
-
 static bool assign_pd(struct interface *iface, struct dhcpv6_assignment *assign)
 {
 	struct dhcpv6_assignment *c;
@@ -470,10 +491,13 @@ 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
+			/* Wait initial period of up to 250ms for immediate assignment */
 			struct pollfd pfd = { .fd = fd, .events = POLLIN };
 			poll(&pfd, 1, 250);
 			managed_handle_pd_data(&assign->managed_sock.stream, 0);
@@ -483,11 +507,10 @@ static bool assign_pd(struct interface *iface, struct dhcpv6_assignment *assign)
 		}
 
 		return false;
-	} else if (iface->ia_addr_len < 1) {
+	} else if (iface->ia_addr_len < 1)
 		return false;
-	}
 
-	// Try honoring the hint first
+	/* Try honoring the hint first */
 	uint32_t current = 1, asize = (1 << (64 - assign->length)) - 1;
 	if (assign->assigned) {
 		list_for_each_entry(c, &iface->ia_assignments, head) {
@@ -505,7 +528,7 @@ static bool assign_pd(struct interface *iface, struct dhcpv6_assignment *assign)
 		}
 	}
 
-	// Fallback to a variable assignment
+	/* Fallback to a variable assignment */
 	current = 1;
 	list_for_each_entry(c, &iface->ia_assignments, head) {
 		if (c->length == 128 || c->length == 0)
@@ -526,16 +549,15 @@ static bool assign_pd(struct interface *iface, struct dhcpv6_assignment *assign)
 	return false;
 }
 
-
 static bool assign_na(struct interface *iface, struct dhcpv6_assignment *assign)
 {
-	// Seed RNG with checksum of DUID
+	/* Seed RNG with checksum of DUID */
 	uint32_t seed = 0;
 	for (size_t i = 0; i < assign->clid_len; ++i)
 		seed += assign->clid_data[i];
 	srand(seed);
 
-	// Try to assign up to 100x
+	/* Try to assign up to 100x */
 	for (size_t i = 0; i < 100; ++i) {
 		uint32_t try;
 		do try = ((uint32_t)rand()) % 0x0fff; while (try < 0x100);
@@ -549,116 +571,85 @@ static bool assign_na(struct interface *iface, struct dhcpv6_assignment *assign)
 				assign->assigned = try;
 				list_add_tail(&assign->head, &c->head);
 				return true;
-			} else if (c->assigned == try) {
+			} else if (c->assigned == try)
 				break;
-			}
 		}
 	}
 
 	return false;
 }
 
-
-static int prefixcmp(const void *va, const void *vb)
+void dhcpv6_ia_preupdate(struct interface *iface)
 {
-	const struct odhcpd_ipaddr *a = va, *b = vb;
-	uint32_t a_pref = ((a->addr.s6_addr[0] & 0xfe) != 0xfc) ? a->preferred : 1;
-	uint32_t b_pref = ((b->addr.s6_addr[0] & 0xfe) != 0xfc) ? b->preferred : 1;
-	return (a_pref < b_pref) ? 1 : (a_pref > b_pref) ? -1 : 0;
-}
+	if (iface->dhcpv6 != RELAYD_SERVER)
+		return;
 
+	struct dhcpv6_assignment *c, *border = list_last_entry(
+			&iface->ia_assignments, struct dhcpv6_assignment, head);
 
-static void update(struct interface *iface)
-{
-	struct odhcpd_ipaddr addr[8];
-	memset(addr, 0, sizeof(addr));
-	int len = odhcpd_get_interface_addresses(iface->ifindex, addr, 8);
+	list_for_each_entry(c, &iface->ia_assignments, head)
+		if (c != border && !iface->managed)
+			apply_lease(iface, c, false);
+}
 
-	if (len < 0)
+void dhcpv6_ia_postupdate(struct interface *iface, time_t now)
+{
+	if (iface->dhcpv6 != RELAYD_SERVER)
 		return;
 
-	qsort(addr, len, sizeof(*addr), prefixcmp);
-
-	time_t now = odhcpd_time();
 	int minprefix = -1;
-
-	for (int i = 0; i < len; ++i) {
-		if (addr[i].preferred > 0 && addr[i].prefix > minprefix)
-			minprefix = addr[i].prefix;
-
-		addr[i].addr.s6_addr32[3] = 0;
-
-		if (addr[i].preferred < UINT32_MAX - now)
-			addr[i].preferred += now;
-
-		if (addr[i].valid < UINT32_MAX - now)
-			addr[i].valid += now;
+	for (size_t i = 0; i < iface->ia_addr_len; ++i) {
+		if (iface->ia_addr[i].preferred > (uint32_t)now &&
+				iface->ia_addr[i].prefix < 64 &&
+				iface->ia_addr[i].prefix > minprefix)
+			minprefix = iface->ia_addr[i].prefix;
 	}
 
-	struct dhcpv6_assignment *border = list_last_entry(&iface->ia_assignments, struct dhcpv6_assignment, head);
-	if (minprefix <= 32 || minprefix > 64)
+	struct dhcpv6_assignment *border = list_last_entry(
+			&iface->ia_assignments, struct dhcpv6_assignment, head);
+
+	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)
-		if (addr[i].addr.s6_addr32[0] != iface->ia_addr[i].addr.s6_addr32[0] ||
-				addr[i].addr.s6_addr32[1] != iface->ia_addr[i].addr.s6_addr32[1] ||
-				(addr[i].preferred > 0) != (iface->ia_addr[i].preferred > 0) ||
-				(addr[i].valid > (uint32_t)now + 7200) !=
-						(iface->ia_addr[i].valid > (uint32_t)now + 7200))
-			change = true;
-
-	if (change) {
-		struct dhcpv6_assignment *c;
-		list_for_each_entry(c, &iface->ia_assignments, head)
-			if (c != border && !iface->managed)
-				apply_lease(iface, c, false);
-	}
-
-	memcpy(iface->ia_addr, addr, len * sizeof(*addr));
-	iface->ia_addr_len = len;
+	struct list_head reassign = LIST_HEAD_INIT(reassign);
+	struct dhcpv6_assignment *c, *d;
+	list_for_each_entry_safe(c, d, &iface->ia_assignments, head) {
+		if (c->clid_len == 0 || (!INFINITE_VALID(c->valid_until) && c->valid_until < now) ||
+				c->managed_size)
+			continue;
 
-	if (change) { // Addresses / prefixes have changed
-		struct list_head reassign = LIST_HEAD_INIT(reassign);
-		struct dhcpv6_assignment *c, *d;
-		list_for_each_entry_safe(c, d, &iface->ia_assignments, head) {
-			if (c->clid_len == 0 || c->valid_until < now || c->managed_size)
-				continue;
+		if (c->length < 128 && c->assigned >= border->assigned && c != border)
+			list_move(&c->head, &reassign);
+		else if (c != border)
+			apply_lease(iface, c, true);
 
-			if (c->length < 128 && c->assigned >= border->assigned && c != border)
-				list_move(&c->head, &reassign);
-			else if (c != border)
-				apply_lease(iface, c, true);
-
-			if (c->accept_reconf && c->reconf_cnt == 0) {
-				c->reconf_cnt = 1;
-				c->reconf_sent = now;
-				send_reconf(iface, c);
-
-				// Leave all other assignments of that client alone
-				struct dhcpv6_assignment *a;
-				list_for_each_entry(a, &iface->ia_assignments, head)
-					if (a != c && a->clid_len == c->clid_len &&
-							!memcmp(a->clid_data, c->clid_data, a->clid_len))
-						c->reconf_cnt = INT_MAX;
-			}
+		if (c->accept_reconf && c->reconf_cnt == 0) {
+			c->reconf_cnt = 1;
+			c->reconf_sent = now;
+			send_reconf(iface, c);
+
+			/* Leave all other assignments of that client alone */
+			struct dhcpv6_assignment *a;
+			list_for_each_entry(a, &iface->ia_assignments, head)
+				if (a != c && a->clid_len == c->clid_len &&
+						!memcmp(a->clid_data, c->clid_data, a->clid_len))
+					c->reconf_cnt = INT_MAX;
 		}
+	}
 
-		while (!list_empty(&reassign)) {
-			c = list_first_entry(&reassign, struct dhcpv6_assignment, head);
-			list_del(&c->head);
-			if (!assign_pd(iface, c)) {
-				c->assigned = 0;
-				list_add(&c->head, &iface->ia_assignments);
-			}
+	while (!list_empty(&reassign)) {
+		c = list_first_entry(&reassign, struct dhcpv6_assignment, head);
+		list_del(&c->head);
+		if (!assign_pd(iface, c)) {
+			c->assigned = 0;
+			list_add(&c->head, &iface->ia_assignments);
 		}
-
-		dhcpv6_write_statefile();
 	}
-}
 
+	dhcpv6_write_statefile();
+}
 
 static void reconf_timer(struct uloop_timeout *event)
 {
@@ -670,12 +661,11 @@ static void reconf_timer(struct uloop_timeout *event)
 
 		struct dhcpv6_assignment *a, *n;
 		list_for_each_entry_safe(a, n, &iface->ia_assignments, head) {
-			if (a->valid_until < now) {
+			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;
@@ -687,7 +677,6 @@ static void reconf_timer(struct uloop_timeout *event)
 	uloop_timeout_set(event, 2000);
 }
 
-
 static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 		const struct dhcpv6_ia_hdr *ia, struct dhcpv6_assignment *a,
 		struct interface *iface, bool request)
@@ -711,7 +700,12 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 		datalen += sizeof(stat);
 	} else {
 		if (a) {
-			uint32_t leasetime = iface->dhcpv4_leasetime;
+			uint32_t leasetime;
+			if (a->leasetime > 0)
+				leasetime = a->leasetime;
+			else
+				leasetime = iface->dhcpv4_leasetime;
+
 			if (leasetime == 0)
 				leasetime = 3600;
 			else if (leasetime < 60)
@@ -722,20 +716,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)
@@ -758,7 +745,8 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 					size_t entrlen = sizeof(p) - 4;
 
 					if (datalen + entrlen + 4 > buflen ||
-							(a->assigned == 0 && a->managed_size == 0))
+							(a->assigned == 0 && a->managed_size == 0) ||
+							(!a->managed_size && a->length <= addrs[i].prefix))
 						continue;
 
 					memcpy(buf + datalen, &p, sizeof(p));
@@ -774,18 +762,16 @@ 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 &&
-							addrs[i].prefix == 64)
-						continue;
-
-					if (datalen + entrlen + 4 > buflen || a->assigned == 0)
+					if (!ADDR_ENTRY_VALID_IA_ADDR(iface, i, m, addrs) ||
+							a->assigned == 0 ||
+							datalen + entrlen + 4 > buflen)
 						continue;
 
 					memcpy(buf + datalen, &n, sizeof(n));
 					datalen += entrlen + 4;
 				}
 
-				// Calculate T1 / T2 based on non-deprecated addresses
+				/* Calculate T1 / T2 based on non-deprecated addresses */
 				if (prefix_pref > 0) {
 					if (prefix_pref < pref)
 						pref = prefix_pref;
@@ -795,9 +781,12 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 				}
 			}
 
-			a->valid_until = valid + now;
-			out.t1 = htonl(pref * 5 / 10);
-			out.t2 = htonl(pref * 8 / 10);
+			if (!INFINITE_VALID(a->valid_until))
+				/* UINT32_MAX is considered as infinite leasetime */
+				a->valid_until = (valid == UINT32_MAX) ? 0 : valid + now;
+
+			out.t1 = htonl((pref == UINT32_MAX) ? pref : pref * 5 / 10);
+			out.t2 = htonl((pref == UINT32_MAX) ? pref : pref * 8 / 10);
 
 			if (!out.t1)
 				out.t1 = htonl(1);
@@ -822,8 +811,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;
@@ -883,7 +871,6 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 	return datalen;
 }
 
-
 static void dhcpv6_log(uint8_t msgtype, struct interface *iface, time_t now,
 		const char *duidbuf, bool is_pd, struct dhcpv6_assignment *a, int code)
 {
@@ -941,16 +928,22 @@ static void dhcpv6_log(uint8_t msgtype, struct interface *iface, time_t now,
 		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 lbsize = 0;
+		size_t m = elect_addr(addrs, addrlen);
 		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;
 			int prefix = a->managed ? addrs[i].prefix : a->length;
-			if (prefix == 128)
+			if (prefix == 128) {
+				if (!ADDR_ENTRY_VALID_IA_ADDR(iface, i, m, addrs) ||
+						a->assigned == 0)
+					continue;
+
 				addr.s6_addr32[3] = htonl(a->assigned);
+			}
 			else
 				addr.s6_addr32[1] |= htonl(a->assigned);
 
@@ -963,8 +956,6 @@ static void dhcpv6_log(uint8_t msgtype, struct interface *iface, time_t now,
 			duidbuf, iface->ifname, status, leasebuf);
 }
 
-
-
 ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 		const struct sockaddr_in6 *addr, const void *data, const uint8_t *end)
 {
@@ -973,8 +964,7 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 	const struct dhcpv6_client_header *hdr = data;
 	uint8_t *start = (uint8_t*)&hdr[1], *odata;
 	uint16_t otype, olen;
-
-	// Find and parse client-id and hostname
+	/* Find and parse client-id and hostname */
 	bool accept_reconf = false;
 	uint8_t *clid_data = NULL, clid_len = 0, mac[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 	char hostname[256];
@@ -1001,16 +991,13 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 
 			if (dn_expand(&fqdn_buf[1], &fqdn_buf[olen], &fqdn_buf[1], hostname, sizeof(hostname)) > 0)
 				hostname_len = strcspn(hostname, ".");
-		} else if (otype == DHCPV6_OPT_RECONF_ACCEPT) {
+		} else if (otype == DHCPV6_OPT_RECONF_ACCEPT)
 			accept_reconf = true;
-		}
 	}
 
 	if (!clid_data || !clid_len || clid_len > 130)
 		goto out;
 
-	update(iface);
-
 	struct dhcpv6_assignment *first = NULL;
 	dhcpv6_for_each_option(start, end, otype, olen, odata) {
 		bool is_pd = (otype == DHCPV6_OPT_IA_PD);
@@ -1024,7 +1011,7 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 		uint8_t reqlen = (is_pd) ? 62 : 128;
 		uint32_t reqhint = 0;
 
-		// Parse request hint for IA-PD
+		/* Parse request hint for IA-PD */
 		if (is_pd) {
 			uint8_t *sdata;
 			uint16_t stype, slen;
@@ -1054,17 +1041,17 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 			}
 		}
 
-		// Find assignment
+		/* Find assignment */
 		struct dhcpv6_assignment *c, *a = NULL;
 		list_for_each_entry(c, &iface->ia_assignments, head) {
 			if (((c->clid_len == clid_len && !memcmp(c->clid_data, clid_data, clid_len)) ||
 					(c->clid_len >= clid_len && !c->clid_data[0] && !c->clid_data[1]
-					        && !memcmp(c->mac, mac, sizeof(mac)))) &&
-					(c->iaid == ia->iaid || c->valid_until < now) &&
+						&& !memcmp(c->mac, mac, sizeof(mac)))) &&
+					(c->iaid == ia->iaid || INFINITE_VALID(c->valid_until) || now < c->valid_until) &&
 					((is_pd && c->length <= 64) || (is_na && c->length == 128))) {
 				a = c;
 
-				// Reset state
+				/* Reset state */
 				apply_lease(iface, a, false);
 				memcpy(a->clid_data, clid_data, clid_len);
 				a->clid_len = clid_len;
@@ -1076,14 +1063,16 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 			}
 		}
 
-		// Generic message handling
+		/* Generic message handling */
 		uint16_t status = DHCPV6_STATUS_OK;
-		if (a && a->managed_size < 0) {
+		if (a && a->managed_size < 0)
 			return -1;
-		} else if (hdr->msg_type == DHCPV6_MSG_SOLICIT || hdr->msg_type == DHCPV6_MSG_REQUEST) {
+
+		if (hdr->msg_type == DHCPV6_MSG_SOLICIT || hdr->msg_type == DHCPV6_MSG_REQUEST) {
 			bool assigned = !!a;
 
-			if (!a && !iface->no_dynamic_dhcp) { // Create new binding
+			if (!a && !iface->no_dynamic_dhcp) {
+				/* Create new binding */
 				a = calloc(1, sizeof(*a) + clid_len);
 				if (a) {
 					a->clid_len = clid_len;
@@ -1091,6 +1080,9 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 					a->length = reqlen;
 					a->peer = *addr;
 					a->assigned = reqhint;
+					/* Set valid time to current time indicating  */
+					/* assignment is not having infinite lifetime */
+					a->valid_until = now;
 
 					if (first)
 						memcpy(a->key, first->key, sizeof(a->key));
@@ -1109,9 +1101,10 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 				}
 			}
 
-			if (!assigned || iface->ia_addr_len == 0) { // Set error status
+			if (!assigned || iface->ia_addr_len == 0)
+				/* Set error status */
 				status = (is_pd) ? DHCPV6_STATUS_NOPREFIXAVAIL : DHCPV6_STATUS_NOADDRSAVAIL;
-			} else if (assigned && !first) { //
+			else if (assigned && !first) {
 				size_t handshake_len = 4;
 				buf[0] = 0;
 				buf[1] = DHCPV6_OPT_RECONF_ACCEPT;
@@ -1141,9 +1134,12 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 
 			ia_response_len = append_reply(buf, buflen, status, ia, a, iface, true);
 
-			// Was only a solicitation: mark binding for removal
+			/* Was only a solicitation: mark binding for removal */
 			if (assigned && hdr->msg_type == DHCPV6_MSG_SOLICIT) {
-				a->valid_until = 0;
+				a->flags &= ~OAF_BOUND;
+
+				if (!(a->flags & OAF_STATIC))
+					a->valid_until = now;
 			} else if (assigned && hdr->msg_type == DHCPV6_MSG_REQUEST) {
 				if (hostname_len > 0) {
 					a->hostname = realloc(a->hostname, hostname_len + 1);
@@ -1153,9 +1149,12 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 					}
 				}
 				a->accept_reconf = accept_reconf;
+				a->flags |= OAF_BOUND;
 				apply_lease(iface, a, true);
-			} else if (!assigned && a && a->managed_size == 0) { // Cleanup failed assignment
+			} else if (!assigned && a && a->managed_size == 0) {
+				/* Cleanup failed assignment */
 				free_dhcpv6_assignment(a);
+				a = NULL;
 			}
 		} else if (hdr->msg_type == DHCPV6_MSG_RENEW ||
 				hdr->msg_type == DHCPV6_MSG_RELEASE ||
@@ -1167,17 +1166,26 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 			} else if (hdr->msg_type == DHCPV6_MSG_RENEW ||
 					hdr->msg_type == DHCPV6_MSG_REBIND) {
 				ia_response_len = append_reply(buf, buflen, status, ia, a, iface, false);
-				if (a)
+				if (a) {
+					a->flags |= OAF_BOUND;
 					apply_lease(iface, a, true);
+				}
 			} else if (hdr->msg_type == DHCPV6_MSG_RELEASE) {
-				a->valid_until = 0;
+				if (!(a->flags & OAF_STATIC))
+					a->valid_until = now - 1;
+
+				a->flags &= ~OAF_BOUND;
 				apply_lease(iface, a, false);
 			} else if (hdr->msg_type == DHCPV6_MSG_DECLINE && a->length == 128) {
-				a->clid_len = 0;
-				a->valid_until = now + 3600; // Block address for 1h
+				a->flags &= ~OAF_BOUND;
+
+				if (!(a->flags & OAF_STATIC)) {
+					a->clid_len = 0;
+					a->valid_until = now + 3600; /* Block address for 1h */
+				}
 			}
 		} else if (hdr->msg_type == DHCPV6_MSG_CONFIRM && ia_addr_present) {
-			// Send NOTONLINK for CONFIRM with addr present so that clients restart connection
+			/* Send NOTONLINK for CONFIRM with addr present so that clients restart connection */
 			status = DHCPV6_STATUS_NOTONLINK;
 			ia_response_len = append_reply(buf, buflen, status, ia, a, iface, true);
 			notonlink = true;