]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
DEBUG: mux-h1: Fix event label from trace messages about payload formatting
authorChristopher Faulet <cfaulet@haproxy.com>
Mon, 25 Sep 2023 12:11:22 +0000 (14:11 +0200)
committerChristopher Faulet <cfaulet@haproxy.com>
Wed, 4 Oct 2023 13:34:18 +0000 (15:34 +0200)
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.

src/mux_h1.c

index 9b68e25c24ccbbf5bba32790bdc52653cd91d935..c602b68a38e29d198a4cdabd51a5824762ec380b 100644 (file)
@@ -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: