Skip to content

ipv6nd: empty IPV6RA_EXPIRE eloop queue when dropping #586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rsmarples merged 1 commit into from
Feb 26, 2026
+6 −3
Merged

ipv6nd: empty IPV6RA_EXPIRE eloop queue when dropping #586

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/ipv6nd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,11 +681,14 @@ ipv6nd_iffindprefix(struct interface *ifp,
static void
ipv6nd_removefreedrop_ra(struct ra *rap, int remove_ra, int drop_ra)
{
struct dhcpcd_ctx *ctx = rap->iface->ctx;

eloop_timeout_delete(rap->iface->ctx->eloop, NULL, rap->iface);
eloop_timeout_delete(rap->iface->ctx->eloop, NULL, rap);
eloop_q_timeout_delete(ctx->eloop, ELOOP_IPV6RA_EXPIRE, NULL,
rap->iface);
eloop_timeout_delete(ctx->eloop, NULL, rap->iface);
eloop_timeout_delete(ctx->eloop, NULL, rap);
if (remove_ra)
TAILQ_REMOVE(rap->iface->ctx->ra_routers, rap, next);
TAILQ_REMOVE(ctx->ra_routers, rap, next);
ipv6_freedrop_addrs(&rap->addrs, drop_ra, 0, NULL);
routeinfohead_free(&rap->rinfos);
free(rap->data);
Expand Down
Loading