MINOR: mux-h1: Slightly Improve H1 traces
Connection and conn-stream pointers and flags are now dumped, if available,
in each trace messages. In addition, shutr and shutw mode is now reported.
(cherry picked from commit 99293b03807de8a357cf7153fcc0c15f716238c2)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
diff --git a/src/mux_h1.c b/src/mux_h1.c
index 3060bcf..16aa2ba 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -324,8 +324,13 @@
/* Display h1c info and, if defined, h1s info (pointer + flags) */
chunk_appendf(&trace_buf, " - h1c=%p(0x%08x)", h1c, h1c->flags);
- if (h1s)
+ if (h1c->conn)
+ chunk_appendf(&trace_buf, " conn=%p(0x%08x)", h1c->conn, h1c->conn->flags);
+ if (h1s) {
chunk_appendf(&trace_buf, " h1s=%p(0x%08x)", h1s, h1s->flags);
+ if (h1s->cs)
+ chunk_appendf(&trace_buf, " cs=%p(0x%08x)", h1s->cs, h1s->cs->flags);
+ }
if (src->verbosity == H1_VERB_MINIMAL)
return;
@@ -3194,7 +3199,7 @@
return;
h1c = h1s->h1c;
- TRACE_ENTER(H1_EV_STRM_SHUT, h1c->conn, h1s);
+ TRACE_ENTER(H1_EV_STRM_SHUT, h1c->conn, h1s, 0, (size_t[]){mode});
if (cs->flags & CS_FL_SHR)
goto end;
@@ -3237,7 +3242,7 @@
return;
h1c = h1s->h1c;
- TRACE_ENTER(H1_EV_STRM_SHUT, h1c->conn, h1s);
+ TRACE_ENTER(H1_EV_STRM_SHUT, h1c->conn, h1s, 0, (size_t[]){mode});
if (cs->flags & CS_FL_SHW)
goto end;