From 9a1be8e36d2c3398ebe4b2958beb9d7192d05503 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Mon, 5 Feb 2024 17:41:52 -1000
Subject: [PATCH] Added context state to output of RWHO command.

Hopefully the next time some douchebag from out of town floods our
site with stuck-open MSA sessions, we can figure out why it isn't
unbinding or timing out.
---
 citadel/server/modules/rwho/serv_rwho.c | 19 ++++---------------
 citadel/utils/loadtest.c                |  2 +-
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/citadel/server/modules/rwho/serv_rwho.c b/citadel/server/modules/rwho/serv_rwho.c
index 96e25e787..d028c9b3f 100644
--- a/citadel/server/modules/rwho/serv_rwho.c
+++ b/citadel/server/modules/rwho/serv_rwho.c
@@ -63,7 +63,6 @@ void GenerateRoomDisplay(char *real_room, CitContext *viewed, CitContext *viewer
 void cmd_rwho(char *argbuf) {
 	struct CitContext *nptr;
 	int nContexts, i;
-	int spoofed = 0;
 	int aide;
 	char room[ROOMNAMELEN];
 	char flags[5];
@@ -83,7 +82,6 @@ void cmd_rwho(char *argbuf) {
 	
 	for (i=0; i<nContexts; i++)  {
 		flags[0] = '\0';
-		spoofed = 0;
 		
 		if (!aide && nptr[i].state == CON_SYS)
 			continue;
@@ -100,17 +98,12 @@ void cmd_rwho(char *argbuf) {
 		   
 		GenerateRoomDisplay(room, &nptr[i], CC);
 
-                if ((aide) && (spoofed)) {
-                	strcat(flags, "+");
-		}
-		
 		if ((nptr[i].cs_flags & CS_STEALTH) && (aide)) {
 			strcat(flags, "-");
 		}
 		
 		if (((nptr[i].cs_flags&CS_STEALTH)==0) || (aide)) {
-
-			cprintf("%d|%s|%s|%s|%s|%ld|%s|%s|",
+			cprintf("%d|%s|%s|%s|%s|%ld|%s|%s||||%d|%d\n",
 				nptr[i].cs_pid,
 				(nptr[i].logged_in ? nptr[i].curr_user : NLI),
 				room,
@@ -118,14 +111,10 @@ void cmd_rwho(char *argbuf) {
 				nptr[i].cs_clientname,
 				(long)(nptr[i].lastidle),
 				nptr[i].lastcmdname,
-				flags
+				flags,
+				nptr[i].logged_in,
+				nptr[i].state
 			);
-
-			cprintf("|");	// no spoofed user names anymore
-			cprintf("|");	// no spoofed room names anymore
-			cprintf("|");	// no spoofed host names anymore
-	
-			cprintf("%d\n", nptr[i].logged_in);
 		}
 	}
 	
diff --git a/citadel/utils/loadtest.c b/citadel/utils/loadtest.c
index 6ed6e979f..8d4e41b2f 100644
--- a/citadel/utils/loadtest.c
+++ b/citadel/utils/loadtest.c
@@ -314,7 +314,7 @@ void *loadtest(void *pointer_to_thread_id) {
 		printf("\033[%d;%dH\033[32m%8ld\033[0m", row, col, ++ops);
 		++ops_completed;		// this is declared "volatile" so we don't need to lock it
 		if (thread_id == 0) {
-			printf("\033[2;55H\033[44m\033[33m\033[1m%d ops/sec \033[0m", (ops_completed / (time(NULL) - time_started)));
+			printf("\033[2;55H\033[44m\033[33m\033[1m%ld ops/sec \033[0m", (ops_completed / (time(NULL) - time_started)));
 		}
 		fflush(stdout);
 	}
-- 
2.30.2