odhcpd_urandom(a->key, sizeof(a->key));
memcpy(a->clid_data, lease->duid, lease->duid_len);
memcpy(a->mac, lease->mac.ether_addr_octet, sizeof(a->mac));
+ /* Infinite valid */
+ a->valid_until = 0;
// Assign to all interfaces
struct dhcpv6_assignment *c;
}
}
- /* UINT32_MAX is considered as infinite leasetime */
- a->valid_until = (valid == UINT32_MAX) ? 0 : valid + now;
+ 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 (((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 || (!INFINITE_VALID(c->valid_until) && c->valid_until < now)) &&
+ (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;
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));
// Was only a solicitation: mark binding for removal
if (assigned && hdr->msg_type == DHCPV6_MSG_SOLICIT) {
- a->valid_until = now;
+ if (!INFINITE_VALID(a->valid_until))
+ 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);
if (a)
apply_lease(iface, a, true);
} else if (hdr->msg_type == DHCPV6_MSG_RELEASE) {
- a->valid_until = now - 1;
+ if (!INFINITE_VALID(a->valid_until))
+ a->valid_until = now - 1;
+
apply_lease(iface, a, false);
- } else if (hdr->msg_type == DHCPV6_MSG_DECLINE && a->length == 128) {
+ } else if (hdr->msg_type == DHCPV6_MSG_DECLINE && a->length == 128 &&
+ !INFINITE_VALID(a->valid_until)) {
a->clid_len = 0;
a->valid_until = now + 3600; // Block address for 1h
}