#include <arpa/inet.h>
#include <sys/timerfd.h>
+#define ADDR_ENTRY_VALID_IA_ADDR(iface, i, m, addrs) \
+ ((iface)->managed == RELAYD_MANAGED_NO_AFLAG || (i) == (m) || \
+ (addrs)[(i)].prefix > 64)
+
static void free_dhcpv6_assignment(struct dhcpv6_assignment *c);
static void reconf_timer(struct uloop_timeout *event);
static struct uloop_timeout reconf_event = {.cb = reconf_timer};
{
if (!enable && iface->ia_assignments.next) {
struct dhcpv6_assignment *c;
+
while (!list_empty(&iface->ia_assignments)) {
c = list_first_entry(&iface->ia_assignments, struct dhcpv6_assignment, head);
free_dhcpv6_assignment(c);
/* Infinite valid */
a->valid_until = 0;
- // Assign to all interfaces
+ /* Assign to all interfaces */
struct dhcpv6_assignment *c;
list_for_each_entry(c, &iface->ia_assignments, head) {
if (c->length != 128 || c->assigned > a->assigned) {
free(c);
}
+static inline bool valid_addr(const struct odhcpd_ipaddr *addr, time_t now)
+{
+ return (addr->prefix <= 96 && addr->preferred > (uint32_t)now);
+}
+
+static size_t elect_addr(const struct odhcpd_ipaddr *addrs, const size_t addrlen)
+{
+ size_t i, m;
+
+ for (i = 0, m = 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;
+ }
+
+ return m;
+}
+
static int send_reconf(struct interface *iface, struct dhcpv6_assignment *assign)
{
struct {
char duidbuf[264];
odhcpd_hexlify(duidbuf, c->clid_data, c->clid_len);
- // iface DUID iaid hostname lifetime assigned length [addrs...]
+ /* iface DUID iaid hostname lifetime assigned length [addrs...] */
int l = snprintf(leasebuf, sizeof(leasebuf), "# %s %s %x %s %ld %x %u ",
iface->ifname, duidbuf, ntohl(c->iaid),
(c->hostname ? c->hostname : "-"),
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;
+ size_t m = elect_addr(addrs, addrlen);
for (size_t i = 0; i < addrlen; ++i) {
- if (addrs[i].prefix > 96 || (!INFINITE_VALID(c->valid_until) && c->valid_until <= now) ||
- (iface->managed < RELAYD_MANAGED_NO_AFLAG && i != m &&
- addrs[i].prefix == 64))
+ if (!valid_addr(&addrs[i], now) ||
+ (!INFINITE_VALID(c->valid_until) && c->valid_until <= now) ||
+ !ADDR_ENTRY_VALID_IA_ADDR(iface, i, m, addrs))
continue;
addr = addrs[i].addr;
char duidbuf[16];
odhcpd_hexlify(duidbuf, c->hwaddr, sizeof(c->hwaddr));
- // iface DUID iaid hostname lifetime assigned length [addrs...]
+ /* iface DUID iaid hostname lifetime assigned length [addrs...] */
int l = snprintf(leasebuf, sizeof(leasebuf), "# %s %s ipv4 %s %ld %x 32 ",
iface->ifname, duidbuf,
(c->hostname ? c->hostname : "-"),
}
}
-// More data was received from TCP connection
+/* More data was received from TCP connection */
static void managed_handle_pd_data(struct ustream *s, _unused int bytes_new)
{
struct dhcpv6_assignment *c = container_of(s, struct dhcpv6_assignment, managed_sock);
if (first && c->managed_size == 0)
free_dhcpv6_assignment(c);
- else if (first)
+ else if (first && !(c->flags & OAF_STATIC))
c->valid_until = now + 150;
}
{
struct dhcpv6_assignment *c = container_of(s, struct dhcpv6_assignment, managed_sock);
- c->valid_until = odhcpd_time() + 15;
+ if (!(c->flags & OAF_STATIC))
+ c->valid_until = odhcpd_time() + 15;
+
c->managed_size = 0;
if (c->accept_reconf)
iaidbuf, assign->iaid, assign->length);
ustream_write_pending(&assign->managed_sock.stream);
assign->managed_size = -1;
- assign->valid_until = odhcpd_time() + 15;
+
+ if (!(assign->flags & OAF_STATIC))
+ assign->valid_until = odhcpd_time() + 15;
+
list_add(&assign->head, &iface->ia_assignments);
/* Wait initial period of up to 250ms for immediate assignment */
list_for_each_entry_safe(a, n, &iface->ia_assignments, head) {
if (!INFINITE_VALID(a->valid_until) && a->valid_until < now) {
if ((a->length < 128 && a->clid_len > 0) ||
- (a->length == 128 && a->clid_len == 0)) {
- list_del(&a->head);
+ (a->length == 128 && a->clid_len == 0))
free_dhcpv6_assignment(a);
- }
+
} else if (a->reconf_cnt > 0 && a->reconf_cnt < 8 &&
now > a->reconf_sent + (1 << a->reconf_cnt)) {
++a->reconf_cnt;
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)
- if (addrs[i].preferred > addrs[m].preferred ||
- (addrs[i].preferred == addrs[m].preferred &&
- memcmp(&addrs[i].addr, &addrs[m].addr, 16) > 0))
- m = i;
+ size_t m = elect_addr(addrs, addrlen);
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)
+ if (!valid_addr(&addrs[i], now))
continue;
if (prefix_pref != UINT32_MAX)
n.addr.s6_addr32[3] = htonl(a->assigned);
size_t entrlen = sizeof(n) - 4;
- if (iface->managed < RELAYD_MANAGED_NO_AFLAG && i != m &&
- addrs[i].prefix <= 64)
- continue;
-
- if (datalen + entrlen + 4 > buflen || a->assigned == 0)
+ if (!ADDR_ENTRY_VALID_IA_ADDR(iface, i, m, addrs) ||
+ a->assigned == 0 ||
+ datalen + entrlen + 4 > buflen)
continue;
memcpy(buf + datalen, &n, sizeof(n));
size_t addrlen = (a->managed) ? (size_t)a->managed_size : iface->ia_addr_len;
for (size_t i = 0; i < addrlen; ++i) {
- if (addrs[i].prefix > 96 ||
- addrs[i].preferred <= (uint32_t)now)
+ if (!valid_addr(&addrs[i], now))
continue;
struct in6_addr addr = addrs[i].addr;
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 lbsize = 0;
+ size_t m = elect_addr(addrs, addrlen);
char addrbuf[INET6_ADDRSTRLEN];
for (size_t i = 0; i < addrlen; ++i) {
- if (addrs[i].prefix > 96 || addrs[i].preferred <= (uint32_t)now)
+ if (!valid_addr(&addrs[i], now))
continue;
struct in6_addr addr = addrs[i].addr;
int prefix = a->managed ? addrs[i].prefix : a->length;
- if (prefix == 128)
+ if (prefix == 128) {
+ if (!ADDR_ENTRY_VALID_IA_ADDR(iface, i, m, addrs) ||
+ a->assigned == 0)
+ continue;
+
addr.s6_addr32[3] = htonl(a->assigned);
+ }
else
addr.s6_addr32[1] |= htonl(a->assigned);
list_for_each_entry(c, &iface->ia_assignments, head) {
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)))) &&
+ && !memcmp(c->mac, mac, sizeof(mac)))) &&
(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;
projects / project / odhcpd.git / blobdiff