From 776c2ca6d72ff37c3945c553079b65c8c9a69c3b Mon Sep 17 00:00:00 2001 From: Naveen Albert Date: Tue, 5 Dec 2023 11:36:47 -0500 Subject: [PATCH] manager.c: Improve clarity of "manager show connected". Improve the "manager show connected" CLI command to clarify that the last two columns are permissions related, not counts, and use sufficient widths to consistently display these values. ASTERISK-30143 #close Resolves: #482 (cherry picked from commit bc53a2a08722fdd47220601533781d68b0d41ade) --- main/manager.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/manager.c b/main/manager.c index 490ac116e8..37e380ec6e 100644 --- a/main/manager.c +++ b/main/manager.c @@ -2778,8 +2778,8 @@ static char *handle_showmanconn(struct ast_cli_entry *e, int cmd, struct ast_cli struct ao2_container *sessions; struct mansession_session *session; time_t now = time(NULL); -#define HSMCONN_FORMAT1 " %-15.15s %-55.55s %-10.10s %-10.10s %-8.8s %-8.8s %-5.5s %-5.5s\n" -#define HSMCONN_FORMAT2 " %-15.15s %-55.55s %-10d %-10d %-8d %-8d %-5.5d %-5.5d\n" +#define HSMCONN_FORMAT1 " %-15.15s %-55.55s %-10.10s %-10.10s %-8.8s %-8.8s %-10.10s %-10.10s\n" +#define HSMCONN_FORMAT2 " %-15.15s %-55.55s %-10d %-10d %-8d %-8d %-10.10d %-10.10d\n" int count = 0; struct ao2_iterator i; @@ -2795,7 +2795,7 @@ static char *handle_showmanconn(struct ast_cli_entry *e, int cmd, struct ast_cli return NULL; } - ast_cli(a->fd, HSMCONN_FORMAT1, "Username", "IP Address", "Start", "Elapsed", "FileDes", "HttpCnt", "Read", "Write"); + ast_cli(a->fd, HSMCONN_FORMAT1, "Username", "IP Address", "Start", "Elapsed", "FileDes", "HttpCnt", "ReadPerms", "WritePerms"); sessions = ao2_global_obj_ref(mgr_sessions); if (sessions) {