BUG/MINOR: resolvers: Set port before IP address when processing SRV records
For a server subject to SRV resolution, when the server's address is set,
its dynamic cookie, if any, and its server key are computed. Both are based
on the ip/port pair. However, this happens before the server's port is
set. Thus the port is equal to 0 at this stage. It is a problem if several
servers share the same IP but with different ports because they will share
the same dynamic cookie and the same server key, disturbing this way the
connection persistency and the session stickiness.
This patch must be backported as far as 2.2.
(cherry picked from commit 2364b39984e4fd4aa6a88148520d49fe0620c034)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 24e3037b525eb8630e41edc7d69774ef5014464e)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit df7116e62cb175a32b1aa6dc423e499b842db8db)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
diff --git a/src/resolvers.c b/src/resolvers.c
index 1c7c9d8..112ac5a 100644
--- a/src/resolvers.c
+++ b/src/resolvers.c
@@ -810,6 +810,9 @@
srv->flags &= ~SRV_F_NO_RESOLUTION;
srv->srvrq_check->expire = TICK_ETERNITY;
+ srv->svc_port = item->port;
+ srv->flags &= ~SRV_F_MAPPORTS;
+
/* Check if an Additional Record is associated to this SRV record.
* Perform some sanity checks too to ensure the record can be used.
* If all fine, we simply pick up the IP address found and associate
@@ -864,9 +867,6 @@
/* Update the server status */
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;
-
if (!srv->resolv_opts.ignore_weight) {
char weight[9];
int ha_weight;