From: Christopher Faulet <cfaulet@haproxy.com>
Date: Mon, 25 Sep 2023 12:11:22 +0000 (+0200)
Subject: DEBUG: mux-h1: Fix event label from trace messages about payload formatting
X-Git-Tag: v2.9-dev7~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2225cb660c008b4497647f34d7faa88574b55810;p=thirdparty%2Fhaproxy.git

DEBUG: mux-h1: Fix event label from trace messages about payload formatting

The label used for in/out trace messages about payload formatting was not
the right one. Use H1_EV_TX_BODY, instead of H1_EV_TX_HDRS.
---

diff --git a/src/mux_h1.c b/src/mux_h1.c
index 9b68e25c24..c602b68a38 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -2480,7 +2480,7 @@ static size_t h1_make_data(struct h1s *h1s, struct h1m *h1m, struct buffer *buf,
 	size_t ret = 0;
 	int last_data = 0;
 
-	TRACE_ENTER(H1_EV_TX_DATA|H1_EV_TX_HDRS, h1c->conn, h1s, htx, (size_t[]){count});
+	TRACE_ENTER(H1_EV_TX_DATA|H1_EV_TX_BODY, h1c->conn, h1s, htx, (size_t[]){count});
 	blk = htx_get_head_blk(htx);
 
 	/* Perform some optimizations to reduce the number of buffer copies.  If
@@ -2693,7 +2693,7 @@ static size_t h1_make_data(struct h1s *h1s, struct h1m *h1m, struct buffer *buf,
 	TRACE_PROTO("H1 message payload data xferred", H1_EV_TX_DATA|H1_EV_TX_BODY, h1c->conn, h1s, 0, (size_t[]){ret});
 	b_add(&h1c->obuf, outbuf.data);
   end:
-	TRACE_LEAVE(H1_EV_TX_DATA|H1_EV_TX_HDRS, h1c->conn, h1s, htx, (size_t[]){ret});
+	TRACE_LEAVE(H1_EV_TX_DATA|H1_EV_TX_BODY, h1c->conn, h1s, htx, (size_t[]){ret});
 	return ret;
   full:
 	TRACE_STATE("h1c obuf full", H1_EV_TX_DATA|H1_EV_H1S_BLK, h1c->conn, h1s);
@@ -2725,7 +2725,7 @@ static size_t h1_make_tunnel(struct h1s *h1s, struct h1m *h1m, struct buffer *bu
 	uint32_t sz;
 	size_t ret = 0;
 
-	TRACE_ENTER(H1_EV_TX_DATA|H1_EV_TX_HDRS, h1c->conn, h1s, htx, (size_t[]){count});
+	TRACE_ENTER(H1_EV_TX_DATA|H1_EV_TX_BODY, h1c->conn, h1s, htx, (size_t[]){count});
 
 	blk = htx_get_head_blk(htx);
 
@@ -2808,7 +2808,7 @@ static size_t h1_make_tunnel(struct h1s *h1s, struct h1m *h1m, struct buffer *bu
 	b_add(&h1c->obuf, outbuf.data);
 
   end:
-	TRACE_LEAVE(H1_EV_TX_DATA|H1_EV_TX_HDRS, h1c->conn, h1s, htx, (size_t[]){ret});
+	TRACE_LEAVE(H1_EV_TX_DATA|H1_EV_TX_BODY, h1c->conn, h1s, htx, (size_t[]){ret});
 	return ret;
 
   full: