From: Christopher Faulet <cfaulet@haproxy.com>
Date: Thu, 11 Mar 2021 17:06:23 +0000 (+0100)
Subject: MINOR: resolvers: Directly call srvrq_update_srv_state() when possible
X-Git-Tag: v2.4-dev12~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b117aed492d9916a5c656b4fbfcac6159133c0f;p=thirdparty%2Fhaproxy.git

MINOR: resolvers: Directly call srvrq_update_srv_state() when possible

When the server status must be updated from the result of a SRV resolution,
we can directly call srvrq_update_srv_state(). It is simpler and this avoid
a test on the server DNS resolution.

This patch is mandatory for the next commit. It also rely on "MINOR:
resolvers: Directly call srvrq_update_srv_state() when possible".
---

diff --git a/src/resolvers.c b/src/resolvers.c
index 94cc101dfa..4844d7f3f2 100644
--- a/src/resolvers.c
+++ b/src/resolvers.c
@@ -606,7 +606,7 @@ static void resolv_check_response(struct resolv_resolution *res)
 					    item->data_len == srv->hostname_dn_len &&
 					    !resolv_hostname_cmp(srv->hostname_dn, item->target, item->data_len)) {
 						resolv_unlink_resolution(srv->resolv_requester);
-						snr_update_srv_status(srv, 1);
+						srvrq_update_srv_status(srv, 1);
 						ha_free(&srv->hostname);
 						ha_free(&srv->hostname_dn);
 						srv->hostname_dn_len = 0;
@@ -710,7 +710,7 @@ static void resolv_check_response(struct resolv_resolution *res)
 				}
 
 				/* Update the server status */
-				snr_update_srv_status(srv, (srv->addr.ss_family != AF_INET && srv->addr.ss_family != AF_INET6));
+				srvrq_update_srv_status(srv, (srv->addr.ss_family != AF_INET && srv->addr.ss_family != AF_INET6));
 
 				srv->svc_port = item->port;
 				srv->flags   &= ~SRV_F_MAPPORTS;
diff --git a/src/server.c b/src/server.c
index b8e935450a..b631a22820 100644
--- a/src/server.c
+++ b/src/server.c
@@ -3295,7 +3295,7 @@ int srvrq_resolution_error_cb(struct resolv_requester *requester, int error_code
 		HA_SPIN_LOCK(SERVER_LOCK, &s->lock);
 		if (s->srvrq == srvrq) {
 			resolv_unlink_resolution(s->resolv_requester);
-			snr_update_srv_status(s, 1);
+			srvrq_update_srv_status(s, 1);
 			free(s->hostname);
 			free(s->hostname_dn);
 			s->hostname        = NULL;