free(c->managed);
free(c->hostname);
- free(c->classes);
free(c);
}
}
}
- if (iface->dhcpv6 == RELAYD_SERVER) {
+ if (enable && iface->dhcpv6 == RELAYD_SERVER) {
if (!iface->ia_assignments.next)
INIT_LIST_HEAD(&iface->ia_assignments);
a->hostname = strdup(lease->hostname);
}
} else {
- free(a->classes);
free(a->hostname);
free(a);
}
return;
lockf(fd, F_LOCK, 0);
- ftruncate(fd, 0);
+ if (ftruncate(fd, 0) < 0) {}
FILE *fp = fdopen(fd, "w");
if (!fp) {
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;
for (size_t i = 0; i < addrlen; ++i) {
- if (addrs[i].prefix > 96)
- continue;
- if (c->valid_until <= now)
+ if (addrs[i].prefix > 96 || c->valid_until <= now ||
+ (iface->managed < RELAYD_MANAGED_NO_AFLAG && i != m &&
+ addrs[i].prefix == 64))
continue;
addr = addrs[i].addr;
int minprefix = -1;
for (int i = 0; i < len; ++i) {
- if (addr[i].preferred > 0 && addr[i].prefix > minprefix)
+ if (addr[i].preferred > 0 && addr[i].prefix < 64 &&
+ addr[i].prefix > minprefix)
minprefix = addr[i].prefix;
addr[i].addr.s6_addr32[3] = 0;
}
struct dhcpv6_assignment *border = list_last_entry(&iface->ia_assignments, struct dhcpv6_assignment, head);
- border->assigned = 1 << (64 - minprefix);
+ 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)
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 mostpref = 0;
+ size_t m = 0;
for (size_t i = 0; i < addrlen; ++i)
- if (addrs[i].preferred > addrs[mostpref].preferred)
- mostpref = 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;
for (size_t i = 0; i < addrlen; ++i) {
- uint32_t prefix_pref = addrs[i].preferred - now;
- uint32_t prefix_valid = addrs[i].valid - now;
+ 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)
continue;
+ if (prefix_pref != UINT32_MAX)
+ prefix_pref -= now;
+
+ if (prefix_valid != UINT32_MAX)
+ prefix_valid -= now;
+
if (a->length < 128) {
struct dhcpv6_ia_prefix p = {
.type = htons(DHCPV6_OPT_IA_PREFIX),
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));
n.addr.s6_addr32[3] = htonl(a->assigned);
size_t entrlen = sizeof(n) - 4;
- if (iface->managed < RELAYD_MANAGED_NO_AFLAG && i != mostpref)
+ if (iface->managed < RELAYD_MANAGED_NO_AFLAG && i != m &&
+ addrs[i].prefix == 64)
continue;
if (datalen + entrlen + 4 > buflen || a->assigned == 0)