mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-28 14:21:00 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR; resolvers: Ignore DNS resolution for expired SRV item

Browse Source 
If no ADD item is found for a SRV item in a SRV response, a DNS resolution
is triggered. When it succeeds, we must be sure the SRV item is still
alive. Otherwise the DNS resolution must be ignored.

This patch depends on the commit "MINOR: resolvers: Move last_seen time of
an ADD into its corresponding SRV item". Both must be backported as far as
2.2.
This commit is contained in:
Christopher Faulet 2021-03-10 15:07:27 +01:00
parent 6a8d11dc80
commit 49531e8471
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/server.c
View File

@ -3126,7 +3126,25 @@ int snr_resolution_cb(struct resolv_requester *requester, struct dns_counters *c
if (!s)
return 1;
if (s->srvrq) {
struct resolv_answer_item *srv_item;
/* If DNS resolution is disabled ignore it. */
if (s->flags & SRV_F_NO_RESOLUTION)
return 1;
/* The server is based on a SRV record, thus, find the
* associated answer record. If not found, it means the SRV item
* has expired and this resolution must be ignored.
*/
srv_item = find_srvrq_answer_record(requester);
if (!srv_item)
return 1;
}
resolution = s->resolv_requester->resolution;
if (!resolution)
return 1;
/* initializing variables */
firstip = NULL; /* pointer to the first valid response found */
@ -3191,6 +3209,7 @@ int snr_resolution_cb(struct resolv_requester *requester, struct dns_counters *c
srv_update_addr(s, firstip, firstip_sin_family, (char *) chk->area);
update_status:
snr_update_srv_status(s, has_no_ip);
return 1;