((iface)->dhcpv6_assignall || (i) == (m) || \
(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 reconf_timer(struct uloop_timeout *event);
-static struct uloop_timeout reconf_event = {.cb = reconf_timer};
+static void set_border_assignment_size(struct interface *iface, struct dhcpv6_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 valid_until_cb(struct uloop_timeout *event);
+
+static struct netevent_handler dhcpv6_netevent_handler = { .cb = dhcpv6_netevent_cb, };
+static struct uloop_timeout valid_until_timeout = {.cb = valid_until_cb};
static uint32_t serial = 0;
static uint8_t statemd5[16];
int dhcpv6_ia_init(void)
{
- uloop_timeout_set(&reconf_event, 2000);
+ uloop_timeout_set(&valid_until_timeout, 1000);
+
+ netlink_add_netevent_handler(&dhcpv6_netevent_handler);
+
return 0;
}
-int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
+int dhcpv6_setup_ia_interface(struct interface *iface, bool enable)
{
if (!enable && iface->ia_assignments.next) {
struct dhcpv6_assignment *c;
}
}
- if (enable && iface->dhcpv6 == RELAYD_SERVER) {
+ if (enable && iface->dhcpv6 == MODE_SERVER) {
+ struct dhcpv6_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);
return -1;
border->length = 64;
list_add(&border->head, &iface->ia_assignments);
- }
+ } else
+ border = list_last_entry(&iface->ia_assignments, struct dhcpv6_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;
}
if (a->head.next) {
+ a->iface = iface;
if (lease->hostname[0]) {
free(a->hostname);
a->hostname = strdup(lease->hostname);
return 0;
}
+
+static void dhcpv6_netevent_cb(unsigned long event, struct netevent_handler_info *info)
+{
+ struct interface *iface = info->iface;
+
+ if (!iface || iface->dhcpv6 != MODE_SERVER)
+ return;
+
+ switch (event) {
+ case NETEV_ADDR6LIST_CHANGE:
+ handle_addrlist_change(info);
+ break;
+ default:
+ break;
+ }
+}
+
+
static void free_dhcpv6_assignment(struct dhcpv6_assignment *c)
{
if (c->managed_sock.fd.registered) {
if (c->head.next)
list_del(&c->head);
+ if (c->reconf_cnt)
+ stop_reconf(c);
+
free(c->managed);
free(c->hostname);
free(c);
return m;
}
-static int send_reconf(struct interface *iface, struct dhcpv6_assignment *assign)
+static int send_reconf(struct dhcpv6_assignment *assign)
{
struct {
struct dhcpv6_client_header hdr;
.clid_len = htons(assign->clid_len),
.clid_data = {0},
};
+ struct interface *iface = assign->iface;
odhcpd_get_mac(iface, reconf_msg.mac);
memcpy(reconf_msg.clid_data, assign->clid_data, assign->clid_len);
void dhcpv6_enum_ia_addrs(struct interface *iface, struct dhcpv6_assignment *c,
time_t now, dhcpv6_binding_cb_handler_t func, void *arg)
{
- struct odhcpd_ipaddr *addrs = (c->managed) ? c->managed : iface->ia_addr;
- size_t addrlen = (c->managed) ? (size_t)c->managed_size : iface->ia_addr_len;
+ struct odhcpd_ipaddr *addrs = (c->managed) ? c->managed : iface->addr6;
+ size_t addrlen = (c->managed) ? (size_t)c->managed_size : iface->addr6_len;
size_t m = get_preferred_addr(addrs, addrlen);
for (size_t i = 0; i < addrlen; ++i) {
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_len = sizeof(leasebuf);
list_for_each_entry(ctxt.iface, &interfaces, head) {
- if (ctxt.iface->dhcpv6 != RELAYD_SERVER &&
- ctxt.iface->dhcpv4 != RELAYD_SERVER)
+ if (ctxt.iface->dhcpv6 != MODE_SERVER &&
+ ctxt.iface->dhcpv4 != MODE_SERVER)
continue;
- if (ctxt.iface->dhcpv6 == RELAYD_SERVER &&
+ if (ctxt.iface->dhcpv6 == MODE_SERVER &&
ctxt.iface->ia_assignments.next) {
list_for_each_entry(ctxt.c, &ctxt.iface->ia_assignments, head) {
if (!(ctxt.c->flags & OAF_BOUND) || ctxt.c->managed_size < 0)
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 == RELAYD_SERVER &&
+ if (ctxt.iface->dhcpv4 == MODE_SERVER &&
ctxt.iface->dhcpv4_assignments.next) {
struct dhcpv4_assignment *c;
list_for_each_entry(c, &ctxt.iface->dhcpv4_assignments, head) {
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) :
(INFINITE_VALID(c->valid_until) ? -1 : 0)),
- c->addr);
+ ntohl(c->addr));
- struct in_addr addr = {htonl(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];
}
}
-
-static void apply_lease(struct interface *iface, struct dhcpv6_assignment *a, bool add)
+static void __apply_lease(struct interface *iface, struct dhcpv6_assignment *a,
+ struct odhcpd_ipaddr *addrs, ssize_t addr_len, bool add)
{
- if (a->length > 64 || a->managed_size < 0)
+ if (a->length > 64)
return;
- struct odhcpd_ipaddr *addrs = (a->managed) ? a->managed : iface->ia_addr;
- size_t addrlen = (a->managed) ? (size_t)a->managed_size : iface->ia_addr_len;
-
- for (size_t i = 0; i < addrlen; ++i) {
+ for (ssize_t i = 0; i < addr_len; ++i) {
struct in6_addr prefix = addrs[i].addr.in6;
prefix.s6_addr32[1] |= htonl(a->assigned);
prefix.s6_addr32[2] = prefix.s6_addr32[3] = 0;
- odhcpd_setup_route(&prefix, (a->managed_size) ? addrs[i].prefix : a->length,
- iface, &a->peer.sin6_addr, 1024, add);
+ netlink_setup_route(&prefix, (a->managed_size) ? addrs[i].prefix : a->length,
+ iface->ifindex, &a->peer.sin6_addr, 1024, add);
+ }
+}
+
+static void apply_lease(struct interface *iface, struct dhcpv6_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 dhcpv6_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 dhcpv6_assignment *c = container_of(fd, struct dhcpv6_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 dhcpv6_assignment *c = container_of(fd, struct dhcpv6_assignment, managed_sock);
if (!(c->flags & OAF_STATIC))
c->valid_until = odhcpd_time() + 15;
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;
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)
}
return false;
- } else if (iface->ia_addr_len < 1)
+ } else if (iface->addr6_len < 1)
return false;
/* Try honoring the hint first */
return false;
}
-void dhcpv6_ia_preupdate(struct interface *iface)
+static void handle_addrlist_change(struct netevent_handler_info *info)
{
- if (iface->dhcpv6 != RELAYD_SERVER)
- return;
-
- struct dhcpv6_assignment *c, *border = list_last_entry(
+ struct interface *iface = info->iface;
+ struct dhcpv6_assignment *c, *d, *border = list_last_entry(
&iface->ia_assignments, struct dhcpv6_assignment, head);
+ struct list_head reassign = LIST_HEAD_INIT(reassign);
+ time_t now = odhcpd_time();
- 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, false);
-}
-
-void dhcpv6_ia_postupdate(struct interface *iface)
-{
- if (iface->dhcpv6 != RELAYD_SERVER)
- return;
-
- time_t now = odhcpd_time();
- int minprefix = -1;
- for (size_t i = 0; i < iface->ia_addr_len; ++i) {
- if (iface->ia_addr[i].preferred > (uint32_t)now &&
- iface->ia_addr[i].prefix < 64 &&
- iface->ia_addr[i].prefix > minprefix)
- minprefix = iface->ia_addr[i].prefix;
+ __apply_lease(iface, c, info->addrs_old.addrs,
+ info->addrs_old.len, false);
}
- struct dhcpv6_assignment *border = list_last_entry(
- &iface->ia_assignments, struct dhcpv6_assignment, head);
+ set_border_assignment_size(iface, border);
- if (minprefix > 32 && minprefix <= 64)
- border->assigned = 1U << (64 - minprefix);
- else
- border->assigned = 0;
-
- struct list_head reassign = LIST_HEAD_INIT(reassign);
- struct dhcpv6_assignment *c, *d;
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) {
- c->reconf_cnt = 1;
- c->reconf_sent = now;
- send_reconf(iface, c);
+ struct dhcpv6_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))
- c->reconf_cnt = INT_MAX;
+ a->reconf_cnt = INT_MAX;
}
}
dhcpv6_write_statefile();
}
-static void reconf_timer(struct uloop_timeout *event)
+static void reconf_timeout_cb(struct uloop_timeout *event)
+{
+ struct dhcpv6_assignment *a = container_of(event, struct dhcpv6_assignment, reconf_timer);
+
+ if (a->reconf_cnt > 0 && a->reconf_cnt < DHCPV6_REC_MAX_RC) {
+ send_reconf(a);
+ uloop_timeout_set(&a->reconf_timer,
+ DHCPV6_REC_TIMEOUT << a->reconf_cnt);
+ a->reconf_cnt++;
+ } else
+ stop_reconf(a);
+}
+
+static void start_reconf(struct dhcpv6_assignment *a)
+{
+ uloop_timeout_set(&a->reconf_timer,
+ DHCPV6_REC_TIMEOUT << a->reconf_cnt);
+ a->reconf_timer.cb = reconf_timeout_cb;
+ a->reconf_cnt++;
+
+ send_reconf(a);
+}
+
+static void stop_reconf(struct dhcpv6_assignment *a)
+{
+ uloop_timeout_cancel(&a->reconf_timer);
+ a->reconf_cnt = 0;
+ a->reconf_timer.cb = NULL;
+}
+
+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 != RELAYD_SERVER || iface->ia_assignments.next == NULL)
+ if (iface->dhcpv6 != MODE_SERVER || iface->ia_assignments.next == NULL)
continue;
struct dhcpv6_assignment *a, *n;
(a->length == 128 && a->clid_len == 0))
free_dhcpv6_assignment(a);
- } else if (a->reconf_cnt > 0 && a->reconf_cnt < 8 &&
- now > a->reconf_sent + (1 << a->reconf_cnt)) {
- ++a->reconf_cnt;
- a->reconf_sent = now;
- send_reconf(iface, a);
}
}
}
- uloop_timeout_set(event, 2000);
+ uloop_timeout_set(event, 1000);
}
static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
uint32_t pref = leasetime;
uint32_t valid = leasetime;
- struct odhcpd_ipaddr *addrs = (a->managed) ? a->managed : iface->ia_addr;
- size_t addrlen = (a->managed) ? (size_t)a->managed_size : iface->ia_addr_len;
+ 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);
for (size_t i = 0; i < addrlen; ++i) {
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];
+ bool found = false;
+
if ((otype != DHCPV6_OPT_IA_PREFIX || olen < sizeof(*p) - 4) &&
(otype != DHCPV6_OPT_IA_ADDR || olen < sizeof(*n) - 4))
continue;
- bool found = false;
if (a) {
- struct odhcpd_ipaddr *addrs = (a->managed) ? a->managed : iface->ia_addr;
- size_t addrlen = (a->managed) ? (size_t)a->managed_size : iface->ia_addr_len;
+ 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))
const char *type = "UNKNOWN";
const char *status = "UNKNOWN";
- if (msgtype == DHCPV6_MSG_RENEW)
- return;
-
switch (msgtype) {
case DHCPV6_MSG_SOLICIT:
type = "SOLICIT";
duidbuf, iface->ifname, status, leasebuf);
}
+static bool dhcpv6_ia_on_link(const struct dhcpv6_ia_hdr *ia, struct dhcpv6_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;
+ time_t now = odhcpd_time();
+ uint8_t *odata, *end = ((uint8_t*)ia) + htons(ia->len) + 4;
+ uint16_t otype, olen;
+ bool onlink = false;
+
+ 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;
+
+ 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))
+ continue;
+ } else {
+ addr.s6_addr32[3] = htonl(a->assigned);
+
+ if (memcmp(&n->addr, &addr, sizeof(addr)))
+ continue;
+ }
+ onlink = true;
+ }
+
+ if (!onlink)
+ break;
+ }
+
+ return onlink;
+}
+
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)
{
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->iaid == ia->iaid || INFINITE_VALID(c->valid_until) || now < c->valid_until) &&
+ (!(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))) {
a = c;
a->clid_len = clid_len;
a->iaid = ia->iaid;
a->peer = *addr;
- a->reconf_cnt = 0;
- a->reconf_sent = 0;
+ stop_reconf(a);
break;
}
}
(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) {
/* 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));
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)
}
}
- if (!assigned || iface->ia_addr_len == 0)
+ if (!assigned || iface->addr6_len == 0)
/* Set error status */
status = (is_pd) ? DHCPV6_STATUS_NOPREFIXAVAIL : DHCPV6_STATUS_NOADDRSAVAIL;
- else if (assigned && !first && hdr->msg_type != DHCPV6_MSG_REBIND) {
+ else if (hdr->msg_type == DHCPV6_MSG_REQUEST && !dhcpv6_ia_on_link(ia, a, iface)) {
+ /* Send NOTONLINK staus 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;
buf[1] = DHCPV6_OPT_RECONF_ACCEPT;
/* Was only a solicitation: mark binding for removal */
if (assigned && hdr->msg_type == DHCPV6_MSG_SOLICIT) {
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 (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);
} else if (!assigned && a && a->managed_size == 0) {
projects / oweals / odhcpd.git / blobdiff