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;
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);
}
}
else
n->valid += now;
- n->has_class = false;
- n->class = 0;
n->dprefix = 0;
++c->managed_size;
static bool assign_na(struct interface *iface, struct dhcpv6_assignment *assign)
{
- bool match = false;
- for (size_t i = 0; i < iface->ia_addr_len; ++i) {
- if (!iface->ia_addr[i].has_class) {
- match = true;
- continue;
- } else if (assign->classes_cnt) {
- for (size_t j = 0; j < assign->classes_cnt; ++j)
- if (assign->classes[j] == iface->ia_addr[i].class)
- match = true;
- } else if (assign->all_class) {
- match = true;
- }
- }
-
- if (!match)
- return false;
-
// Seed RNG with checksum of DUID
uint32_t seed = 0;
for (size_t i = 0; i < assign->clid_len; ++i)
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 m = 0;
- for (size_t i = 0; i < addrlen; ++i) {
- bool match = true;
- if (addrs[i].has_class) {
- match = false;
- if (a->classes_cnt) {
- for (size_t j = 0; j < a->classes_cnt; ++j)
- if (a->classes[j] == addrs[i].class)
- match = true;
- } else if (a->all_class) {
- match = true;
- }
- }
-
- if (!match)
- continue;
+ 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;
- uint32_t prefix_pref = addrs[i].preferred - now;
- uint32_t prefix_valid = addrs[i].valid - now;
+ 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)
continue;
- if (prefix_pref > 86400)
- prefix_pref = 86400;
-
- if (prefix_valid > 86400)
- prefix_valid = 86400;
+ if (prefix_pref != UINT32_MAX)
+ prefix_pref -= now;
-#ifdef DHCPV6_OPT_PREFIX_CLASS
- struct {
- uint16_t code;
- uint16_t length;
- uint16_t class;
- } pclass = {htons(DHCPV6_OPT_PREFIX_CLASS),
- htons(2), htons(iface->ia_addr[i].class)};
-#endif
+ if (prefix_valid != UINT32_MAX)
+ prefix_valid -= now;
if (a->length < 128) {
struct dhcpv6_ia_prefix p = {
size_t entrlen = sizeof(p) - 4;
-#ifdef DHCPV6_OPT_PREFIX_CLASS
- if (iface->ia_addr[i].has_class) {
- entrlen += sizeof(pclass);
- p.len = htons(entrlen);
- }
-#endif
-
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));
-#ifdef DHCPV6_OPT_PREFIX_CLASS
- memcpy(buf + datalen + sizeof(p), &pclass, sizeof(pclass));
-#endif
datalen += entrlen + 4;
} else {
struct dhcpv6_ia_addr n = {
n.addr.s6_addr32[3] = htonl(a->assigned);
size_t entrlen = sizeof(n) - 4;
- if (!a->accept_reconf && iface->managed < RELAYD_MANAGED_NO_AFLAG &&
+ if (iface->managed < RELAYD_MANAGED_NO_AFLAG && i != m &&
addrs[i].prefix == 64)
- n.preferred = htonl(1);
-
-#ifdef DHCPV6_OPT_PREFIX_CLASS
- if (iface->ia_addr[i].has_class) {
- entrlen += sizeof(pclass);
- n.len = htons(entrlen);
- }
-#endif
+ continue;
if (datalen + entrlen + 4 > buflen || a->assigned == 0)
continue;
memcpy(buf + datalen, &n, sizeof(n));
-#ifdef DHCPV6_OPT_PREFIX_CLASS
- memcpy(buf + datalen + sizeof(n), &pclass, sizeof(pclass));
-#endif
datalen += entrlen + 4;
}
uint8_t *clid_data = NULL, clid_len = 0, mac[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
char hostname[256];
size_t hostname_len = 0;
- bool class_oro = false;
bool notonlink = false;
char duidbuf[261];
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_ORO) {
-#ifdef DHCPV6_OPT_PREFIX_CLASS
- for (size_t i = 0; i + 1 < olen; i += 2) {
- if (odata[i] == (DHCPV6_OPT_PREFIX_CLASS >> 8) &&
- odata[i + 1] == (DHCPV6_OPT_PREFIX_CLASS & 0xff))
- class_oro = true;
- }
-#endif
} else if (otype == DHCPV6_OPT_RECONF_ACCEPT) {
accept_reconf = true;
}
uint8_t reqlen = (is_pd) ? 62 : 128;
uint32_t reqhint = 0;
- const uint8_t classes_max = 32;
- uint8_t classes_cnt = 0;
- uint16_t classes[classes_max];
-
// Parse request hint for IA-PD
if (is_pd) {
uint8_t *sdata;
if (reqlen > 32 && reqlen <= 64)
reqhint &= (1U << (64 - reqlen)) - 1;
}
-
-#ifdef DHCPV6_OPT_PREFIX_CLASS
- uint8_t *xdata;
- uint16_t xtype, xlen;
- dhcpv6_for_each_option(&p[1], sdata + slen, xtype, xlen, xdata) {
- if (xtype != DHCPV6_OPT_PREFIX_CLASS || xlen != 2)
- continue;
-
- if (classes_cnt >= classes_max)
- continue;
-
- classes[classes_cnt++] = (uint16_t)xdata[0] << 8 | (uint16_t)xdata[1];
- }
-#endif
}
if (reqlen > 64)
continue;
ia_addr_present = true;
-#ifdef DHCPV6_OPT_PREFIX_CLASS
- uint8_t *xdata;
- uint16_t xtype, xlen;
- struct dhcpv6_ia_addr *p = (struct dhcpv6_ia_addr*)&sdata[-4];
- dhcpv6_for_each_option(&p[1], sdata + slen, xtype, xlen, xdata) {
- if (xtype != DHCPV6_OPT_PREFIX_CLASS || xlen != 2)
- continue;
-
- if (classes_cnt >= classes_max)
- continue;
-
- classes[classes_cnt++] = (uint16_t)xdata[0] << 8 | (uint16_t)xdata[1];
- }
-#endif
}
}
a->peer = *addr;
a->reconf_cnt = 0;
a->reconf_sent = 0;
- a->all_class = class_oro;
- a->classes_cnt = classes_cnt;
- a->classes = realloc(a->classes, classes_cnt * sizeof(uint16_t));
- if (a->classes)
- memcpy(a->classes, classes, classes_cnt * sizeof(uint16_t));
break;
}
}
a->length = reqlen;
a->peer = *addr;
a->assigned = reqhint;
- a->all_class = class_oro;
- a->classes_cnt = classes_cnt;
- if (classes_cnt) {
- a->classes = malloc(classes_cnt * sizeof(uint16_t));
- if (a->classes)
- memcpy(a->classes, classes, classes_cnt * sizeof(uint16_t));
- }
if (first)
memcpy(a->key, first->key, sizeof(a->key));
projects / project / odhcpd.git / blobdiff