From: Christopher Faulet <cfaulet@haproxy.com>
Date: Fri, 25 Jun 2021 09:37:45 +0000 (+0200)
Subject: BUG/MINOR: tcpcheck: Fix numbering of implicit HTTP send/expect rules
X-Git-Tag: v2.5-dev1~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa5880bd539b9069fd1b139d32cffae2bb3c2c3c;p=thirdparty%2Fhaproxy.git

BUG/MINOR: tcpcheck: Fix numbering of implicit HTTP send/expect rules

The index of the failing rule is reported in the health-check log message. The
rules index is also used in the check traces. But for implicit HTTP send/expect
rules, the index is wrong. It must be incremented by one compared to the
preceding rule.

This patch may be backported as far as 2.2.
---

diff --git a/src/tcpcheck.c b/src/tcpcheck.c
index 4e594a9f79..9610760d75 100644
--- a/src/tcpcheck.c
+++ b/src/tcpcheck.c
@@ -3637,7 +3637,7 @@ static int check_proxy_tcpcheck(struct proxy *px)
 			if (next && next->action == TCPCHK_ACT_CONNECT) {
 				LIST_DELETE(&chk->list);
 				LIST_INSERT(&next->list, &chk->list);
-				chk->index = next->index;
+				chk->index = next->index + 1;
 			}
 		}
 
@@ -3658,7 +3658,7 @@ static int check_proxy_tcpcheck(struct proxy *px)
 				goto out;
 			}
 			LIST_APPEND(px->tcpcheck_rules.list, &next->list);
-			next->index = chk->index;
+			next->index = chk->index + 1;
 		}
 	}