commit f389445a3afccb02bbe0e84b67aa0538706cfc96
author William Lallemand <wlallemand@haproxy.org> Tue Mar 08 12:05:31 2022 +0100
committer Christopher Faulet <cfaulet@haproxy.com> Mon Mar 14 10:39:38 2022 +0100
tree 8e3d080ee76fb8979fd5d8b1d5d09b7b3b1e700e
parent fc24fe20442733a2b8705d293baccd87704ed270

BUG/MINOR: cli: shows correct mode in "show sess"

The "show sess" cli command only handles "http" or "tcp" as a fallback
mode, replace this by a call to proxy_mode_str() to show all the modes.

Could be backported in every maintained versions.

(cherry picked from commit b0dfd099c56b8f8fd46686120a6cf1598bd5e470)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 96e6c4bc1c44c1c111bfd32a2c940ef25ca07b2f)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>

src/stream.c

diff --git a/src/stream.c b/src/stream.c
index ea997e0..70077d5 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -3094,7 +3094,7 @@
 
 		chunk_appendf(&trash,
 			     "  frontend=%s (id=%u mode=%s), listener=%s (id=%u)",
-			     strm_fe(strm)->id, strm_fe(strm)->uuid, strm_fe(strm)->mode ? "http" : "tcp",
+			     strm_fe(strm)->id, strm_fe(strm)->uuid, proxy_mode_str(strm_fe(strm)->mode),
 			     strm_li(strm) ? strm_li(strm)->name ? strm_li(strm)->name : "?" : "?",
 			     strm_li(strm) ? strm_li(strm)->luid : 0);
 
@@ -3117,7 +3117,7 @@
 			chunk_appendf(&trash,
 				     "  backend=%s (id=%u mode=%s)",
 				     strm->be->id,
-				     strm->be->uuid, strm->be->mode ? "http" : "tcp");
+				     strm->be->uuid, proxy_mode_str(strm->be->mode));
 		else
 			chunk_appendf(&trash, "  backend=<NONE> (id=-1 mode=-)");