Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-16 13:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Handle cancelled/destruction statuses in callback methods

Browse source
This commit is contained in:
Tim Wojtulewicz 2022-02-04 16:34:44 -07:00
parent a201ccaefa
commit c7284686a4
1 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/DNS_Mgr.cc
View file

@ -223,8 +223,18 @@ static void addrinfo_cb(void* arg, int status, int timeouts, struct ares_addrinf
if ( status != ARES_SUCCESS )
{
reporter->Error("Failed lookup of hostname: %s", ares_strerror(status));
mgr->AddResult(req, nullptr, 0);
// These two statuses should only ever be sent if we're shutting down everything
// and all of the existing queries are being cancelled. There's no reason to
// store a status that's just going to get deleted, nor is there a reason to log
// anything.
if ( status != ARES_ECANCELLED && status != ARES_EDESTRUCTION )
{
// Insert something into the cache so that the request loop will end correctly.
// We use the DNS_TIMEOUT value as the TTL here since it's small enough that the
// failed response will expire soon, and because we don't have the TTL from the
// response data.
mgr->AddResult(req, nullptr, DNS_TIMEOUT);
}
}
else
{
@ -292,13 +302,18 @@ static void query_cb(void* arg, int status, int timeouts, unsigned char* buf, in
if ( status != ARES_SUCCESS )
{
reporter->Error("Failure from DNS lookup: %s", ares_strerror(status));
// Insert something into the cache so that the request loop will end correctly.
// We use the DNS_TIMEOUT value as the TTL here since it's small enough that the
// failed response will expire soon, and because we don't have the TTL from the
// response data.
mgr->AddResult(req, nullptr, DNS_TIMEOUT);
// These two statuses should only ever be sent if we're shutting down everything
// and all of the existing queries are being cancelled. There's no reason to
// store a status that's just going to get deleted, nor is there a reason to log
// anything.
if ( status != ARES_ECANCELLED && status != ARES_EDESTRUCTION )
{
// Insert something into the cache so that the request loop will end correctly.
// We use the DNS_TIMEOUT value as the TTL here since it's small enough that the
// failed response will expire soon, and because we don't have the TTL from the
// response data.
mgr->AddResult(req, nullptr, DNS_TIMEOUT);
}
}
else
{