for (size_t i = 0; i < addrlen; ++i) {
if (addrs[i].prefix > 96)
continue;
+ if (c->valid_until <= now)
+ continue;
addr = addrs[i].addr;
if (c->length == 128)
inet_ntop(AF_INET6, &addr, ipbuf, sizeof(ipbuf) - 1);
- if (c->length == 128 && c->hostname && i == 0) {
+ if (c->length == 128 && c->hostname) {
fputs(ipbuf, fp);
char b[256];
int minprefix = -1;
for (int i = 0; i < len; ++i) {
- if (addr[i].prefix > minprefix)
+ if (addr[i].preferred > 0 && addr[i].prefix > minprefix)
minprefix = addr[i].prefix;
addr[i].addr.s6_addr32[3] = 0;
if (change) {
struct dhcpv6_assignment *c;
list_for_each_entry(c, &iface->ia_assignments, head)
- if (c != border)
+ if (c != border && !iface->managed)
apply_lease(iface, c, false);
}
datalen += sizeof(stat);
} else {
if (a) {
- uint32_t pref = 3600;
- uint32_t valid = 3600;
+ uint32_t leasetime = iface->dhcpv4_leasetime;
+ if (leasetime == 0)
+ leasetime = 3600;
+ else if (leasetime < 60)
+ leasetime = 60;
+
+ uint32_t pref = leasetime;
+ uint32_t valid = leasetime;
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;
goto out;
update(iface);
- bool update_state = false;
struct dhcpv6_assignment *first = NULL;
dhcpv6_for_each_option(start, end, otype, olen, odata) {
}
a->accept_reconf = accept_reconf;
apply_lease(iface, a, true);
- update_state = true;
} else if (!assigned && a && a->managed_size == 0) { // Cleanup failed assignment
free_dhcpv6_assignment(a);
}
} else if (hdr->msg_type == DHCPV6_MSG_RELEASE) {
a->valid_until = 0;
apply_lease(iface, a, false);
- update_state = true;
} else if (hdr->msg_type == DHCPV6_MSG_DECLINE && a->length == 128) {
a->clid_len = 0;
a->valid_until = now + 3600; // Block address for 1h
- update_state = true;
}
} else if (hdr->msg_type == DHCPV6_MSG_CONFIRM && ia_addr_present) {
// 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;
}
response_len += 6;
}
- if (update_state)
- dhcpv6_write_statefile();
+ dhcpv6_write_statefile();
out:
return response_len;