From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 11 Jun 2019 08:20:57 +0000 (+0200)
Subject: MINOR: flt_trace: Don't scrash the original offset during the random forwarding
X-Git-Tag: v2.0-dev7~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50fe9fba4bc622de338d464188b82d093e45eb4c;p=thirdparty%2Fhaproxy.git

MINOR: flt_trace: Don't scrash the original offset during the random forwarding

There is no bug here, but this patch improves the debug message reported during
the random forwarding. The original offset is kept untouched so its value may be
used to format the message. Before, 0 was always reported.
---

diff --git a/src/flt_trace.c b/src/flt_trace.c
index e001d7b370..cd69145614 100644
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -468,18 +468,19 @@ trace_http_payload(struct stream *s, struct filter *filter, struct http_msg *msg
 		struct htx *htx = htxbuf(&msg->chn->buf);
 		struct htx_blk *blk;
 		uint32_t sz, data = 0;
+		unsigned int off = offset;
 
 		for (blk = htx_get_first_blk(htx); blk; blk = htx_get_next_blk(htx, blk)) {
 			if (htx_get_blk_type(blk) != HTX_BLK_DATA)
 				break;
 
 			sz = htx_get_blksz(blk);
-			if (offset >= sz) {
-				offset -= sz;
+			if (off >= sz) {
+				off -= sz;
 				continue;
 			}
-			data  += sz - offset;
-			offset = 0;
+			data  += sz - off;
+			off = 0;
 			if (data > len) {
 				data = len;
 				break;