From bf4ec6f4a07bd874f4d302f0e7d8ad11485d26ee Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 2 Sep 2022 15:11:40 +0200 Subject: [PATCH] MINOR: mux-h2: provide a "show_sd" helper to output stream debugging info With this, it now becomes possible to see the state of each H2 stream from "show sess all". Lines are still too long and need to be split, but that's for another patch. --- src/mux_h2.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/mux_h2.c b/src/mux_h2.c index 4d2a5a9bc..f67d69c7c 100644 --- a/src/mux_h2.c +++ b/src/mux_h2.c @@ -6849,6 +6849,28 @@ static int h2_show_fd(struct buffer *msg, struct connection *conn) return ret; } +/* for debugging with CLI's "show sess" command. May emit multiple lines, each + * new one being prefixed with , if is not NULL, otherwise a single + * line is used. Each field starts with a space so it's safe to print it after + * existing fields. + */ +static int h2_show_sd(struct buffer *msg, struct sedesc *sd, const char *pfx) +{ + struct h2s *h2s = sd->se; + int ret = 0; + + if (!h2s) + return ret; + + chunk_appendf(msg, " h2s=%p", h2s); + ret |= h2_dump_h2s_info(msg, h2s); + if (pfx) + chunk_appendf(msg, "\n%s", pfx); + chunk_appendf(msg, " h2c=%p", h2s->h2c); + ret |= h2_dump_h2c_info(msg, h2s->h2c); + return ret; +} + /* Migrate the the connection to the current thread. * Return 0 if successful, non-zero otherwise. * Expected to be called with the old thread lock held. @@ -7000,6 +7022,7 @@ static const struct mux_ops h2_ops = { .shutw = h2_shutw, .ctl = h2_ctl, .show_fd = h2_show_fd, + .show_sd = h2_show_sd, .takeover = h2_takeover, .flags = MX_FL_HTX|MX_FL_HOL_RISK|MX_FL_NO_UPG, .name = "H2",