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
break;
struct iovec iov = {&reconf_msg, sizeof(reconf_msg) - 128 + assign->clid_len};
md5_ctx_t md5;
- uint8_t secretbytes[16];
- memcpy(secretbytes, assign->key, sizeof(secretbytes));
+ uint8_t secretbytes[64];
+ memset(secretbytes, 0, sizeof(secretbytes));
+ memcpy(secretbytes, assign->key, sizeof(assign->key));
for (size_t i = 0; i < sizeof(secretbytes); ++i)
secretbytes[i] ^= 0x36;
struct in6_addr addr;
for (size_t i = 0; i < iface->ia_addr_len; ++i) {
- if (iface->ia_addr[i].prefix > 64)
+ if (iface->ia_addr[i].prefix > 96)
continue;
addr = iface->ia_addr[i].addr;
if (addr[i].prefix > minprefix)
minprefix = addr[i].prefix;
- addr[i].addr.s6_addr32[2] = 0;
addr[i].addr.s6_addr32[3] = 0;
if (addr[i].preferred < UINT32_MAX - now)
uint32_t prefix_pref = iface->ia_addr[i].preferred - now;
uint32_t prefix_valid = iface->ia_addr[i].valid - now;
- if (iface->ia_addr[i].prefix > 64 ||
+ if (iface->ia_addr[i].prefix > 96 ||
iface->ia_addr[i].preferred <= (uint32_t)now)
continue;
bool found = false;
if (a) {
for (size_t i = 0; i < iface->ia_addr_len; ++i) {
- if (iface->ia_addr[i].prefix > 64 ||
+ if (iface->ia_addr[i].prefix > 96 ||
iface->ia_addr[i].preferred <= (uint32_t)now)
continue;
if (ia->type == htons(DHCPV6_OPT_IA_PD)) {
addr.s6_addr32[1] |= htonl(a->assigned);
- if (IN6_ARE_ADDR_EQUAL(&p->addr, &addr) &&
+ if (!memcmp(&p->addr, &addr, sizeof(addr)) &&
p->prefix == a->length)
found = true;
} else {
addr.s6_addr32[3] = htonl(a->assigned);
- if (IN6_ARE_ADDR_EQUAL(&n->addr, &addr))
+ if (!memcmp(&n->addr, &addr, sizeof(addr)))
found = true;
}
}