projects
/
haproxy-3.0.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
896ca2e
)
BUG/MINOR: peers: fix expire learned from a peer not converted from ms to ticks
author
Emeric Brun
<ebrun@haproxy.com>
Thu, 3 Apr 2025 08:29:16 +0000
(10:29 +0200)
committer
Aurelien DARRAGON
<adarragon@haproxy.com>
Thu, 3 Apr 2025 17:22:37 +0000
(19:22 +0200)
This is has now impact currently since MS_TO_TICKS macro does nothing
but it will prevent further bugs.
(cherry picked from commit
00461fbfbfd19e93af621658abcf7d1205f44182
)
Signed-off-by: Aurelien DARRAGON <adarragon@haproxy.com>
(cherry picked from commit
d128753b6160f15f3b361e68fcbd3072c8ea681a
)
Signed-off-by: Aurelien DARRAGON <adarragon@haproxy.com>
src/peers.c
patch
|
blob
|
history
diff --git
a/src/peers.c
b/src/peers.c
index
c106990
..
0a885ca
100644
(file)
--- a/
src/peers.c
+++ b/
src/peers.c
@@
-1740,6
+1740,8
@@
static int peer_treat_updatemsg(struct appctx *appctx, struct peer *p, int updt,
memcpy(&expire, *msg_cur, expire_sz);
*msg_cur += expire_sz;
expire = ntohl(expire);
+ /* the rest of the code considers expire as ticks and not MS */
+ expire = MS_TO_TICKS(expire);
}
newts = stksess_new(table, NULL);