(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 set_border_assignment_size(struct interface *iface, struct dhcpv6_assignment *b);
+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;
+ struct dhcp_assignment *c;
while (!list_empty(&iface->ia_assignments)) {
- c = list_first_entry(&iface->ia_assignments, struct dhcpv6_assignment, head);
- free_dhcpv6_assignment(c);
+ c = list_first_entry(&iface->ia_assignments, struct dhcp_assignment, head);
+ free_assignment(c);
}
}
if (enable && iface->dhcpv6 == MODE_SERVER) {
- struct dhcpv6_assignment *border;
- struct lease *lease;
+ struct dhcp_assignment *border;
if (!iface->ia_assignments.next)
INIT_LIST_HEAD(&iface->ia_assignments);
border = calloc(1, sizeof(*border));
if (!border) {
- syslog(LOG_ERR, "Calloc failed for border on interface %s", iface->ifname);
+ syslog(LOG_ERR, "Calloc failed for border on %s", iface->name);
return -1;
}
border->length = 64;
list_add(&border->head, &iface->ia_assignments);
} else
- border = list_last_entry(&iface->ia_assignments, struct dhcpv6_assignment, head);
+ border = list_last_entry(&iface->ia_assignments, struct dhcp_assignment, head);
set_border_assignment_size(iface, border);
-
- /* Parse static entries */
- 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;
- }
-
- 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;
- }
-
- if (a->head.next) {
- a->iface = iface;
- if (lease->hostname[0]) {
- free(a->hostname);
- a->hostname = strdup(lease->hostname);
- }
- } else
- free_dhcpv6_assignment(a);
- }
}
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);
}
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->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;
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,
+static void dhcpv6_write_ia_addr(struct in6_addr *addr, int prefix, _unused uint32_t pref,
_unused uint32_t valid, void *arg)
{
struct write_ctxt *ctxt = (struct write_ctxt *)arg;
"%s/%d ", ipbuf, prefix);
}
-void dhcpv6_write_statefile(void)
+void dhcpv6_ia_write_statefile(void)
{
struct write_ctxt ctxt;
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;
ctxt.c->assigned, (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;
+ struct dhcp_assignment *c;
list_for_each_entry(c, &ctxt.iface->dhcpv4_assignments, head) {
if (!(c->flags & OAF_BOUND))
continue;
}
}
-static void __apply_lease(struct interface *iface, struct dhcpv6_assignment *a,
+static void __apply_lease(struct interface *iface, struct dhcp_assignment *a,
struct odhcpd_ipaddr *addrs, ssize_t addr_len, bool add)
{
if (a->length > 64)
}
}
-static void apply_lease(struct interface *iface, struct dhcpv6_assignment *a, bool add)
+static void apply_lease(struct interface *iface, struct dhcp_assignment *a, bool add)
{
struct odhcpd_ipaddr *addrs = (a->managed) ? a->managed : iface->addr6;
ssize_t addrlen = (a->managed) ? a->managed_size : (ssize_t)iface->addr6_len;
}
/* Set border assignment size based on the IPv6 address prefixes */
-static void set_border_assignment_size(struct interface *iface, struct dhcpv6_assignment *b)
+static void set_border_assignment_size(struct interface *iface, struct dhcp_assignment *b)
{
time_t now = odhcpd_time();
int minprefix = -1;
static void managed_handle_pd_data(struct ustream *s, _unused int bytes_new)
{
struct ustream_fd *fd = container_of(s, struct ustream_fd, stream);
- struct dhcpv6_assignment *c = container_of(fd, struct dhcpv6_assignment, managed_sock);
+ struct dhcp_assignment *c = container_of(fd, struct dhcp_assignment, managed_sock);
time_t now = odhcpd_time();
bool first = c->managed_size < 0;
}
if (first && c->managed_size == 0)
- free_dhcpv6_assignment(c);
+ free_assignment(c);
else if (first && !(c->flags & OAF_STATIC))
c->valid_until = now + 150;
}
static void managed_handle_pd_done(struct ustream *s)
{
struct ustream_fd *fd = container_of(s, struct ustream_fd, stream);
- struct dhcpv6_assignment *c = container_of(fd, struct dhcpv6_assignment, managed_sock);
+ struct dhcp_assignment *c = container_of(fd, struct dhcp_assignment, managed_sock);
if (!(c->flags & OAF_STATIC))
c->valid_until = odhcpd_time() + 15;
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);
return false;
}
-static bool assign_na(struct interface *iface, struct dhcpv6_assignment *assign)
+static bool assign_na(struct interface *iface, struct dhcp_assignment *a)
{
- /* Seed RNG with checksum of DUID */
+ struct dhcp_assignment *c;
uint32_t seed = 0;
- for (size_t i = 0; i < assign->clid_len; ++i)
- seed += assign->clid_data[i];
+
+ /* Preconfigured assignment by static lease */
+ if (a->assigned) {
+ list_for_each_entry(c, &iface->ia_assignments, head) {
+ if (c->length == 0)
+ continue;
+
+ if (c->assigned > a->assigned || c->length != 128) {
+ list_add_tail(&a->head, &c->head);
+ return true;
+ } else if (c->assigned == a->assigned)
+ return false;
+ }
+ }
+
+ /* Seed RNG with checksum of DUID */
+ for (size_t i = 0; i < a->clid_len; ++i)
+ seed += a->clid_data[i];
srand(seed);
/* Try to assign up to 100x */
uint32_t try;
do try = ((uint32_t)rand()) % 0x0fff; while (try < 0x100);
- struct dhcpv6_assignment *c;
+ if (config_find_lease_by_hostid(try))
+ continue;
+
list_for_each_entry(c, &iface->ia_assignments, head) {
if (c->length == 0)
continue;
if (c->assigned > try || c->length != 128) {
- assign->assigned = try;
- list_add_tail(&assign->head, &c->head);
+ a->assigned = try;
+ list_add_tail(&a->head, &c->head);
return true;
} else if (c->assigned == 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();
apply_lease(iface, c, true);
if (c->accept_reconf && c->reconf_cnt == 0) {
- struct dhcpv6_assignment *a;
+ struct dhcp_assignment *a;
start_reconf(c);
}
while (!list_empty(&reassign)) {
- c = list_first_entry(&reassign, struct dhcpv6_assignment, head);
+ c = list_first_entry(&reassign, struct dhcp_assignment, head);
list_del(&c->head);
if (!assign_pd(iface, c)) {
c->assigned = 0;
}
}
- 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) {
+ time_t now = odhcpd_time();
+
+ avl_for_each_element(&interfaces, iface, avl) {
+ struct dhcp_assignment *a, *n;
+
if (iface->dhcpv6 != MODE_SERVER || iface->ia_assignments.next == NULL)
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);
+ free_assignment(a);
}
}
}
static size_t build_ia(uint8_t *buf, size_t buflen, uint16_t status,
- const struct dhcpv6_ia_hdr *ia, struct dhcpv6_assignment *a,
+ const struct dhcpv6_ia_hdr *ia, struct dhcp_assignment *a,
struct interface *iface, bool request)
{
struct dhcpv6_ia_hdr o_ia = {
}
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";
.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_NOTICE, "DHCPV6 %s %s from %s on %s: %s %s", type, (is_pd) ? "IA_PD" : "IA_NA",
+ duidbuf, iface->name, status, leasebuf);
}
-static bool dhcpv6_ia_on_link(const struct dhcpv6_ia_hdr *ia, struct dhcpv6_assignment *a,
+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;
return onlink;
}
-ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
+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)
{
- time_t now = odhcpd_time();
- size_t response_len = 0;
+ struct lease *l;
+ struct dhcp_assignment *first = NULL;
const struct dhcpv6_client_header *hdr = data;
- uint8_t *start = (uint8_t*)&hdr[1], *odata;
- 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];
+ 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);
}
/* 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->length <= 64) || (is_na && c->length == 128))) {
a = c;
/* Reset state */
if (a->flags & OAF_BOUND)
apply_lease(iface, 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 && (iface->dhcpv6_pd || iface->dhcpv6_na)) {
- /* 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 && 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 (a->managed_size && !assigned)
- return -1;
+ if (!a) {
+ if ((!iface->no_dynamic_dhcp || (l && is_na)) &&
+ (iface->dhcpv6_pd || iface->dhcpv6_na)) {
+ /* Create new binding */
+ a = calloc(1, sizeof(*a) + 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;
+ a->assigned = is_na && l ? l->hostid : reqhint;
+ /* Set valid time to 0 for static lease indicating */
+ /* infinite lifetime otherwise current time */
+ a->valid_until = l ? 0 : now;
+ a->dhcp_free_cb = dhcpv6_ia_free_assignment;
+ a->iface = iface;
+ a->flags = OAF_DHCPV6;
+
+ 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;
+ }
}
}
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))
/* 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);
apply_lease(iface, 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 ||
break;
}
- dhcpv6_write_statefile();
+ dhcpv6_ia_write_statefile();
out:
return response_len;