sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-05 00:00:45 -04:00
Code Issues Projects Releases Wiki Activity

host-resolver: Don't wait for a reply if there are no threads

Browse Source 
Without threads handling the resolution, there is no point waiting
for a reply.  If no subsequent resolution successfully starts a
thread (there might not even be one), we'd wait indefinitely.

Fixes #3634.
This commit is contained in:
Tobias Brunner 2020-11-20 15:02:30 +01:00
parent 9248f636b0
commit 7d2d94f3e1
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libstrongswan/networking/host_resolver.c
View File

@ -287,7 +287,20 @@ METHOD(host_resolver_t, resolve, host_t*,
this->pool->insert_last(this->pool, thread);
}
}
query->done->wait(query->done, this->mutex);
if (this->threads)
{
query->done->wait(query->done, this->mutex);
}
else
{
DBG1(DBG_LIB, "resolving '%s' failed: no resolver threads", query->name);
/* this should always be the case if we end up here, but make sure */
if (query->refcount == 1)
{
this->queries->remove(this->queries, query);
this->queue->remove_last(this->queue, (void**)&query);
}
}
this->mutex->unlock(this->mutex);
result = query->result ? query->result->clone(query->result) : NULL;