Skip to content

Always try to resolve hostnames at least once #957

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
merged 2 commits into from
Dec 2, 2020
Merged

Always try to resolve hostnames at least once #957

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e8b6c4
Always try to resolve hostnames when seeing a client/upstream serer f…
DL6ER Dec 2, 2020
949a5d9
Add more debugging output and ensure refreshing rules are really only…
DL6ER Dec 2, 2020
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
19 changes: 15 additions & 4 deletions src/resolve.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,9 +384,9 @@ static void resolveClients(const bool onlynew)
size_t ippos = client->ippos;
size_t oldnamepos = client->namepos;

// Only try to resolve host names of clients which were recently active
// Only try to resolve host names of clients which were recently active if we are re-resolving
// Limit for a "recently active" client is two hours ago
if(client->lastQuery < now - 2*60*60)
if(onlynew == false && client->lastQuery < now - 2*60*60)
{
if(config.debug & DEBUG_RESOLVER)
{
Expand All @@ -403,6 +403,11 @@ static void resolveClients(const bool onlynew)
// If not, we will try to re-resolve all known clients
if(onlynew && !newflag)
{
if(config.debug & DEBUG_RESOLVER)
{
logg("Skipping client %s (%s) because it is not new",
getstr(ippos), getstr(oldnamepos));
}
skipped++;
continue;
}
Expand All @@ -415,9 +420,15 @@ static void resolveClients(const bool onlynew)

// If we're in refreshing mode (onlynew == false), we skip clients if
// either IPv4-only or none is selected
if(config.refresh_hostnames == REFRESH_NONE ||
(config.refresh_hostnames == REFRESH_IPV4_ONLY && IPv6))
if(onlynew == false &&
(config.refresh_hostnames == REFRESH_NONE ||
(config.refresh_hostnames == REFRESH_IPV4_ONLY && IPv6)))
{
if(config.debug & DEBUG_RESOLVER)
{
logg("Skipping client %s (%s) because it should not be refreshed",
getstr(ippos), getstr(oldnamepos));
}
skipped++;
continue;
}
Expand Down