(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 free_dhcpv6_assignment(struct dhcp_assignment *c);
+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, };
int dhcpv6_setup_ia_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);
+ c = list_first_entry(&iface->ia_assignments, struct dhcp_assignment, head);
free_dhcpv6_assignment(c);
}
}
if (enable && iface->dhcpv6 == MODE_SERVER) {
+ struct dhcp_assignment *border;
+ struct lease *lease;
+
if (!iface->ia_assignments.next)
INIT_LIST_HEAD(&iface->ia_assignments);
if (list_empty(&iface->ia_assignments)) {
- struct dhcpv6_assignment *border = calloc(1, sizeof(*border));
+ 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 dhcp_assignment, head);
+
+ set_border_assignment_size(iface, border);
/* 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);
+ struct dhcp_assignment *a = calloc(1, sizeof(*a) + duid_len);
if (!a) {
- syslog(LOG_ERR, "Calloc failed for static lease assignment on interface %s",
- iface->ifname);
+ syslog(LOG_ERR, "Calloc failed for static lease assignment on %s",
+ iface->name);
return -1;
}
a->valid_until = 0;
/* Assign to all interfaces */
- struct dhcpv6_assignment *c;
+ struct dhcp_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);
}
-static void free_dhcpv6_assignment(struct dhcpv6_assignment *c)
+static void free_dhcpv6_assignment(struct dhcp_assignment *c)
{
if (c->managed_sock.fd.registered) {
ustream_free(&c->managed_sock.stream);
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,
+void dhcpv6_enum_ia_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;
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;
inet_ntop(AF_INET6, addr, ipbuf, sizeof(ipbuf) - 1);
- if (ctxt->c->length == 128 && ctxt->c->hostname) {
+ if (ctxt->c->length == 128 && ctxt->c->hostname &&
+ !(ctxt->c->flags & OAF_BROKEN_HOSTNAME)) {
fputs(ipbuf, ctxt->fp);
char b[256];
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;
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 ",
+ ctxt.buf_idx = snprintf(ctxt.buf, ctxt.buf_len, "# %s %s %x %s%s %ld %x %u ",
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) :
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;
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 %ld %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) :
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];
}
}
-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;
__apply_lease(iface, 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) {
+ 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)
+ b->assigned = 1U << (64 - minprefix);
+ else
+ b->assigned = 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;
/* 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->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 *assign)
{
/* Seed RNG with checksum of DUID */
uint32_t seed = 0;
uint32_t try;
do try = ((uint32_t)rand()) % 0x0fff; while (try < 0x100);
- struct dhcpv6_assignment *c;
+ struct dhcp_assignment *c;
list_for_each_entry(c, &iface->ia_assignments, head) {
if (c->length == 0)
continue;
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)
+ list_for_each_entry(c, &iface->ia_assignments, head) {
if (c != border && iface->ra_managed == RA_MANAGED_NO_MFLAG
&& (c->flags & OAF_BOUND))
__apply_lease(iface, 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)
apply_lease(iface, 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);
+ c = list_first_entry(&reassign, struct dhcp_assignment, head);
list_del(&c->head);
if (!assign_pd(iface, c)) {
c->assigned = 0;
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) ||
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)};
-
- 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;
+ uint16_t val;
+ } o_status = {
+ .type = htons(DHCPV6_OPT_STATUS),
+ .len = htons(sizeof(o_status) - 4),
+ .val = htons(status),
+ };
- uint32_t pref = leasetime;
- uint32_t valid = leasetime;
+ memcpy(buf + ia_len, &o_status, sizeof(o_status));
+ ia_len += sizeof(o_status);
- 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);
+ o_ia.len = htons(ia_len - 4);
+ memcpy(buf, &o_ia, sizeof(o_ia));
- for (size_t i = 0; i < addrlen; ++i) {
- uint32_t prefix_pref = addrs[i].preferred;
- uint32_t prefix_valid = addrs[i].valid;
+ return ia_len;
+ }
- if (!valid_addr(&addrs[i], now))
- continue;
+ if (a) {
+ uint32_t leasetime;
- if (prefix_pref != UINT32_MAX)
- prefix_pref -= now;
+ if (a->leasetime)
+ leasetime = a->leasetime;
+ else
+ leasetime = iface->dhcpv4_leasetime;
- if (prefix_valid != UINT32_MAX)
- prefix_valid -= now;
+ uint32_t pref = leasetime;
+ uint32_t valid = leasetime;
- 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;
+ 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);
- size_t entrlen = sizeof(p) - 4;
+ for (size_t i = 0; i < addrlen; ++i) {
+ uint32_t prefix_pref = addrs[i].preferred;
+ uint32_t prefix_valid = addrs[i].valid;
- if (datalen + entrlen + 4 > buflen ||
- (a->assigned == 0 && a->managed_size == 0) ||
- !valid_prefix_length(a, addrs[i].prefix))
- continue;
+ if (!valid_addr(&addrs[i], now))
+ 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;
+ if (prefix_pref != UINT32_MAX)
+ prefix_pref -= now;
- if (!ADDR_ENTRY_VALID_IA_ADDR(iface, i, m, addrs) ||
- a->assigned == 0 ||
- datalen + entrlen + 4 > buflen)
- continue;
+ if (prefix_valid != UINT32_MAX)
+ prefix_valid -= now;
- memcpy(buf + datalen, &n, sizeof(n));
- datalen += entrlen + 4;
- }
+ if (a->length < 128) {
+ struct dhcpv6_ia_prefix o_ia_p = {
+ .type = htons(DHCPV6_OPT_IA_PREFIX),
+ .len = htons(sizeof(o_ia_p) - 4),
+ .preferred = htonl(prefix_pref),
+ .valid = htonl(prefix_valid),
+ .prefix = (a->managed_size) ? addrs[i].prefix : a->length,
+ .addr = addrs[i].addr.in6,
+ };
- /* Calculate T1 / T2 based on non-deprecated addresses */
- if (prefix_pref > 0) {
- if (prefix_pref < pref)
- pref = prefix_pref;
+ o_ia_p.addr.s6_addr32[1] |= htonl(a->assigned);
+ o_ia_p.addr.s6_addr32[2] = o_ia_p.addr.s6_addr32[3] = 0;
- if (prefix_valid < valid)
- valid = prefix_valid;
- }
- }
+ if ((a->assigned == 0 && a->managed_size == 0) ||
+ !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);
+ } else {
+ 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 = htonl(prefix_pref),
+ .valid = htonl(prefix_valid)
+ };
+
+ o_ia_a.addr.s6_addr32[3] = htonl(a->assigned);
+
+ if (!ADDR_ENTRY_VALID_IA_ADDR(iface, i, m, addrs) ||
+ a->assigned == 0)
+ continue;
- if (!INFINITE_VALID(a->valid_until))
- /* UINT32_MAX is considered as infinite leasetime */
- a->valid_until = (valid == UINT32_MAX) ? 0 : valid + now;
+ if (buflen < ia_len + sizeof(o_ia_a))
+ return 0;
- out.t1 = htonl((pref == UINT32_MAX) ? pref : pref * 5 / 10);
- out.t2 = htonl((pref == UINT32_MAX) ? pref : pref * 8 / 10);
+ memcpy(buf + ia_len, &o_ia_a, sizeof(o_ia_a));
+ ia_len += sizeof(o_ia_a);
+ }
- if (!out.t1)
- out.t1 = htonl(1);
+ /* Calculate T1 / T2 based on non-deprecated addresses */
+ if (prefix_pref > 0) {
+ if (prefix_pref < pref)
+ pref = prefix_pref;
- if (!out.t2)
- out.t2 = htonl(1);
+ if (prefix_valid < valid)
+ valid = prefix_valid;
+ }
}
- if (!request) {
- uint8_t *odata, *end = ((uint8_t*)ia) + htons(ia->len) + 4;
- uint16_t otype, olen;
+ if (!INFINITE_VALID(a->valid_until))
+ /* UINT32_MAX is considered as infinite leasetime */
+ a->valid_until = (valid == UINT32_MAX) ? 0 : valid + now;
- 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];
- bool found = false;
+ o_ia.t1 = htonl((pref == UINT32_MAX) ? pref : pref * 5 / 10);
+ o_ia.t2 = htonl((pref == UINT32_MAX) ? pref : pref * 8 / 10);
- if ((otype != DHCPV6_OPT_IA_PREFIX || olen < sizeof(*p) - 4) &&
- (otype != DHCPV6_OPT_IA_ADDR || olen < sizeof(*n) - 4))
- continue;
+ if (!o_ia.t1)
+ o_ia.t1 = htonl(1);
- 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 (!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 (!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 ((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) {
+ 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(&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[3] = htonl(a->assigned);
+
+ 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 = 0,
+ .valid = 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 = 0,
+ .valid = 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 {
}
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";
}
syslog(LOG_WARNING, "DHCPV6 %s %s from %s on %s: %s %s", type, (is_pd) ? "IA_PD" : "IA_NA",
- duidbuf, iface->ifname, status, leasebuf);
+ 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->managed) ? a->managed : iface->addr6;
- size_t addrlen = (a->managed) ? (size_t)a->managed_size : iface->addr6_len;
+ 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();
uint8_t *odata, *end = ((uint8_t*)ia) + htons(ia->len) + 4;
uint16_t otype, olen;
- bool onlink = false;
+ 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];
+ 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) {
- struct in6_addr addr = addrs[i].addr.in6;
-
if (!valid_addr(&addrs[i], now))
continue;
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))
+ if (p->prefix < addrs[i].prefix ||
+ odhcpd_bmemcmp(&p->addr, &addrs[i].addr.in6, addrs[i].prefix))
continue;
- } else {
- addr.s6_addr32[3] = htonl(a->assigned);
- if (memcmp(&n->addr, &addr, sizeof(addr)))
- continue;
- }
+ } else if (odhcpd_bmemcmp(&n->addr, &addrs[i].addr.in6, addrs[i].prefix))
+ continue;
+
onlink = true;
}
if (!clid_data || !clid_len || clid_len > 130)
goto out;
- struct dhcpv6_assignment *first = NULL;
+ struct dhcp_assignment *first = NULL;
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]
(hdr->msg_type == DHCPV6_MSG_REBIND && !a)) {
bool assigned = !!a;
- if (!a && !iface->no_dynamic_dhcp) {
+ if (!a && !iface->no_dynamic_dhcp && (iface->dhcpv6_pd || iface->dhcpv6_na)) {
/* Create new binding */
a = calloc(1, sizeof(*a) + clid_len);
if (a) {
odhcpd_urandom(a->key, sizeof(a->key));
memcpy(a->clid_data, clid_data, clid_len);
- if (is_pd)
+ if (is_pd && iface->dhcpv6_pd)
while (!(assigned = assign_pd(iface, a)) &&
!a->managed_size && ++a->length <= 64);
- else
+ else if (is_na && iface->dhcpv6_na)
assigned = assign_na(iface, a);
if (a->managed_size && !assigned)
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 (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;
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);
a->valid_until = now + 3600; /* Block address for 1h */
}
}
- } 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;
+ } 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;
+ }
}
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();
projects / project / odhcpd.git / blobdiff