BUG/MINOR: mux-h2: fix the "show fd" dest buffer for the subscriber
Commit 98e40b981 ("MINOR: mux-h2: make the "show fd" helper also decode
the h2s subscriber when known") improved the output of "show fd" for the
H2 mux, but the output is sent to the trash buffer instead of the msg
argument. It turns out that this has no effect right now as the caller
passes the trash but this is risky.
This should be backported to 2.4.
(cherry picked from commit ba7657ca0f2a15f9bb988bc05821d088f2f05947)
Signed-off-by: Willy Tarreau <w@1wt.eu>
(cherry picked from commit 671bfab6fdb858ea712be17784e72310dbbef549)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 552426d84620e5f8d7a85a49fd2408a59301dd35)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
diff --git a/src/mux_h2.c b/src/mux_h2.c
index 18f73b7..7d23e5a 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -6738,16 +6738,16 @@
chunk_appendf(msg, "(.flg=0x%08x .data=%p)",
h2s->cs->flags, h2s->cs->data);
- chunk_appendf(&trash, " .subs=%p", h2s->subs);
+ chunk_appendf(msg, " .subs=%p", h2s->subs);
if (h2s->subs) {
- chunk_appendf(&trash, "(ev=%d tl=%p", h2s->subs->events, h2s->subs->tasklet);
- chunk_appendf(&trash, " tl.calls=%d tl.ctx=%p tl.fct=",
+ chunk_appendf(msg, "(ev=%d tl=%p", h2s->subs->events, h2s->subs->tasklet);
+ chunk_appendf(msg, " tl.calls=%d tl.ctx=%p tl.fct=",
h2s->subs->tasklet->calls,
h2s->subs->tasklet->context);
if (h2s->subs->tasklet->calls >= 1000000)
ret = 1;
- resolve_sym_name(&trash, NULL, h2s->subs->tasklet->process);
- chunk_appendf(&trash, ")");
+ resolve_sym_name(msg, NULL, h2s->subs->tasklet->process);
+ chunk_appendf(msg, ")");
}
}
return ret;