Skip to content

subsys: net: lib: dns: resolve Fix/dns resolve cleanup inactive state #99095

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

Closed
wants to merge 1 commit into from
Closed

subsys: net: lib: dns: resolve Fix/dns resolve cleanup inactive state #99095

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
24 changes: 23 additions & 1 deletion subsys/net/lib/dns/resolve.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2269,7 +2269,29 @@ static int dns_resolve_close_locked(struct dns_resolve_context *ctx)
int i, ret;

if (ctx->state != DNS_RESOLVE_CONTEXT_ACTIVE) {
return -ENOENT;
/* Even if context is not ACTIVE, we should still close any open sockets
* to ensure proper cleanup. This handles cases where context is INACTIVE
* but server slots still have valid data from previous initialization.
*/
LOG_INF("DNS context not ACTIVE (state=%d), but will close any open servers",
ctx->state);

/* Close any servers that have open sockets */
for (i = 0; i < SERVER_COUNT; i++) {
if (ctx->servers[i].sock >= 0 ||
ctx->servers[i].dns_server.sa_family != 0) {
LOG_INF("Closing server[%d] sock=%d sa_family=%d", i,
ctx->servers[i].sock, ctx->servers[i].dns_server.sa_family);
ret = dns_server_close(ctx, i);
if (ret < 0 && ret != -ENOENT) {
NET_DBG("Cannot close DNS server %d (%d)", i, ret);
}
}
}

/* Ensure state is INACTIVE */
ctx->state = DNS_RESOLVE_CONTEXT_INACTIVE;
return 0;
}

ctx->state = DNS_RESOLVE_CONTEXT_DEACTIVATING;
Expand Down
Loading