From: Christopher Faulet <cfaulet@haproxy.com>
Date: Wed, 30 Nov 2022 13:49:56 +0000 (+0100)
Subject: MINOR: mux-h1: add the expire task and its expiration date in "show fd"
X-Git-Tag: v2.7.0~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38f61351c390f139c694e40d69ebdccf1fab3792;p=thirdparty%2Fhaproxy.git

MINOR: mux-h1: add the expire task and its expiration date in "show fd"

Just like for the H2 multiplexer, info about the H1 connection task is now
displayed in "show fd" output. The task pointer is displayed and, if not
null, its expiration date.

It may be useful to backport it.
---

diff --git a/src/mux_h1.c b/src/mux_h1.c
index 9a2306ae64..a8421b76ca 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -3907,6 +3907,14 @@ static int h1_dump_h1c_info(struct buffer *msg, struct h1c *h1c, const char *pfx
 		      (unsigned int)b_head_ofs(&h1c->ibuf), (unsigned int)b_size(&h1c->ibuf),
 		      (unsigned int)b_data(&h1c->obuf), b_orig(&h1c->obuf),
 		      (unsigned int)b_head_ofs(&h1c->obuf), (unsigned int)b_size(&h1c->obuf));
+
+	chunk_appendf(msg, " .task=%p", h1c->task);
+	if (h1c->task) {
+		chunk_appendf(msg, " .exp=%s",
+			      h1c->task->expire ? tick_is_expired(h1c->task->expire, now_ms) ? "<PAST>" :
+			      human_time(TICKS_TO_MS(h1c->task->expire - now_ms), TICKS_TO_MS(1000)) : "<NEVER>");
+	}
+
 	return ret;
 }