From: Willy Tarreau <w@1wt.eu>
Date: Fri, 25 Mar 2016 17:17:47 +0000 (+0100)
Subject: BUG/MEDIUM: peers: fix incorrect age in frequency counters
X-Git-Tag: v1.7-dev3~92
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3bb46177aca45f1b14f11c49683ab297d7f6f660;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: peers: fix incorrect age in frequency counters

The frequency counters's window start is sent as "now - freq.date",
which is a positive age compared to the current date. But on receipt,
this age was added to the current date instead of subtracted. So
since the date was always in the future, they were always expired if
the activity changed side in less than the counter's measuring period
(eg: 10s).

This bug was reported by Christian Ruppert who also provided an easy
reproducer.

It needs to be backported to 1.6.
---

diff --git a/src/peers.c b/src/peers.c
index 295a0a5a42..d3fef4ae3f 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -1152,7 +1152,7 @@ switchstate:
 									case STD_T_FRQP: {
 										struct freq_ctr_period data;
 
-										data.curr_tick = tick_add(now_ms, intdecode(&msg_cur, msg_end));
+										data.curr_tick = tick_add(now_ms, -intdecode(&msg_cur, msg_end));
 										if (!msg_cur) {
 											/* malformed message */
 											appctx->st0 = PEER_SESS_ST_ERRPROTO;