#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <libgen.h>
#include <stdbool.h>
#include <arpa/inet.h>
#include <sys/timerfd.h>
(addrs)[(i)].prefix > 64)
static void dhcpv6_netevent_cb(unsigned long event, struct netevent_handler_info *info);
-static void free_dhcpv6_assignment(struct dhcpv6_assignment *c);
+static void apply_lease(struct dhcp_assignment *a, bool add);
+static void set_border_assignment_size(struct interface *iface, struct dhcp_assignment *b);
static void handle_addrlist_change(struct netevent_handler_info *info);
-static void start_reconf(struct dhcpv6_assignment *a);
-static void stop_reconf(struct dhcpv6_assignment *a);
+static void start_reconf(struct dhcp_assignment *a);
+static void stop_reconf(struct dhcp_assignment *a);
static void valid_until_cb(struct uloop_timeout *event);
static struct netevent_handler dhcpv6_netevent_handler = { .cb = dhcpv6_netevent_cb, };
return 0;
}
-int dhcpv6_setup_ia_interface(struct interface *iface, bool enable)
+int dhcpv6_ia_setup_interface(struct interface *iface, bool enable)
{
- if (!enable && iface->ia_assignments.next) {
- struct dhcpv6_assignment *c;
+ enable = enable && (iface->dhcpv6 == MODE_SERVER);
- while (!list_empty(&iface->ia_assignments)) {
- c = list_first_entry(&iface->ia_assignments, struct dhcpv6_assignment, head);
- free_dhcpv6_assignment(c);
- }
- }
-
- if (enable && iface->dhcpv6 == MODE_SERVER) {
- if (!iface->ia_assignments.next)
- INIT_LIST_HEAD(&iface->ia_assignments);
+ if (enable) {
+ struct dhcp_assignment *border;
if (list_empty(&iface->ia_assignments)) {
- struct dhcpv6_assignment *border = calloc(1, sizeof(*border));
+ border = alloc_assignment(0);
+
if (!border) {
- syslog(LOG_ERR, "Calloc failed for border on interface %s", iface->ifname);
+ syslog(LOG_WARNING, "Failed to alloc border on %s", iface->name);
return -1;
}
border->length = 64;
list_add(&border->head, &iface->ia_assignments);
- }
-
- /* Parse static entries */
- struct lease *lease;
- list_for_each_entry(lease, &leases, head) {
- /* Construct entry */
- size_t duid_len = lease->duid_len ? lease->duid_len : 14;
- struct dhcpv6_assignment *a = calloc(1, sizeof(*a) + duid_len);
- if (!a) {
- syslog(LOG_ERR, "Calloc failed for static lease assignment on interface %s",
- iface->ifname);
- return -1;
- }
+ } else
+ border = list_last_entry(&iface->ia_assignments, struct dhcp_assignment, head);
- a->leasetime = lease->dhcpv4_leasetime;
-
- a->clid_len = duid_len;
- a->length = 128;
- if (lease->hostid) {
- a->assigned = lease->hostid;
- } else {
- uint32_t i4a = ntohl(lease->ipaddr.s_addr) & 0xff;
- a->assigned = ((i4a / 100) << 8) | (((i4a % 100) / 10) << 4) | (i4a % 10);
- }
-
- odhcpd_urandom(a->key, sizeof(a->key));
- memcpy(a->clid_data, lease->duid, lease->duid_len);
- memcpy(a->mac, lease->mac.ether_addr_octet, sizeof(a->mac));
- /* Static assignment */
- a->flags |= OAF_STATIC;
- /* Infinite valid */
- a->valid_until = 0;
-
- /* 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) {
- list_add_tail(&a->head, &c->head);
- break;
- } else if (c->assigned == a->assigned)
- /* Already an assignment with that number */
- break;
- }
+ set_border_assignment_size(iface, border);
+ } else {
+ struct dhcp_assignment *c;
- if (a->head.next) {
- a->iface = iface;
- if (lease->hostname[0]) {
- free(a->hostname);
- a->hostname = strdup(lease->hostname);
- }
- } else
- free_dhcpv6_assignment(a);
+ while (!list_empty(&iface->ia_assignments)) {
+ c = list_first_entry(&iface->ia_assignments, struct dhcp_assignment, head);
+ free_assignment(c);
}
}
+
return 0;
}
}
-static void free_dhcpv6_assignment(struct dhcpv6_assignment *c)
-{
- if (c->managed_sock.fd.registered) {
- ustream_free(&c->managed_sock.stream);
- close(c->managed_sock.fd.fd);
- }
-
- if (c->head.next)
- list_del(&c->head);
-
- if (c->reconf_cnt)
- stop_reconf(c);
-
- free(c->managed);
- free(c->hostname);
- free(c);
-}
-
-static inline bool valid_prefix_length(const struct dhcpv6_assignment *a, const uint8_t prefix_length)
+static inline bool valid_prefix_length(const struct dhcp_assignment *a, const uint8_t prefix_length)
{
return (a->managed_size || a->length > prefix_length);
}
static inline bool valid_addr(const struct odhcpd_ipaddr *addr, time_t now)
{
- return (addr->prefix <= 96 && addr->preferred > (uint32_t)now);
+ return (addr->prefix <= 96 && addr->preferred_lt > (uint32_t)now);
}
static size_t get_preferred_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 &&
+ if (addrs[i].preferred_lt > addrs[m].preferred_lt ||
+ (addrs[i].preferred_lt == addrs[m].preferred_lt &&
memcmp(&addrs[i].addr, &addrs[m].addr, 16) > 0))
m = i;
}
return m;
}
-static int send_reconf(struct dhcpv6_assignment *assign)
+static int send_reconf(struct dhcp_assignment *assign)
{
struct {
struct dhcpv6_client_header hdr;
return odhcpd_send(iface->dhcpv6_event.uloop.fd, &assign->peer, &iov, 1, iface);
}
-void dhcpv6_enum_ia_addrs(struct interface *iface, struct dhcpv6_assignment *c,
- time_t now, dhcpv6_binding_cb_handler_t func, void *arg)
+static void dhcpv6_ia_free_assignment(struct dhcp_assignment *a)
+{
+ if (a->managed_sock.fd.registered) {
+ ustream_free(&a->managed_sock.stream);
+ close(a->managed_sock.fd.fd);
+ }
+
+ if ((a->flags & OAF_BOUND) && (a->flags & OAF_DHCPV6_PD))
+ apply_lease(a, false);
+
+ if (a->reconf_cnt)
+ stop_reconf(a);
+
+ free(a->managed);
+}
+
+void dhcpv6_ia_enum_addrs(struct interface *iface, struct dhcp_assignment *c,
+ time_t now, dhcpv6_binding_cb_handler_t func, void *arg)
{
struct odhcpd_ipaddr *addrs = (c->managed) ? c->managed : iface->addr6;
size_t addrlen = (c->managed) ? (size_t)c->managed_size : iface->addr6_len;
for (size_t i = 0; i < addrlen; ++i) {
struct in6_addr addr;
- uint32_t pref, valid;
+ uint32_t preferred_lt, valid_lt;
int prefix = c->managed ? addrs[i].prefix : c->length;
if (!valid_addr(&addrs[i], now))
continue;
+ /* Filter Out Prefixes */
+ if (ADDR_MATCH_PIO_FILTER(&addrs[i], iface)) {
+ char addrbuf[INET6_ADDRSTRLEN];
+ syslog(LOG_INFO, "Address %s filtered out on %s",
+ inet_ntop(AF_INET6, &addrs[i].addr.in6, addrbuf, sizeof(addrbuf)),
+ iface->name);
+ continue;
+ }
+
addr = addrs[i].addr.in6;
- pref = addrs[i].preferred;
- valid = addrs[i].valid;
- if (prefix == 128) {
+ preferred_lt = addrs[i].preferred_lt;
+ valid_lt = addrs[i].valid_lt;
+
+ if (c->flags & OAF_DHCPV6_NA) {
if (!ADDR_ENTRY_VALID_IA_ADDR(iface, i, m, addrs))
continue;
- addr.s6_addr32[3] = htonl(c->assigned);
+ addr.s6_addr32[2] = htonl(c->assigned_host_id >> 32);
+ addr.s6_addr32[3] = htonl(c->assigned_host_id & UINT32_MAX);
} else {
if (!valid_prefix_length(c, addrs[i].prefix))
continue;
- addr.s6_addr32[1] |= htonl(c->assigned);
+ addr.s6_addr32[1] |= htonl(c->assigned_subnet_id);
addr.s6_addr32[2] = addr.s6_addr32[3] = 0;
}
- if (pref != UINT32_MAX)
- pref -= now;
+ if (preferred_lt > (uint32_t)c->preferred_until)
+ preferred_lt = c->preferred_until;
+
+ if (preferred_lt > (uint32_t)c->valid_until)
+ preferred_lt = c->valid_until;
+
+ if (preferred_lt != UINT32_MAX)
+ preferred_lt -= now;
+
+ if (valid_lt > (uint32_t)c->valid_until)
+ valid_lt = c->valid_until;
- if (valid != UINT32_MAX)
- valid -= now;
+ if (valid_lt != UINT32_MAX)
+ valid_lt -= now;
- func(&addr, prefix, pref, valid, arg);
+ func(&addr, prefix, preferred_lt, valid_lt, arg);
}
}
struct write_ctxt {
FILE *fp;
md5_ctx_t md5;
- struct dhcpv6_assignment *c;
+ struct dhcp_assignment *c;
struct interface *iface;
char *buf;
int buf_len;
int buf_idx;
};
-void dhcpv6_write_ia_addr(struct in6_addr *addr, int prefix, _unused uint32_t pref,
- _unused uint32_t valid, void *arg)
+static void dhcpv6_write_ia_addrhosts(struct in6_addr *addr, int prefix, _unused uint32_t pref_lt,
+ _unused uint32_t valid_lt, void *arg)
+{
+ struct write_ctxt *ctxt = (struct write_ctxt *)arg;
+ char ipbuf[INET6_ADDRSTRLEN];
+
+ if ((ctxt->c->flags & OAF_DHCPV6_NA) && ctxt->c->hostname &&
+ !(ctxt->c->flags & OAF_BROKEN_HOSTNAME)) {
+ inet_ntop(AF_INET6, addr, ipbuf, sizeof(ipbuf) - 1);
+ fputs(ipbuf, ctxt->fp);
+
+ char b[256];
+ if (dn_expand(ctxt->iface->search, ctxt->iface->search + ctxt->iface->search_len,
+ ctxt->iface->search, b, sizeof(b)) > 0)
+ fprintf(ctxt->fp, "\t%s.%s", ctxt->c->hostname, b);
+
+ fprintf(ctxt->fp, "\t%s\n", ctxt->c->hostname);
+ }
+}
+
+static void dhcpv6_write_ia_addr(struct in6_addr *addr, int prefix, _unused uint32_t pref_lt,
+ _unused uint32_t valid_lt, void *arg)
{
struct write_ctxt *ctxt = (struct write_ctxt *)arg;
char ipbuf[INET6_ADDRSTRLEN];
inet_ntop(AF_INET6, addr, ipbuf, sizeof(ipbuf) - 1);
- if (ctxt->c->length == 128 && ctxt->c->hostname) {
+ if ((ctxt->c->flags & OAF_DHCPV6_NA) && ctxt->c->hostname &&
+ !(ctxt->c->flags & OAF_BROKEN_HOSTNAME)) {
fputs(ipbuf, ctxt->fp);
char b[256];
"%s/%d ", ipbuf, prefix);
}
-void dhcpv6_write_statefile(void)
+static void dhcpv6_ia_write_hostsfile(time_t now)
+{
+ struct write_ctxt ctxt;
+
+ unsigned hostsfile_strlen = strlen(config.dhcp_hostsfile) + 1;
+ unsigned tmp_hostsfile_strlen = hostsfile_strlen + 1; /* space for . */
+ char *tmp_hostsfile = alloca(tmp_hostsfile_strlen);
+
+ char *dir_hostsfile;
+ char *base_hostsfile;
+ char *pdir_hostsfile;
+ char *pbase_hostsfile;
+
+ int fd, ret;
+
+ dir_hostsfile = strndup(config.dhcp_hostsfile, hostsfile_strlen);
+ base_hostsfile = strndup(config.dhcp_hostsfile, hostsfile_strlen);
+
+ pdir_hostsfile = dirname(dir_hostsfile);
+ pbase_hostsfile = basename(base_hostsfile);
+
+ snprintf(tmp_hostsfile, tmp_hostsfile_strlen, "%s/.%s", pdir_hostsfile, pbase_hostsfile);
+
+ free(dir_hostsfile);
+ free(base_hostsfile);
+
+ fd = open(tmp_hostsfile, O_CREAT | O_WRONLY | O_CLOEXEC, 0644);
+ if (fd < 0)
+ return;
+
+ ret = lockf(fd, F_LOCK, 0);
+ if (ret < 0) {
+ close(fd);
+ return;
+ }
+
+ if (ftruncate(fd, 0) < 0) {}
+
+ ctxt.fp = fdopen(fd, "w");
+ if (!ctxt.fp) {
+ close(fd);
+ return;
+ }
+
+ avl_for_each_element(&interfaces, ctxt.iface, avl) {
+ if (ctxt.iface->dhcpv6 != MODE_SERVER &&
+ ctxt.iface->dhcpv4 != MODE_SERVER)
+ continue;
+
+ if (ctxt.iface->dhcpv6 == MODE_SERVER) {
+ list_for_each_entry(ctxt.c, &ctxt.iface->ia_assignments, head) {
+ if (!(ctxt.c->flags & OAF_BOUND) || ctxt.c->managed_size < 0)
+ continue;
+
+ if (INFINITE_VALID(ctxt.c->valid_until) || ctxt.c->valid_until > now)
+ dhcpv6_ia_enum_addrs(ctxt.iface, ctxt.c, now,
+ dhcpv6_write_ia_addrhosts, &ctxt);
+ }
+ }
+
+ if (ctxt.iface->dhcpv4 == MODE_SERVER) {
+ struct dhcp_assignment *c;
+
+ list_for_each_entry(c, &ctxt.iface->dhcpv4_assignments, head) {
+ if (!(c->flags & OAF_BOUND))
+ continue;
+
+ char ipbuf[INET6_ADDRSTRLEN];
+ struct in_addr addr = {.s_addr = c->addr};
+ inet_ntop(AF_INET, &addr, ipbuf, sizeof(ipbuf) - 1);
+
+ if (c->hostname && !(c->flags & OAF_BROKEN_HOSTNAME)) {
+ fputs(ipbuf, ctxt.fp);
+
+ char b[256];
+
+ if (dn_expand(ctxt.iface->search,
+ ctxt.iface->search + ctxt.iface->search_len,
+ ctxt.iface->search, b, sizeof(b)) > 0)
+ fprintf(ctxt.fp, "\t%s.%s", c->hostname, b);
+
+ fprintf(ctxt.fp, "\t%s\n", c->hostname);
+ }
+ }
+ }
+ }
+
+ fclose(ctxt.fp);
+
+ rename(tmp_hostsfile, config.dhcp_hostsfile);
+}
+
+void dhcpv6_ia_write_statefile(void)
{
struct write_ctxt ctxt;
md5_begin(&ctxt.md5);
if (config.dhcp_statefile) {
+ unsigned statefile_strlen = strlen(config.dhcp_statefile) + 1;
+ unsigned tmp_statefile_strlen = statefile_strlen + 1; /* space for . */
+ char *tmp_statefile = alloca(tmp_statefile_strlen);
+
+ char *dir_statefile;
+ char *base_statefile;
+ char *pdir_statefile;
+ char *pbase_statefile;
+
time_t now = odhcpd_time(), wall_time = time(NULL);
- int fd = open(config.dhcp_statefile, O_CREAT | O_WRONLY | O_CLOEXEC, 0644);
+ int fd, ret;
char leasebuf[512];
+ dir_statefile = strndup(config.dhcp_statefile, statefile_strlen);
+ base_statefile = strndup(config.dhcp_statefile, statefile_strlen);
+
+ pdir_statefile = dirname(dir_statefile);
+ pbase_statefile = basename(base_statefile);
+
+ snprintf(tmp_statefile, tmp_statefile_strlen, "%s/.%s", pdir_statefile, pbase_statefile);
+
+ free(dir_statefile);
+ free(base_statefile);
+
+ fd = open(tmp_statefile, O_CREAT | O_WRONLY | O_CLOEXEC, 0644);
if (fd < 0)
return;
- int ret;
+
ret = lockf(fd, F_LOCK, 0);
if (ret < 0) {
close(fd);
return;
}
+
if (ftruncate(fd, 0) < 0) {}
ctxt.fp = fdopen(fd, "w");
ctxt.buf = leasebuf;
ctxt.buf_len = sizeof(leasebuf);
- list_for_each_entry(ctxt.iface, &interfaces, head) {
+ avl_for_each_element(&interfaces, ctxt.iface, avl) {
if (ctxt.iface->dhcpv6 != MODE_SERVER &&
ctxt.iface->dhcpv4 != MODE_SERVER)
continue;
- if (ctxt.iface->dhcpv6 == MODE_SERVER &&
- ctxt.iface->ia_assignments.next) {
+ if (ctxt.iface->dhcpv6 == MODE_SERVER) {
list_for_each_entry(ctxt.c, &ctxt.iface->ia_assignments, head) {
if (!(ctxt.c->flags & OAF_BOUND) || ctxt.c->managed_size < 0)
continue;
odhcpd_hexlify(duidbuf, ctxt.c->clid_data, ctxt.c->clid_len);
- /* iface DUID iaid hostname lifetime assigned length [addrs...] */
- ctxt.buf_idx = snprintf(ctxt.buf, ctxt.buf_len, "# %s %s %x %s %ld %x %u ",
+ /* iface DUID iaid hostname lifetime assigned_host_id length [addrs...] */
+ ctxt.buf_idx = snprintf(ctxt.buf, ctxt.buf_len, "# %s %s %x %s%s %"PRId64" ",
ctxt.iface->ifname, duidbuf, ntohl(ctxt.c->iaid),
+ (ctxt.c->flags & OAF_BROKEN_HOSTNAME) ? "broken\\x20" : "",
(ctxt.c->hostname ? ctxt.c->hostname : "-"),
(ctxt.c->valid_until > now ?
- (ctxt.c->valid_until - now + wall_time) :
- (INFINITE_VALID(ctxt.c->valid_until) ? -1 : 0)),
- ctxt.c->assigned, (unsigned)ctxt.c->length);
+ (int64_t)(ctxt.c->valid_until - now + wall_time) :
+ (INFINITE_VALID(ctxt.c->valid_until) ? -1 : 0)));
+
+ if (ctxt.c->flags & OAF_DHCPV6_NA)
+ ctxt.buf_idx += snprintf(ctxt.buf + ctxt.buf_idx, ctxt.buf_len - ctxt.buf_idx,
+ "%" PRIx64" %u ", ctxt.c->assigned_host_id, (unsigned)ctxt.c->length);
+ else
+ ctxt.buf_idx += snprintf(ctxt.buf + ctxt.buf_idx, ctxt.buf_len - ctxt.buf_idx,
+ "%" PRIx32" %u ", ctxt.c->assigned_subnet_id, (unsigned)ctxt.c->length);
if (INFINITE_VALID(ctxt.c->valid_until) || ctxt.c->valid_until > now)
- dhcpv6_enum_ia_addrs(ctxt.iface, ctxt.c, now,
+ dhcpv6_ia_enum_addrs(ctxt.iface, ctxt.c, now,
dhcpv6_write_ia_addr, &ctxt);
ctxt.buf[ctxt.buf_idx - 1] = '\n';
}
}
- if (ctxt.iface->dhcpv4 == MODE_SERVER &&
- ctxt.iface->dhcpv4_assignments.next) {
- struct dhcpv4_assignment *c;
+ if (ctxt.iface->dhcpv4 == MODE_SERVER) {
+ struct dhcp_assignment *c;
+
list_for_each_entry(c, &ctxt.iface->dhcpv4_assignments, head) {
if (!(c->flags & OAF_BOUND))
continue;
odhcpd_hexlify(duidbuf, c->hwaddr, sizeof(c->hwaddr));
/* iface DUID iaid hostname lifetime assigned length [addrs...] */
- ctxt.buf_idx = snprintf(ctxt.buf, ctxt.buf_len, "# %s %s ipv4 %s %ld %x 32 ",
+ ctxt.buf_idx = snprintf(ctxt.buf, ctxt.buf_len, "# %s %s ipv4 %s%s %"PRId64" %x 32 ",
ctxt.iface->ifname, duidbuf,
+ (c->flags & OAF_BROKEN_HOSTNAME) ? "broken\\x20" : "",
(c->hostname ? c->hostname : "-"),
(c->valid_until > now ?
- (c->valid_until - now + wall_time) :
+ (int64_t)(c->valid_until - now + wall_time) :
(INFINITE_VALID(c->valid_until) ? -1 : 0)),
ntohl(c->addr));
struct in_addr addr = {.s_addr = c->addr};
inet_ntop(AF_INET, &addr, ipbuf, sizeof(ipbuf) - 1);
- if (c->hostname) {
+ if (c->hostname && !(c->flags & OAF_BROKEN_HOSTNAME)) {
fputs(ipbuf, ctxt.fp);
char b[256];
}
fclose(ctxt.fp);
- }
- uint8_t newmd5[16];
- md5_end(newmd5, &ctxt.md5);
+ uint8_t newmd5[16];
+ md5_end(newmd5, &ctxt.md5);
- if (config.dhcp_cb && memcmp(newmd5, statemd5, sizeof(newmd5))) {
- memcpy(statemd5, newmd5, sizeof(statemd5));
- char *argv[2] = {config.dhcp_cb, NULL};
- if (!vfork()) {
- execv(argv[0], argv);
- _exit(128);
+ rename(tmp_statefile, config.dhcp_statefile);
+
+ if (memcmp(newmd5, statemd5, sizeof(newmd5))) {
+ memcpy(statemd5, newmd5, sizeof(statemd5));
+
+ if (config.dhcp_hostsfile)
+ dhcpv6_ia_write_hostsfile(now);
+
+ if (config.dhcp_cb) {
+ char *argv[2] = {config.dhcp_cb, NULL};
+ if (!vfork()) {
+ execv(argv[0], argv);
+ _exit(128);
+ }
+ }
}
}
}
-static void __apply_lease(struct interface *iface, struct dhcpv6_assignment *a,
+static void __apply_lease(struct dhcp_assignment *a,
struct odhcpd_ipaddr *addrs, ssize_t addr_len, bool add)
{
- if (a->length > 64)
+ if (a->flags & OAF_DHCPV6_NA)
return;
for (ssize_t i = 0; i < addr_len; ++i) {
- struct in6_addr prefix = addrs[i].addr.in6;
- prefix.s6_addr32[1] |= htonl(a->assigned);
+ struct in6_addr prefix;
+
+ if (ADDR_MATCH_PIO_FILTER(&addrs[i], a->iface))
+ continue;
+
+ prefix = addrs[i].addr.in6;
+ prefix.s6_addr32[1] |= htonl(a->assigned_subnet_id);
prefix.s6_addr32[2] = prefix.s6_addr32[3] = 0;
netlink_setup_route(&prefix, (a->managed_size) ? addrs[i].prefix : a->length,
- iface->ifindex, &a->peer.sin6_addr, 1024, add);
+ a->iface->ifindex, &a->peer.sin6_addr, 1024, add);
}
}
-static void apply_lease(struct interface *iface, struct dhcpv6_assignment *a, bool add)
+static void apply_lease(struct dhcp_assignment *a, bool add)
{
+ struct interface *iface = a->iface;
struct odhcpd_ipaddr *addrs = (a->managed) ? a->managed : iface->addr6;
ssize_t addrlen = (a->managed) ? a->managed_size : (ssize_t)iface->addr6_len;
- __apply_lease(iface, a, addrs, addrlen, add);
+ __apply_lease(a, addrs, addrlen, add);
+}
+
+/* Set border assignment size based on the IPv6 address prefixes */
+static void set_border_assignment_size(struct interface *iface, struct dhcp_assignment *b)
+{
+ time_t now = odhcpd_time();
+ int minprefix = -1;
+
+ for (size_t i = 0; i < iface->addr6_len; ++i) {
+ struct odhcpd_ipaddr *addr = &iface->addr6[i];
+
+ if (ADDR_MATCH_PIO_FILTER(addr, iface))
+ continue;
+
+ if (addr->preferred_lt > (uint32_t)now &&
+ addr->prefix < 64 &&
+ addr->prefix > minprefix)
+ minprefix = addr->prefix;
+ }
+
+ if (minprefix > 32 && minprefix <= 64)
+ b->assigned_subnet_id = 1U << (64 - minprefix);
+ else
+ b->assigned_subnet_id = 0;
}
/* 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);
+ struct ustream_fd *fd = container_of(s, struct ustream_fd, stream);
+ struct dhcp_assignment *c = container_of(fd, struct dhcp_assignment, managed_sock);
time_t now = odhcpd_time();
bool first = c->managed_size < 0;
continue;
x = strtok_r(NULL, ",", &saveptr2);
- if (sscanf(x, "%u", &n->preferred) < 1)
+ if (sscanf(x, "%u", &n->preferred_lt) < 1)
continue;
x = strtok_r(NULL, ",", &saveptr2);
- if (sscanf(x, "%u", &n->valid) < 1)
+ if (sscanf(x, "%u", &n->valid_lt) < 1)
continue;
- if (n->preferred > n->valid)
+ if (n->preferred_lt > n->valid_lt)
continue;
- if (UINT32_MAX - now < n->preferred)
- n->preferred = UINT32_MAX;
+ if (UINT32_MAX - now < n->preferred_lt)
+ n->preferred_lt = UINT32_MAX;
else
- n->preferred += now;
+ n->preferred_lt += now;
- if (UINT32_MAX - now < n->valid)
- n->valid = UINT32_MAX;
+ if (UINT32_MAX - now < n->valid_lt)
+ n->valid_lt = UINT32_MAX;
else
- n->valid += now;
+ n->valid_lt += now;
n->dprefix = 0;
}
if (first && c->managed_size == 0)
- free_dhcpv6_assignment(c);
- else if (first && !(c->flags & OAF_STATIC))
+ free_assignment(c);
+ else if (first)
c->valid_until = now + 150;
}
/* TCP transmission has ended, either because of success or timeout or other error */
static void managed_handle_pd_done(struct ustream *s)
{
- struct dhcpv6_assignment *c = container_of(s, struct dhcpv6_assignment, managed_sock);
+ struct ustream_fd *fd = container_of(s, struct ustream_fd, stream);
+ struct dhcp_assignment *c = container_of(fd, struct dhcp_assignment, managed_sock);
- if (!(c->flags & OAF_STATIC))
- c->valid_until = odhcpd_time() + 15;
+ c->valid_until = odhcpd_time() + 15;
c->managed_size = 0;
c->reconf_cnt = 1;
}
-static bool assign_pd(struct interface *iface, struct dhcpv6_assignment *assign)
+static bool assign_pd(struct interface *iface, struct dhcp_assignment *assign)
{
- struct dhcpv6_assignment *c;
+ struct dhcp_assignment *c;
if (iface->dhcpv6_pd_manager[0]) {
int fd = usock(USOCK_UNIX | USOCK_TCP, iface->dhcpv6_pd_manager, NULL);
if (fd >= 0) {
+ struct pollfd pfd = { .fd = fd, .events = POLLIN };
char iaidbuf[298];
+
odhcpd_hexlify(iaidbuf, assign->clid_data, assign->clid_len);
assign->managed_sock.stream.notify_read = managed_handle_pd_data;
ustream_write_pending(&assign->managed_sock.stream);
assign->managed_size = -1;
- if (!(assign->flags & OAF_STATIC))
- assign->valid_until = odhcpd_time() + 15;
+ assign->valid_until = odhcpd_time() + 15;
list_add(&assign->head, &iface->ia_assignments);
/* Wait initial period of up to 250ms for immediate assignment */
- struct pollfd pfd = { .fd = fd, .events = POLLIN };
- poll(&pfd, 1, 250);
+ if (poll(&pfd, 1, 250) < 0) {
+ syslog(LOG_ERR, "poll(): %m");
+ return false;
+ }
+
managed_handle_pd_data(&assign->managed_sock.stream, 0);
if (fcntl(fd, F_GETFL) >= 0 && assign->managed_size > 0)
/* Try honoring the hint first */
uint32_t current = 1, asize = (1 << (64 - assign->length)) - 1;
- if (assign->assigned) {
+ if (assign->assigned_subnet_id) {
list_for_each_entry(c, &iface->ia_assignments, head) {
- if (c->length == 128 || c->length == 0)
+ if (c->flags & OAF_DHCPV6_NA)
continue;
- if (assign->assigned >= current && assign->assigned + asize < c->assigned) {
+ if (assign->assigned_subnet_id >= current && assign->assigned_subnet_id + asize < c->assigned_subnet_id) {
list_add_tail(&assign->head, &c->head);
if (assign->flags & OAF_BOUND)
- apply_lease(iface, assign, true);
+ apply_lease(assign, true);
return true;
}
- if (c->assigned != 0)
- current = (c->assigned + (1 << (64 - c->length)));
+ current = (c->assigned_subnet_id + (1 << (64 - c->length)));
}
}
/* Fallback to a variable assignment */
current = 1;
list_for_each_entry(c, &iface->ia_assignments, head) {
- if (c->length == 128 || c->length == 0)
+ if (c->flags & OAF_DHCPV6_NA)
continue;
current = (current + asize) & (~asize);
- if (current + asize < c->assigned) {
- assign->assigned = current;
+
+ if (current + asize < c->assigned_subnet_id) {
+ assign->assigned_subnet_id = current;
list_add_tail(&assign->head, &c->head);
if (assign->flags & OAF_BOUND)
- apply_lease(iface, assign, true);
+ apply_lease(assign, true);
return true;
}
- if (c->assigned != 0)
- current = (c->assigned + (1 << (64 - c->length)));
+ current = (c->assigned_subnet_id + (1 << (64 - c->length)));
}
return false;
}
-static bool assign_na(struct interface *iface, struct dhcpv6_assignment *assign)
+/* Check iid against reserved IPv6 interface identifiers.
+ Refer to:
+ http://www.iana.org/assignments/ipv6-interface-ids */
+static bool is_reserved_ipv6_iid(uint64_t iid)
{
- /* Seed RNG with checksum of DUID */
+ if (iid == 0x0000000000000000)
+ /* Subnet-Router Anycast [RFC4291] */
+ return true;
+
+ if ((iid & 0xFFFFFFFFFF000000) == 0x02005EFFFE000000)
+ /* Reserved IPv6 Interface Identifiers corresponding
+ to the IANA Ethernet Block [RFC4291] */
+ return true;
+
+ if ((iid & 0xFFFFFFFFFFFFFF80) == 0xFDFFFFFFFFFFFF80)
+ /* Reserved Subnet Anycast Addresses [RFC2526] */
+ return true;
+
+ return false;
+}
+
+static bool assign_na(struct interface *iface, struct dhcp_assignment *a)
+{
+ struct dhcp_assignment *c;
uint32_t seed = 0;
- for (size_t i = 0; i < assign->clid_len; ++i)
- seed += assign->clid_data[i];
- srand(seed);
+
+ /* Preconfigured assignment by static lease */
+ if (a->assigned_host_id) {
+ list_for_each_entry(c, &iface->ia_assignments, head) {
+ if (!(c->flags & OAF_DHCPV6_NA) || c->assigned_host_id > a->assigned_host_id ) {
+ list_add_tail(&a->head, &c->head);
+ return true;
+ } else if (c->assigned_host_id == a->assigned_host_id)
+ return false;
+ }
+ }
+
+ /* Seed RNG with checksum of DUID */
+ for (size_t i = 0; i < a->clid_len; ++i)
+ seed += a->clid_data[i];
+ srandom(seed);
/* Try to assign up to 100x */
for (size_t i = 0; i < 100; ++i) {
- uint32_t try;
- do try = ((uint32_t)rand()) % 0x0fff; while (try < 0x100);
+ uint64_t try;
- struct dhcpv6_assignment *c;
- list_for_each_entry(c, &iface->ia_assignments, head) {
- if (c->length == 0)
- continue;
+ if (iface->dhcpv6_hostid_len > 32) {
+ uint32_t mask_high;
- if (c->assigned > try || c->length != 128) {
- assign->assigned = try;
- list_add_tail(&assign->head, &c->head);
+ if (iface->dhcpv6_hostid_len >= 64)
+ mask_high = UINT32_MAX;
+ else
+ mask_high = (1 << (iface->dhcpv6_hostid_len - 32)) - 1;
+
+ do {
+ try = (uint32_t)random();
+ try |= (uint64_t)((uint32_t)random() & mask_high) << 32;
+ } while (try < 0x100);
+ } else {
+ uint32_t mask_low;
+
+ if (iface->dhcpv6_hostid_len == 32)
+ mask_low = UINT32_MAX;
+ else
+ mask_low = (1 << iface->dhcpv6_hostid_len) - 1;
+ do try = ((uint32_t)random()) & mask_low; while (try < 0x100);
+ }
+
+ if (is_reserved_ipv6_iid(try))
+ continue;
+
+ if (config_find_lease_by_hostid(try))
+ continue;
+
+ list_for_each_entry(c, &iface->ia_assignments, head) {
+ if (!(c->flags & OAF_DHCPV6_NA) || c->assigned_host_id > try) {
+ a->assigned_host_id = try;
+ list_add_tail(&a->head, &c->head);
return true;
- } else if (c->assigned == try)
+ } else if (c->assigned_host_id == try)
break;
}
}
static void handle_addrlist_change(struct netevent_handler_info *info)
{
struct interface *iface = info->iface;
- struct dhcpv6_assignment *c, *d, *border = list_last_entry(
- &iface->ia_assignments, struct dhcpv6_assignment, head);
+ struct dhcp_assignment *c, *d, *border = list_last_entry(
+ &iface->ia_assignments, struct dhcp_assignment, head);
+ struct list_head reassign = LIST_HEAD_INIT(reassign);
time_t now = odhcpd_time();
- int minprefix = -1;
- list_for_each_entry(c, &iface->ia_assignments, head)
- if (c != border && iface->ra_managed == RA_MANAGED_NO_MFLAG
+ list_for_each_entry(c, &iface->ia_assignments, head) {
+ if ((c->flags & OAF_DHCPV6_PD) && !(iface->ra_flags & ND_RA_FLAG_MANAGED)
&& (c->flags & OAF_BOUND))
- __apply_lease(iface, c, info->addrs_old.addrs,
+ __apply_lease(c, info->addrs_old.addrs,
info->addrs_old.len, false);
-
- for (size_t i = 0; i < iface->addr6_len; ++i) {
- if (iface->addr6[i].preferred > (uint32_t)now &&
- iface->addr6[i].prefix < 64 &&
- iface->addr6[i].prefix > minprefix)
- minprefix = iface->addr6[i].prefix;
}
- if (minprefix > 32 && minprefix <= 64)
- border->assigned = 1U << (64 - minprefix);
- else
- border->assigned = 0;
+ set_border_assignment_size(iface, border);
- struct list_head reassign = LIST_HEAD_INIT(reassign);
list_for_each_entry_safe(c, d, &iface->ia_assignments, head) {
- if (c->clid_len == 0 || (!INFINITE_VALID(c->valid_until) && c->valid_until < now) ||
- c->managed_size)
+ if (c->clid_len == 0 ||
+ !(c->flags & OAF_DHCPV6_PD) ||
+ (!INFINITE_VALID(c->valid_until) && c->valid_until < now) ||
+ c->managed_size)
continue;
- if (c->length < 128 && c->assigned >= border->assigned && c != border)
+ if (c->assigned_subnet_id >= border->assigned_subnet_id)
list_move(&c->head, &reassign);
- else if (c != border && (c->flags & OAF_BOUND))
- apply_lease(iface, c, true);
+ else if (c->flags & OAF_BOUND)
+ apply_lease(c, true);
if (c->accept_reconf && c->reconf_cnt == 0) {
+ struct dhcp_assignment *a;
+
start_reconf(c);
/* Leave all other assignments of that client alone */
- struct dhcpv6_assignment *a;
list_for_each_entry(a, &iface->ia_assignments, head)
if (a != c && a->clid_len == c->clid_len &&
!memcmp(a->clid_data, c->clid_data, a->clid_len))
}
while (!list_empty(&reassign)) {
- c = list_first_entry(&reassign, struct dhcpv6_assignment, head);
- list_del(&c->head);
- if (!assign_pd(iface, c)) {
- c->assigned = 0;
- list_add(&c->head, &iface->ia_assignments);
- }
+ c = list_first_entry(&reassign, struct dhcp_assignment, head);
+ list_del_init(&c->head);
+ if (!assign_pd(iface, c))
+ free_assignment(c);
}
- dhcpv6_write_statefile();
+ dhcpv6_ia_write_statefile();
}
static void reconf_timeout_cb(struct uloop_timeout *event)
{
- struct dhcpv6_assignment *a = container_of(event, struct dhcpv6_assignment, reconf_timer);
+ struct dhcp_assignment *a = container_of(event, struct dhcp_assignment, reconf_timer);
if (a->reconf_cnt > 0 && a->reconf_cnt < DHCPV6_REC_MAX_RC) {
send_reconf(a);
stop_reconf(a);
}
-static void start_reconf(struct dhcpv6_assignment *a)
+static void start_reconf(struct dhcp_assignment *a)
{
uloop_timeout_set(&a->reconf_timer,
DHCPV6_REC_TIMEOUT << a->reconf_cnt);
send_reconf(a);
}
-static void stop_reconf(struct dhcpv6_assignment *a)
+static void stop_reconf(struct dhcp_assignment *a)
{
uloop_timeout_cancel(&a->reconf_timer);
a->reconf_cnt = 0;
static void valid_until_cb(struct uloop_timeout *event)
{
- time_t now = odhcpd_time();
struct interface *iface;
- list_for_each_entry(iface, &interfaces, head) {
- if (iface->dhcpv6 != MODE_SERVER || iface->ia_assignments.next == NULL)
+ time_t now = odhcpd_time();
+
+ avl_for_each_element(&interfaces, iface, avl) {
+ struct dhcp_assignment *a, *n;
+
+ if (iface->dhcpv6 != MODE_SERVER)
continue;
- struct dhcpv6_assignment *a, *n;
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))
- free_dhcpv6_assignment(a);
-
- }
+ if (a->clid_len > 0 && !INFINITE_VALID(a->valid_until) && a->valid_until < now)
+ free_assignment(a);
}
}
uloop_timeout_set(event, 1000);
}
-static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
- const struct dhcpv6_ia_hdr *ia, struct dhcpv6_assignment *a,
+static size_t build_ia(uint8_t *buf, size_t buflen, uint16_t status,
+ const struct dhcpv6_ia_hdr *ia, struct dhcp_assignment *a,
struct interface *iface, bool request)
{
- if (buflen < sizeof(*ia) + sizeof(struct dhcpv6_ia_prefix))
- return 0;
-
- struct dhcpv6_ia_hdr out = {ia->type, 0, ia->iaid, 0, 0};
- size_t datalen = sizeof(out);
+ struct dhcpv6_ia_hdr o_ia = {
+ .type = ia->type,
+ .len = 0,
+ .iaid = ia->iaid,
+ .t1 = 0,
+ .t2 = 0,
+ };
+ size_t ia_len = sizeof(o_ia);
time_t now = odhcpd_time();
+ if (buflen < ia_len)
+ return 0;
+
if (status) {
struct __attribute__((packed)) {
uint16_t type;
uint16_t len;
- uint16_t value;
- } stat = {htons(DHCPV6_OPT_STATUS), htons(sizeof(stat) - 4),
- htons(status)};
+ uint16_t val;
+ } o_status = {
+ .type = htons(DHCPV6_OPT_STATUS),
+ .len = htons(sizeof(o_status) - 4),
+ .val = htons(status),
+ };
- memcpy(buf + datalen, &stat, sizeof(stat));
- datalen += sizeof(stat);
- } else {
- if (a) {
- uint32_t leasetime;
- if (a->leasetime)
- leasetime = a->leasetime;
- else
- leasetime = iface->dhcpv4_leasetime;
+ memcpy(buf + ia_len, &o_status, sizeof(o_status));
+ ia_len += sizeof(o_status);
- uint32_t pref = leasetime;
- uint32_t valid = leasetime;
+ o_ia.len = htons(ia_len - 4);
+ memcpy(buf, &o_ia, sizeof(o_ia));
- struct odhcpd_ipaddr *addrs = (a->managed) ? a->managed : iface->addr6;
- size_t addrlen = (a->managed) ? (size_t)a->managed_size : iface->addr6_len;
- size_t m = get_preferred_addr(addrs, addrlen);
+ return ia_len;
+ }
- for (size_t i = 0; i < addrlen; ++i) {
- uint32_t prefix_pref = addrs[i].preferred;
- uint32_t prefix_valid = addrs[i].valid;
+ if (a) {
+ uint32_t leasetime, preferred_lt;
- if (!valid_addr(&addrs[i], now))
- continue;
+ if (a->leasetime) {
+ leasetime = a->leasetime;
+ preferred_lt = a->leasetime;
+ } else {
+ leasetime = iface->dhcp_leasetime;
+ preferred_lt = iface->preferred_lifetime;
+ }
- if (prefix_pref != UINT32_MAX)
- prefix_pref -= now;
+ uint32_t valid_lt = leasetime;
- if (prefix_valid != UINT32_MAX)
- prefix_valid -= now;
+ struct odhcpd_ipaddr *addrs = (a->managed) ? a->managed : iface->addr6;
+ size_t addrlen = (a->managed) ? (size_t)a->managed_size : iface->addr6_len;
+ size_t m = get_preferred_addr(addrs, addrlen);
- if (a->length < 128) {
- struct dhcpv6_ia_prefix p = {
- .type = htons(DHCPV6_OPT_IA_PREFIX),
- .len = htons(sizeof(p) - 4),
- .preferred = htonl(prefix_pref),
- .valid = htonl(prefix_valid),
- .prefix = (a->managed_size) ? addrs[i].prefix : a->length,
- .addr = addrs[i].addr.in6,
- };
- p.addr.s6_addr32[1] |= htonl(a->assigned);
- p.addr.s6_addr32[2] = p.addr.s6_addr32[3] = 0;
+ for (size_t i = 0; i < addrlen; ++i) {
+ uint32_t prefix_preferred_lt, prefix_valid_lt;
- size_t entrlen = sizeof(p) - 4;
+ if (!valid_addr(&addrs[i], now))
+ continue;
- if (datalen + entrlen + 4 > buflen ||
- (a->assigned == 0 && a->managed_size == 0) ||
- !valid_prefix_length(a, addrs[i].prefix))
- continue;
+ /* Filter Out Prefixes */
+ if (ADDR_MATCH_PIO_FILTER(&addrs[i], iface)) {
+ char addrbuf[INET6_ADDRSTRLEN];
+ syslog(LOG_INFO, "Address %s filtered out on %s",
+ inet_ntop(AF_INET6, &addrs[i].addr.in6, addrbuf, sizeof(addrbuf)),
+ iface->name);
+ continue;
+ }
- memcpy(buf + datalen, &p, sizeof(p));
- datalen += entrlen + 4;
- } else {
- struct dhcpv6_ia_addr n = {
- .type = htons(DHCPV6_OPT_IA_ADDR),
- .len = htons(sizeof(n) - 4),
- .addr = addrs[i].addr.in6,
- .preferred = htonl(prefix_pref),
- .valid = htonl(prefix_valid)
- };
- n.addr.s6_addr32[3] = htonl(a->assigned);
- size_t entrlen = sizeof(n) - 4;
+ prefix_preferred_lt = addrs[i].preferred_lt;
+ prefix_valid_lt = addrs[i].valid_lt;
- if (!ADDR_ENTRY_VALID_IA_ADDR(iface, i, m, addrs) ||
- a->assigned == 0 ||
- datalen + entrlen + 4 > buflen)
- continue;
+ if (prefix_preferred_lt != UINT32_MAX)
+ prefix_preferred_lt -= now;
- memcpy(buf + datalen, &n, sizeof(n));
- datalen += entrlen + 4;
- }
+ if (prefix_preferred_lt > preferred_lt)
+ prefix_preferred_lt = preferred_lt;
- /* Calculate T1 / T2 based on non-deprecated addresses */
- if (prefix_pref > 0) {
- if (prefix_pref < pref)
- pref = prefix_pref;
+ if (prefix_valid_lt != UINT32_MAX)
+ prefix_valid_lt -= now;
- if (prefix_valid < valid)
- valid = prefix_valid;
- }
+ if (prefix_valid_lt > leasetime)
+ prefix_valid_lt = leasetime;
+
+ if (prefix_preferred_lt > prefix_valid_lt)
+ prefix_preferred_lt = prefix_valid_lt;
+
+ if (a->flags & OAF_DHCPV6_PD) {
+ struct dhcpv6_ia_prefix o_ia_p = {
+ .type = htons(DHCPV6_OPT_IA_PREFIX),
+ .len = htons(sizeof(o_ia_p) - 4),
+ .preferred_lt = htonl(prefix_preferred_lt),
+ .valid_lt = htonl(prefix_valid_lt),
+ .prefix = (a->managed_size) ? addrs[i].prefix : a->length,
+ .addr = addrs[i].addr.in6,
+ };
+
+ o_ia_p.addr.s6_addr32[1] |= htonl(a->assigned_subnet_id);
+ o_ia_p.addr.s6_addr32[2] = o_ia_p.addr.s6_addr32[3] = 0;
+
+ if (!valid_prefix_length(a, addrs[i].prefix))
+ continue;
+
+ if (buflen < ia_len + sizeof(o_ia_p))
+ return 0;
+
+ memcpy(buf + ia_len, &o_ia_p, sizeof(o_ia_p));
+ ia_len += sizeof(o_ia_p);
}
- if (!INFINITE_VALID(a->valid_until))
- /* UINT32_MAX is considered as infinite leasetime */
- a->valid_until = (valid == UINT32_MAX) ? 0 : valid + now;
+ if (a->flags & OAF_DHCPV6_NA) {
+ struct dhcpv6_ia_addr o_ia_a = {
+ .type = htons(DHCPV6_OPT_IA_ADDR),
+ .len = htons(sizeof(o_ia_a) - 4),
+ .addr = addrs[i].addr.in6,
+ .preferred_lt = htonl(prefix_preferred_lt),
+ .valid_lt = htonl(prefix_valid_lt)
+ };
+
+ o_ia_a.addr.s6_addr32[2] = htonl(a->assigned_host_id >> 32);
+ o_ia_a.addr.s6_addr32[3] = htonl(a->assigned_host_id & UINT32_MAX);
- out.t1 = htonl((pref == UINT32_MAX) ? pref : pref * 5 / 10);
- out.t2 = htonl((pref == UINT32_MAX) ? pref : pref * 8 / 10);
+ if (!ADDR_ENTRY_VALID_IA_ADDR(iface, i, m, addrs))
+ continue;
- if (!out.t1)
- out.t1 = htonl(1);
+ if (buflen < ia_len + sizeof(o_ia_a))
+ return 0;
+
+ memcpy(buf + ia_len, &o_ia_a, sizeof(o_ia_a));
+ ia_len += sizeof(o_ia_a);
+ }
- if (!out.t2)
- out.t2 = htonl(1);
+ /* Calculate T1 / T2 based on non-deprecated addresses */
+ if (prefix_preferred_lt > 0) {
+ if (prefix_preferred_lt < preferred_lt)
+ preferred_lt = prefix_preferred_lt;
+
+ if (prefix_valid_lt < valid_lt)
+ valid_lt = prefix_valid_lt;
+ }
}
- if (!request) {
- uint8_t *odata, *end = ((uint8_t*)ia) + htons(ia->len) + 4;
- uint16_t otype, olen;
- dhcpv6_for_each_option((uint8_t*)&ia[1], end, otype, olen, odata) {
- struct dhcpv6_ia_prefix *p = (struct dhcpv6_ia_prefix*)&odata[-4];
- struct dhcpv6_ia_addr *n = (struct dhcpv6_ia_addr*)&odata[-4];
- if ((otype != DHCPV6_OPT_IA_PREFIX || olen < sizeof(*p) - 4) &&
- (otype != DHCPV6_OPT_IA_ADDR || olen < sizeof(*n) - 4))
- continue;
+ if (!INFINITE_VALID(a->valid_until))
+ /* UINT32_MAX is RFC defined as infinite lease-time */
+ a->valid_until = (valid_lt == UINT32_MAX) ? 0 : valid_lt + now;
- bool found = false;
- if (a) {
- struct odhcpd_ipaddr *addrs = (a->managed) ? a->managed : iface->addr6;
- size_t addrlen = (a->managed) ? (size_t)a->managed_size : iface->addr6_len;
-
- for (size_t i = 0; i < addrlen; ++i) {
- if (!valid_addr(&addrs[i], now))
- continue;
-
- struct in6_addr addr = addrs[i].addr.in6;
- if (ia->type == htons(DHCPV6_OPT_IA_PD)) {
- addr.s6_addr32[1] |= htonl(a->assigned);
- addr.s6_addr32[2] = addr.s6_addr32[3] = 0;
-
- if (!memcmp(&p->addr, &addr, sizeof(addr)) &&
- p->prefix == ((a->managed) ? addrs[i].prefix : a->length))
- found = true;
- } else {
- addr.s6_addr32[3] = htonl(a->assigned);
-
- if (!memcmp(&n->addr, &addr, sizeof(addr)))
- found = true;
- }
- }
- }
+ if (!INFINITE_VALID(a->preferred_until))
+ /* UINT32_MAX is RFC defined as infinite lease-time */
+ a->preferred_until = (preferred_lt == UINT32_MAX) ? 0 : preferred_lt + now;
+
+ o_ia.t1 = htonl((preferred_lt == UINT32_MAX) ? preferred_lt : preferred_lt * 5 / 10);
+ o_ia.t2 = htonl((preferred_lt == UINT32_MAX) ? preferred_lt : preferred_lt * 8 / 10);
+
+ if (!o_ia.t1)
+ o_ia.t1 = htonl(1);
+
+ if (!o_ia.t2)
+ o_ia.t2 = htonl(1);
+ }
+
+ if (!request) {
+ uint8_t *odata, *end = ((uint8_t*)ia) + htons(ia->len) + 4;
+ uint16_t otype, olen;
+
+ dhcpv6_for_each_option((uint8_t*)&ia[1], end, otype, olen, odata) {
+ struct dhcpv6_ia_prefix *ia_p = (struct dhcpv6_ia_prefix *)&odata[-4];
+ struct dhcpv6_ia_addr *ia_a = (struct dhcpv6_ia_addr *)&odata[-4];
+ bool found = false;
+
+ if ((otype != DHCPV6_OPT_IA_PREFIX || olen < sizeof(*ia_p) - 4) &&
+ (otype != DHCPV6_OPT_IA_ADDR || olen < sizeof(*ia_a) - 4))
+ continue;
+
+ if (a) {
+ struct odhcpd_ipaddr *addrs = (a->managed) ? a->managed : iface->addr6;
+ size_t addrlen = (a->managed) ? (size_t)a->managed_size : iface->addr6_len;
+
+ for (size_t i = 0; i < addrlen; ++i) {
+ struct in6_addr addr;
+
+ if (!valid_addr(&addrs[i], now))
+ continue;
- if (!found) {
- if (otype == DHCPV6_OPT_IA_PREFIX) {
- struct dhcpv6_ia_prefix inv = {
- .type = htons(DHCPV6_OPT_IA_PREFIX),
- .len = htons(sizeof(inv) - 4),
- .preferred = 0,
- .valid = 0,
- .prefix = p->prefix,
- .addr = p->addr
- };
-
- if (datalen + sizeof(inv) > buflen)
- continue;
-
- memcpy(buf + datalen, &inv, sizeof(inv));
- datalen += sizeof(inv);
+ if (!valid_prefix_length(a, addrs[i].prefix))
+ continue;
+
+ if (ADDR_MATCH_PIO_FILTER(&addrs[i], iface))
+ continue;
+
+ addr = addrs[i].addr.in6;
+ if (ia->type == htons(DHCPV6_OPT_IA_PD)) {
+ addr.s6_addr32[1] |= htonl(a->assigned_subnet_id);
+ addr.s6_addr32[2] = addr.s6_addr32[3] = 0;
+
+ if (!memcmp(&ia_p->addr, &addr, sizeof(addr)) &&
+ ia_p->prefix == ((a->managed) ? addrs[i].prefix : a->length))
+ found = true;
} else {
- struct dhcpv6_ia_addr inv = {
- .type = htons(DHCPV6_OPT_IA_ADDR),
- .len = htons(sizeof(inv) - 4),
- .addr = n->addr,
- .preferred = 0,
- .valid = 0
- };
-
- if (datalen + sizeof(inv) > buflen)
- continue;
-
- memcpy(buf + datalen, &inv, sizeof(inv));
- datalen += sizeof(inv);
+ addr.s6_addr32[2] = htonl(a->assigned_host_id >> 32);
+ addr.s6_addr32[3] = htonl(a->assigned_host_id & UINT32_MAX);
+
+ if (!memcmp(&ia_a->addr, &addr, sizeof(addr)))
+ found = true;
}
}
}
+
+ if (!found) {
+ if (otype == DHCPV6_OPT_IA_PREFIX) {
+ struct dhcpv6_ia_prefix o_ia_p = {
+ .type = htons(DHCPV6_OPT_IA_PREFIX),
+ .len = htons(sizeof(o_ia_p) - 4),
+ .preferred_lt = 0,
+ .valid_lt = 0,
+ .prefix = ia_p->prefix,
+ .addr = ia_p->addr,
+ };
+
+ if (buflen < ia_len + sizeof(o_ia_p))
+ return 0;
+
+ memcpy(buf + ia_len, &o_ia_p, sizeof(o_ia_p));
+ ia_len += sizeof(o_ia_p);
+ } else {
+ struct dhcpv6_ia_addr o_ia_a = {
+ .type = htons(DHCPV6_OPT_IA_ADDR),
+ .len = htons(sizeof(o_ia_a) - 4),
+ .addr = ia_a->addr,
+ .preferred_lt = 0,
+ .valid_lt = 0,
+ };
+
+ if (buflen < ia_len + sizeof(o_ia_a))
+ continue;
+
+ memcpy(buf + ia_len, &o_ia_a, sizeof(o_ia_a));
+ ia_len += sizeof(o_ia_a);
+ }
+ }
}
}
- out.len = htons(datalen - 4);
- memcpy(buf, &out, sizeof(out));
- return datalen;
+ o_ia.len = htons(ia_len - 4);
+ memcpy(buf, &o_ia, sizeof(o_ia));
+ return ia_len;
}
struct log_ctxt {
int buf_idx;
};
-static void dhcpv6_log_ia_addr(struct in6_addr *addr, int prefix, _unused uint32_t pref,
- _unused uint32_t valid, void *arg)
+static void dhcpv6_log_ia_addr(struct in6_addr *addr, int prefix, _unused uint32_t pref_lt,
+ _unused uint32_t valid_lt, void *arg)
{
struct log_ctxt *ctxt = (struct log_ctxt *)arg;
char addrbuf[INET6_ADDRSTRLEN];
}
static void dhcpv6_log(uint8_t msgtype, struct interface *iface, time_t now,
- const char *duidbuf, bool is_pd, struct dhcpv6_assignment *a, int code)
+ const char *duidbuf, bool is_pd, struct dhcp_assignment *a, int code)
{
const char *type = "UNKNOWN";
const char *status = "UNKNOWN";
- if (msgtype == DHCPV6_MSG_RENEW)
- return;
-
switch (msgtype) {
case DHCPV6_MSG_SOLICIT:
type = "SOLICIT";
.buf_len = sizeof(leasebuf),
.buf_idx = 0 };
- dhcpv6_enum_ia_addrs(iface, a, now, dhcpv6_log_ia_addr, &ctxt);
+ dhcpv6_ia_enum_addrs(iface, a, now, dhcpv6_log_ia_addr, &ctxt);
}
- syslog(LOG_WARNING, "DHCPV6 %s %s from %s on %s: %s %s", type, (is_pd) ? "IA_PD" : "IA_NA",
- duidbuf, iface->ifname, status, leasebuf);
+ syslog(LOG_INFO, "DHCPV6 %s %s from %s on %s: %s %s", type, (is_pd) ? "IA_PD" : "IA_NA",
+ duidbuf, iface->name, status, leasebuf);
}
-ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
- const struct sockaddr_in6 *addr, const void *data, const uint8_t *end)
+static bool dhcpv6_ia_on_link(const struct dhcpv6_ia_hdr *ia, struct dhcp_assignment *a,
+ struct interface *iface)
{
+ struct odhcpd_ipaddr *addrs = (a && a->managed) ? a->managed : iface->addr6;
+ size_t addrlen = (a && a->managed) ? (size_t)a->managed_size : iface->addr6_len;
time_t now = odhcpd_time();
- size_t response_len = 0;
- const struct dhcpv6_client_header *hdr = data;
- uint8_t *start = (uint8_t*)&hdr[1], *odata;
+ uint8_t *odata, *end = ((uint8_t*)ia) + htons(ia->len) + 4;
uint16_t otype, olen;
- /* Find and parse client-id and hostname */
- bool accept_reconf = false;
- 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 notonlink = false;
- char duidbuf[261];
+ bool onlink = true;
+
+ dhcpv6_for_each_option((uint8_t*)&ia[1], end, otype, olen, odata) {
+ struct dhcpv6_ia_prefix *p = (struct dhcpv6_ia_prefix *)&odata[-4];
+ struct dhcpv6_ia_addr *n = (struct dhcpv6_ia_addr *)&odata[-4];
+
+ if ((otype != DHCPV6_OPT_IA_PREFIX || olen < sizeof(*p) - 4) &&
+ (otype != DHCPV6_OPT_IA_ADDR || olen < sizeof(*n) - 4))
+ continue;
+
+ onlink = false;
+ for (size_t i = 0; i < addrlen; ++i) {
+ if (!valid_addr(&addrs[i], now))
+ continue;
+
+ if (ADDR_MATCH_PIO_FILTER(&addrs[i], iface))
+ continue;
+
+ if (ia->type == htons(DHCPV6_OPT_IA_PD)) {
+ if (p->prefix < addrs[i].prefix ||
+ odhcpd_bmemcmp(&p->addr, &addrs[i].addr.in6, addrs[i].prefix))
+ continue;
+
+ } else if (odhcpd_bmemcmp(&n->addr, &addrs[i].addr.in6, addrs[i].prefix))
+ continue;
+
+ onlink = true;
+ }
+
+ if (!onlink)
+ break;
+ }
+
+ return onlink;
+}
+
+ssize_t dhcpv6_ia_handle_IAs(uint8_t *buf, size_t buflen, struct interface *iface,
+ const struct sockaddr_in6 *addr, const void *data, const uint8_t *end)
+{
+ struct lease *l;
+ struct dhcp_assignment *first = NULL;
+ const struct dhcpv6_client_header *hdr = data;
+ time_t now = odhcpd_time();
+ uint16_t otype, olen, clid_len = 0;
+ uint8_t *start = (uint8_t *)&hdr[1], *odata;
+ uint8_t *clid_data = NULL, mac[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+ size_t hostname_len = 0, response_len = 0;
+ bool notonlink = false, rapid_commit = false, accept_reconf = false;
+ char duidbuf[261], hostname[256];
dhcpv6_for_each_option(start, end, otype, olen, odata) {
if (otype == DHCPV6_OPT_CLIENTID) {
hostname_len = strcspn(hostname, ".");
} else if (otype == DHCPV6_OPT_RECONF_ACCEPT)
accept_reconf = true;
+ else if (otype == DHCPV6_OPT_RAPID_COMMIT && hdr->msg_type == DHCPV6_MSG_SOLICIT)
+ rapid_commit = true;
}
if (!clid_data || !clid_len || clid_len > 130)
goto out;
- struct dhcpv6_assignment *first = NULL;
+ l = config_find_lease_by_duid(clid_data, clid_len);
+ if (!l)
+ l = config_find_lease_by_mac(mac);
+
dhcpv6_for_each_option(start, end, otype, olen, odata) {
bool is_pd = (otype == DHCPV6_OPT_IA_PD);
bool is_na = (otype == DHCPV6_OPT_IA_NA);
if (reqlen > 64)
reqlen = 64;
+
+ /*
+ * A requesting router can include a desired prefix length for its
+ * delegation. The delegating router (us) is not required to honor
+ * the hint (RFC3633, section 11.2, we MAY choose to use the
+ * information in the option; RFC8168, section 3.2 has several SHOULDs
+ * about desired choices for selecting a prefix to delegate).
+ *
+ * We support a policy setting to conserve prefix space, which purposely
+ * assigns prefixes that might not match the requesting router's hint.
+ *
+ * If the minimum prefix length is set in this interface's
+ * configuration, we use it as a floor for the requested (hinted)
+ * prefix length. This allows us to conserve prefix space so that
+ * any single router can't grab too much of it. Consider if we have
+ * an interface with a /56 prefix. A requesting router could ask for
+ * a /58 and take 1/4 of our total address space. But if we set a
+ * minimum of /60, we can limit each requesting router to get only
+ * 1/16 of our total address space.
+ */
+ if (iface->dhcpv6_pd_min_len && reqlen < iface->dhcpv6_pd_min_len) {
+ syslog(LOG_INFO, "clamping requested PD from %d to %d",
+ reqlen, iface->dhcpv6_pd_min_len);
+ reqlen = iface->dhcpv6_pd_min_len;
+ }
} else if (is_na) {
uint8_t *sdata;
uint16_t stype, slen;
}
/* Find assignment */
- struct dhcpv6_assignment *c, *a = NULL;
+ struct dhcp_assignment *c, *a = NULL;
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)))) &&
- (!(c->flags & (OAF_BOUND|OAF_TENTATIVE)) || c->iaid == ia->iaid) &&
- (INFINITE_VALID(c->valid_until) || now < c->valid_until) &&
- ((is_pd && c->length <= 64) || (is_na && c->length == 128))) {
+ if ((c->clid_len == clid_len && !memcmp(c->clid_data, clid_data, clid_len)) &&
+ c->iaid == ia->iaid && (INFINITE_VALID(c->valid_until) || now < c->valid_until) &&
+ ((is_pd && (c->flags & OAF_DHCPV6_PD)) || (is_na && (c->flags & OAF_DHCPV6_NA)))) {
a = c;
/* Reset state */
if (a->flags & OAF_BOUND)
- apply_lease(iface, a, false);
+ apply_lease(a, false);
- memcpy(a->clid_data, clid_data, clid_len);
- a->clid_len = clid_len;
- a->iaid = ia->iaid;
- a->peer = *addr;
stop_reconf(a);
break;
}
}
+ if (l && a && a->lease != l) {
+ free_assignment(a);
+ a = NULL;
+ }
+
/* Generic message handling */
uint16_t status = DHCPV6_STATUS_OK;
if (a && a->managed_size < 0)
(hdr->msg_type == DHCPV6_MSG_REBIND && !a)) {
bool assigned = !!a;
- if (!a && !iface->no_dynamic_dhcp) {
- /* Create new binding */
- a = calloc(1, sizeof(*a) + clid_len);
- if (a) {
- a->clid_len = clid_len;
- a->iaid = ia->iaid;
- a->length = reqlen;
- a->peer = *addr;
- a->assigned = reqhint;
- /* Set valid time to current time indicating */
- /* assignment is not having infinite lifetime */
- a->valid_until = now;
- a->iface = iface;
-
- if (first)
- memcpy(a->key, first->key, sizeof(a->key));
- else
- odhcpd_urandom(a->key, sizeof(a->key));
- memcpy(a->clid_data, clid_data, clid_len);
-
- if (is_pd)
- while (!(assigned = assign_pd(iface, a)) &&
- !a->managed_size && ++a->length <= 64);
- else
- assigned = assign_na(iface, a);
+ if (!a) {
+ if ((!iface->no_dynamic_dhcp || (l && is_na)) &&
+ (iface->dhcpv6_pd || iface->dhcpv6_na)) {
+ /* Create new binding */
+ a = alloc_assignment(clid_len);
+
+ if (a) {
+ a->clid_len = clid_len;
+ memcpy(a->clid_data, clid_data, clid_len);
+ a->iaid = ia->iaid;
+ a->length = reqlen;
+ a->peer = *addr;
+ if (is_na)
+ a->assigned_host_id = l ? l->hostid : 0;
+ else
+ a->assigned_subnet_id = reqhint;
+ a->valid_until = now;
+ a->preferred_until = now;
+ a->dhcp_free_cb = dhcpv6_ia_free_assignment;
+ a->iface = iface;
+ a->flags = (is_pd ? OAF_DHCPV6_PD : OAF_DHCPV6_NA);
+
+ if (first)
+ memcpy(a->key, first->key, sizeof(a->key));
+ else
+ odhcpd_urandom(a->key, sizeof(a->key));
+
+ if (is_pd && iface->dhcpv6_pd)
+ while (!(assigned = assign_pd(iface, a)) &&
+ !a->managed_size && ++a->length <= 64);
+ else if (is_na && iface->dhcpv6_na)
+ assigned = assign_na(iface, a);
+
+ if (l && assigned) {
+ a->flags |= OAF_STATIC;
+
+ if (l->hostname)
+ a->hostname = strdup(l->hostname);
+
+ if (l->leasetime)
+ a->leasetime = l->leasetime;
+
+ list_add(&a->lease_list, &l->assignments);
+ a->lease = l;
+ }
- if (a->managed_size && !assigned)
- return -1;
+ if (a->managed_size && !assigned)
+ return -1;
+ }
}
}
if (!assigned || iface->addr6_len == 0)
/* Set error status */
status = (is_pd) ? DHCPV6_STATUS_NOPREFIXAVAIL : DHCPV6_STATUS_NOADDRSAVAIL;
- else if (accept_reconf && assigned && !first &&
+ else if (hdr->msg_type == DHCPV6_MSG_REQUEST && !dhcpv6_ia_on_link(ia, a, iface)) {
+ /* Send NOTONLINK status for the IA */
+ status = DHCPV6_STATUS_NOTONLINK;
+ assigned = false;
+ } else if (accept_reconf && assigned && !first &&
hdr->msg_type != DHCPV6_MSG_REBIND) {
size_t handshake_len = 4;
buf[0] = 0;
handshake_len += sizeof(auth);
}
+
buf += handshake_len;
buflen -= handshake_len;
response_len += handshake_len;
first = a;
}
- ia_response_len = append_reply(buf, buflen, status, ia, a, iface,
+ ia_response_len = build_ia(buf, buflen, status, ia, a, iface,
hdr->msg_type == DHCPV6_MSG_REBIND ? false : true);
/* Was only a solicitation: mark binding for removal */
- if (assigned && hdr->msg_type == DHCPV6_MSG_SOLICIT) {
+ if (assigned && hdr->msg_type == DHCPV6_MSG_SOLICIT && !rapid_commit) {
a->flags &= ~OAF_BOUND;
a->flags |= OAF_TENTATIVE;
- if (!(a->flags & OAF_STATIC))
- a->valid_until = now;
+ /* Keep tentative assignment around for 60 seconds */
+ a->valid_until = now + 60;
+
} else if (assigned &&
- (hdr->msg_type == DHCPV6_MSG_REQUEST ||
- hdr->msg_type == DHCPV6_MSG_REBIND)) {
- if (hostname_len > 0) {
+ ((hdr->msg_type == DHCPV6_MSG_SOLICIT && rapid_commit) ||
+ hdr->msg_type == DHCPV6_MSG_REQUEST ||
+ hdr->msg_type == DHCPV6_MSG_REBIND)) {
+ if ((!(a->flags & OAF_STATIC) || !a->hostname) && hostname_len > 0) {
a->hostname = realloc(a->hostname, hostname_len + 1);
if (a->hostname) {
memcpy(a->hostname, hostname, hostname_len);
a->hostname[hostname_len] = 0;
+
+ if (odhcpd_valid_hostname(a->hostname))
+ a->flags &= ~OAF_BROKEN_HOSTNAME;
+ else
+ a->flags |= OAF_BROKEN_HOSTNAME;
}
}
a->accept_reconf = accept_reconf;
a->flags &= ~OAF_TENTATIVE;
a->flags |= OAF_BOUND;
- apply_lease(iface, a, true);
+ apply_lease(a, true);
} else if (!assigned && a && a->managed_size == 0) {
/* Cleanup failed assignment */
- free_dhcpv6_assignment(a);
+ free_assignment(a);
a = NULL;
}
} else if (hdr->msg_type == DHCPV6_MSG_RENEW ||
hdr->msg_type == DHCPV6_MSG_DECLINE) {
if (!a && hdr->msg_type != DHCPV6_MSG_REBIND) {
status = DHCPV6_STATUS_NOBINDING;
- ia_response_len = append_reply(buf, buflen, status, ia, a, iface, false);
+ ia_response_len = build_ia(buf, buflen, status, ia, a, iface, false);
} else if (hdr->msg_type == DHCPV6_MSG_RENEW ||
hdr->msg_type == DHCPV6_MSG_REBIND) {
- ia_response_len = append_reply(buf, buflen, status, ia, a, iface, false);
+ ia_response_len = build_ia(buf, buflen, status, ia, a, iface, false);
if (a) {
a->flags |= OAF_BOUND;
- apply_lease(iface, a, true);
+ apply_lease(a, true);
}
} else if (hdr->msg_type == DHCPV6_MSG_RELEASE) {
- if (!(a->flags & OAF_STATIC))
- a->valid_until = now - 1;
-
- if (a->flags & OAF_BOUND) {
- apply_lease(iface, a, false);
- a->flags &= ~OAF_BOUND;
- }
- } else if (hdr->msg_type == DHCPV6_MSG_DECLINE && a->length == 128) {
+ a->valid_until = now - 1;
+ } else if ((a->flags & OAF_DHCPV6_NA) && hdr->msg_type == DHCPV6_MSG_DECLINE) {
a->flags &= ~OAF_BOUND;
- if (!(a->flags & OAF_STATIC)) {
- a->clid_len = 0;
+ if (!(a->flags & OAF_STATIC) || a->lease->hostid != a->assigned_host_id) {
+ memset(a->clid_data, 0, a->clid_len);
a->valid_until = now + 3600; /* Block address for 1h */
- }
+ } else
+ a->valid_until = now - 1;
+ }
+ } else if (hdr->msg_type == DHCPV6_MSG_CONFIRM) {
+ if (ia_addr_present && !dhcpv6_ia_on_link(ia, a, iface)) {
+ notonlink = true;
+ break;
+ }
+
+ if (!ia_addr_present || !a || !(a->flags & OAF_BOUND)) {
+ response_len = 0;
+ goto out;
}
- } 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;
}
buf += ia_response_len;
dhcpv6_log(hdr->msg_type, iface, now, duidbuf, is_pd, a, status);
}
- if ((hdr->msg_type == DHCPV6_MSG_RELEASE || hdr->msg_type == DHCPV6_MSG_DECLINE || notonlink) &&
- response_len + 6 < buflen) {
- buf[0] = 0;
- buf[1] = DHCPV6_OPT_STATUS;
- buf[2] = 0;
- buf[3] = 2;
- buf[4] = 0;
- buf[5] = (notonlink) ? DHCPV6_STATUS_NOTONLINK : DHCPV6_STATUS_OK;
- response_len += 6;
+ switch (hdr->msg_type) {
+ case DHCPV6_MSG_RELEASE:
+ case DHCPV6_MSG_DECLINE:
+ case DHCPV6_MSG_CONFIRM:
+ if (response_len + 6 < buflen) {
+ buf[0] = 0;
+ buf[1] = DHCPV6_OPT_STATUS;
+ buf[2] = 0;
+ buf[3] = 2;
+ buf[4] = 0;
+ buf[5] = (notonlink) ? DHCPV6_STATUS_NOTONLINK : DHCPV6_STATUS_OK;
+ response_len += 6;
+ }
+ break;
+
+ default:
+ break;
}
- dhcpv6_write_statefile();
+ dhcpv6_ia_write_statefile();
out:
return response_len;
projects / project / odhcpd.git / blobdiff