BUG/MINOR: flt-trace: Properly compute length of the first DATA block

This bug is quite old. When the length of the first DATA block is computed,
the offset is used instead of the block length minus the offset. It is only
used with random forwarding and there is a test just after to prevent any
issue, so there is no effect.

It could be backported to all stable versions.

diff --git a/src/flt_trace.c b/src/flt_trace.c
index 3703dede5cccb9fee69deacf96fbbddbde0f43ff..4605013bbd5900ab22658791df047be40ee9e761 100644 (file)
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -162,7 +162,7 @@ trace_get_htx_datalen(struct htx *htx, unsigned int offset, unsigned int len)
 
        blk = htxret.blk;
        if (blk && htxret.ret && htx_get_blk_type(blk) == HTX_BLK_DATA) {
-               data += htxret.ret;
+               data += htx_get_blksz(blk) - htxret.ret;
                blk = htx_get_next_blk(htx, blk);
        }
        while (blk) {