Merge pull request #714 from hunts/rtt-of-expired-host

Avoid treat normal hosts as unresponsive servers
This commit is contained in:
Wouter Wijngaards 2022-07-15 08:49:51 +02:00 committed by GitHub
commit 6e50c46102
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -721,21 +721,20 @@ infra_get_lame_rtt(struct infra_cache* infra,
else *rtt = USEFUL_SERVER_TOP_TIMEOUT-1000;
}
}
/* expired entry */
if(timenow > host->ttl) {
/* expired entry */
lock_rw_unlock(&e->lock);
/* see if this can be a re-probe of an unresponsive server */
/* minus 1000 because that is outside of the RTTBAND, so
* blacklisted servers stay blacklisted if this is chosen */
if(host->rtt.rto >= USEFUL_SERVER_TOP_TIMEOUT ||
infra->infra_keep_probing) {
lock_rw_unlock(&e->lock);
if(host->rtt.rto >= USEFUL_SERVER_TOP_TIMEOUT) {
*rtt = USEFUL_SERVER_TOP_TIMEOUT-1000;
*lame = 0;
*dnsseclame = 0;
*reclame = 0;
return 1;
}
lock_rw_unlock(&e->lock);
return 0;
}
/* check lameness first */