X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Frwho%2Fserv_rwho.c;h=79ea2c6bda50acbb365e14605d21845d4383c289;hp=8967aca3610d2b50c01547aae540838dccdc658e;hb=58c77aea1dda7b206b900bafb9278237456ef737;hpb=25220160fc09e185bbf9f13f7565bb568cc5a463

diff --git a/citadel/modules/rwho/serv_rwho.c b/citadel/modules/rwho/serv_rwho.c
index 8967aca36..79ea2c6bd 100644
--- a/citadel/modules/rwho/serv_rwho.c
+++ b/citadel/modules/rwho/serv_rwho.c
@@ -2,7 +2,7 @@
  * This module implements server commands related to the display and
  * manipulation of the "Who's online" list.
  *
- * Copyright (c) 1987-2012 by the citadel.org team
+ * Copyright (c) 1987-2019 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -90,13 +90,9 @@ void cmd_rwho(char *argbuf) {
 	struct CitContext *nptr;
 	int nContexts, i;
 	int spoofed = 0;
-	int user_spoofed = 0;
-	int room_spoofed = 0;
-	int host_spoofed = 0;
 	int aide;
-	char un[40];
 	char real_room[ROOMNAMELEN], room[ROOMNAMELEN];
-	char host[64], flags[5];
+	char flags[5];
 	
 	/* So that we don't keep the context list locked for a long time
 	 * we create a copy of it first
@@ -113,13 +109,9 @@ void cmd_rwho(char *argbuf) {
 	aide = ( (CC->user.axlevel >= AxAideU) || (CC->internal_pgm) ) ;
 	cprintf("%d%c \n", LISTING_FOLLOWS, CtdlCheckExpress() );
 	
-	for (i=0; i<nContexts; i++) 
-	{
+	for (i=0; i<nContexts; i++)  {
 		flags[0] = '\0';
 		spoofed = 0;
-		user_spoofed = 0;
-		room_spoofed = 0;
-		host_spoofed = 0;
 		
 		if (!aide && nptr[i].state == CON_SYS)
 			continue;
@@ -127,40 +119,15 @@ void cmd_rwho(char *argbuf) {
 		if (!aide && nptr[i].kill_me != 0)
 			continue;
 
-		if (nptr[i].cs_flags & CS_POSTING)
-		   strcat(flags, "*");
-		else
-		   strcat(flags, ".");
-		   
-		if (nptr[i].fake_username[0])
-		{
-		   strcpy(un, nptr[i].fake_username);
-		   spoofed = 1;
-		   user_spoofed = 1;
+		if (nptr[i].cs_flags & CS_POSTING) {
+			strcat(flags, "*");
 		}
-		else
-		   strcpy(un, nptr[i].curr_user);
-		   
-		if (nptr[i].fake_hostname[0])
-		{
-		   strcpy(host, nptr[i].fake_hostname);
-		   spoofed = 1;
-		   host_spoofed = 1;
+		else {
+			strcat(flags, ".");
 		}
-		else
-		   strcpy(host, nptr[i].cs_host);
-
+		   
 		GenerateRoomDisplay(real_room, &nptr[i], CC);
 
-		if (nptr[i].fake_roomname[0]) {
-			strcpy(room, nptr[i].fake_roomname);
-			spoofed = 1;
-			room_spoofed = 1;
-		}
-		else {
-			strcpy(room, real_room);
-		}
-		
                 if ((aide) && (spoofed)) {
                 	strcat(flags, "+");
 		}
@@ -169,41 +136,24 @@ void cmd_rwho(char *argbuf) {
 			strcat(flags, "-");
 		}
 		
-		if (((nptr[i].cs_flags&CS_STEALTH)==0) || (aide))
-		{
+		if (((nptr[i].cs_flags&CS_STEALTH)==0) || (aide)) {
+
 			cprintf("%d|%s|%s|%s|%s|%ld|%s|%s|",
-				nptr[i].cs_pid, un, room,
-				host, nptr[i].cs_clientname,
+				nptr[i].cs_pid, nptr[i].curr_user, room,
+				nptr[i].cs_host, nptr[i].cs_clientname,
 				(long)(nptr[i].lastidle),
 				nptr[i].lastcmdname, flags
 			);
 
-			if ((user_spoofed) && (aide)) {
-				cprintf("%s|", nptr[i].curr_user);
-			}
-			else {
-				cprintf("|");
-			}
-	
-			if ((room_spoofed) && (aide)) {
-				cprintf("%s|", real_room);
-			}
-			else {
-				cprintf("|");
-			}
-	
-			if ((host_spoofed) && (aide)) {
-				cprintf("%s|", nptr[i].cs_host);
-			}
-			else {
-				cprintf("|");
-			}
+			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);
 		}
 	}
 	
-	/* release out copy of the context list */
+	/* release our copy of the context list */
 	free(nptr);
 
 	/* Now it's magic time.  Before we finish, call any EVT_RWHO hooks
@@ -214,139 +164,6 @@ void cmd_rwho(char *argbuf) {
 	cprintf("000\n");
 }
 
-#if 0
-/*
- * check for async io jobs that are stuck (didn't ping back for 10 mins)
- */
-void dead_io_check(void) {
-	struct CitContext *nptr;
-	int nContexts, i;
-	char real_room[ROOMNAMELEN];
-	
-	/* So that we don't keep the context list locked for a long time
-	 * we create a copy of it first
-	 */
-	nptr = CtdlGetContextArray(&nContexts) ;
-	if (!nptr)
-	{
-		/* Couldn't malloc so we have to bail but stick to the protocol */
-		return;
-	}
-
-	time_t now = time(NULL);
-	time_t idle;
-
-	for (i=0; i<nContexts; i++) 
-	{
-		if ((nptr[i].state != CON_SYS) || (nptr[i].IO == NULL) || (nptr[i].lastcmd == 0))
-			continue;
-
-		if (nptr[i].kill_me != 0)
-			continue;
-		idle = now - nptr[i].lastcmd;
-		if (idle < 600) 
-			continue;
-
-		GenerateRoomDisplay(real_room, &nptr[i], CC);
-
-		syslog(LOG_WARNING,
-		       "Found stuck event context: CC[%d] "
-
-		       "Username: '%s' "
-		       "Room: '%s' "
-		       "while talking to host: '%s' "
-		       "Status: '%s' "
-		       "stuck in IO State: '%s' "
-
-		       "idle since: %d:%d "
-		       "Triggering context termination now!",
-
-		       nptr[i].cs_pid,
-
-		       nptr[i].curr_user,
-		       real_room,
-		       nptr[i].cs_host,
-		       nptr[i].cs_clientname,
-		       nptr[i].lastcmdname,
-
-		       (int) idle / 60,
-		       (int) idle % 60);
-
-		CtdlTerminateOtherSession(nptr[i].cs_pid);
-	}
-	
-	/* release out copy of the context list */
-	free(nptr);
-}
-#endif
-
-/*
- * Masquerade roomname
- */
-void cmd_rchg(char *argbuf)
-{
-	char newroomname[ROOMNAMELEN];
-
-	extract_token(newroomname, argbuf, 0, '|', sizeof newroomname);
-	newroomname[ROOMNAMELEN-1] = 0;
-	if (!IsEmptyStr(newroomname)) {
-		safestrncpy(CC->fake_roomname, newroomname,
-			sizeof(CC->fake_roomname) );
-	}
-	else {
-		safestrncpy(CC->fake_roomname, "", sizeof CC->fake_roomname);
-	}
-	cprintf("%d OK\n", CIT_OK);
-}
-
-/*
- * Masquerade hostname 
- */
-void cmd_hchg(char *argbuf)
-{
-	char newhostname[64];
-
-	extract_token(newhostname, argbuf, 0, '|', sizeof newhostname);
-	if (!IsEmptyStr(newhostname)) {
-		safestrncpy(CC->fake_hostname, newhostname,
-			sizeof(CC->fake_hostname) );
-	}
-	else {
-		safestrncpy(CC->fake_hostname, "", sizeof CC->fake_hostname);
-	}
-	cprintf("%d OK\n", CIT_OK);
-}
-
-
-/*
- * Masquerade username (aides only)
- */
-void cmd_uchg(char *argbuf)
-{
-
-	char newusername[USERNAME_SIZE];
-
-	extract_token(newusername, argbuf, 0, '|', sizeof newusername);
-
-	if (CtdlAccessCheck(ac_aide)) return;
-
-	if (!IsEmptyStr(newusername)) {
-		CC->cs_flags &= ~CS_STEALTH;
-		memset(CC->fake_username, 0, 32);
-		if (strncasecmp(newusername, CC->curr_user,
-				strlen(CC->curr_user)))
-			safestrncpy(CC->fake_username, newusername,
-				sizeof(CC->fake_username));
-	}
-	else {
-		CC->fake_username[0] = '\0';
-		CC->cs_flags |= CS_STEALTH;
-	}
-	cprintf("%d\n",CIT_OK);
-}
-
-
-
 
 /*
  * enter or exit "stealth mode"
@@ -378,9 +195,6 @@ CTDL_MODULE_INIT(rwho)
 	if(!threading)
 	{
 	        CtdlRegisterProtoHook(cmd_rwho, "RWHO", "Display who is online");
-        	CtdlRegisterProtoHook(cmd_hchg, "HCHG", "Masquerade hostname");
-	        CtdlRegisterProtoHook(cmd_rchg, "RCHG", "Masquerade roomname");
-        	CtdlRegisterProtoHook(cmd_uchg, "UCHG", "Masquerade username");
 	        CtdlRegisterProtoHook(cmd_stel, "STEL", "Enter/exit stealth mode");
 		//CtdlRegisterSessionHook(dead_io_check, EVT_TIMER, PRIO_QUEUE + 50);