X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcontext.c;h=8b06ab5c811b1d352edd8c30673a2c6fdff45321;hb=bdfa2e9b6af7e32b11461433a28dd6551f830888;hp=81b597850b1dbfbe00396ea6119ba1014ed80e3e;hpb=4db4fc48793f3680c5defd28ea32c97044a2b569;p=citadel.git

diff --git a/citadel/context.c b/citadel/context.c
index 81b597850..8b06ab5c8 100644
--- a/citadel/context.c
+++ b/citadel/context.c
@@ -2,7 +2,7 @@
  * Citadel context management stuff.
  * Here's where we (hopefully) have all the code that manipulates contexts.
  *
- * Copyright (c) 1987-2011 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.
@@ -15,22 +15,16 @@
 
 #include "ctdl_module.h"
 #include "serv_extensions.h"
-#include "ecrash.h"
-
 #include "citserver.h"
 #include "user_ops.h"
 #include "locate_host.h"
 #include "context.h"
 #include "control.h"
-
-int DebugSession = 0;
+#include "config.h"
 
 pthread_key_t MyConKey;				/* TSD key for MyContext() */
-
-
 CitContext masterCC;
 CitContext *ContextList = NULL;
-
 time_t last_purge = 0;				/* Last dead session purge */
 int num_sessions = 0;				/* Current number of sessions */
 int next_pid = 0;
@@ -56,6 +50,7 @@ int CtdlTrySingleUser(void)
 	return can_do;
 }
 
+
 void CtdlEndSingleUser(void)
 {
 	begin_critical_section(S_SINGLE_USER);
@@ -69,21 +64,19 @@ int CtdlWantSingleUser(void)
 	return want_single_user;
 }
 
+
 int CtdlIsSingleUser(void)
 {
 	if (want_single_user)
 	{
 		/* check for only one context here */
 		if (num_sessions == 1)
-			return TRUE;
+			return 1;
 	}
-	return FALSE;
+	return 0;
 }
 
 
-
-
-
 /*
  * Locate a context by its session number and terminate it if the user is able.
  * User can NOT terminate their current session.
@@ -101,7 +94,7 @@ int CtdlTerminateOtherSession (int session_num)
 
 	aide = ( (CCC->user.axlevel >= AxAideU) || (CCC->internal_pgm) ) ;
 
-	CONM_syslog(LOG_DEBUG, "Locating session to kill\n");
+	syslog(LOG_DEBUG, "context: locating session to kill");
 	begin_critical_section(S_SESSION_TABLE);
 	for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
 		if (session_num == ccptr->cs_pid) {
@@ -115,19 +108,11 @@ int CtdlTerminateOtherSession (int session_num)
 
 	if (((ret & TERM_FOUND) != 0) && ((ret & TERM_ALLOWED) != 0))
 	{
-		if (ccptr->IO != NULL) {
-			AsyncIO *IO = ccptr->IO;
-			end_critical_section(S_SESSION_TABLE);
-			KillAsyncIOContext(IO);
-		}
+		if (ccptr->user.usernum == CCC->user.usernum)
+			ccptr->kill_me = KILLME_ADMIN_TERMINATE;
 		else
-		{
-			if (ccptr->user.usernum == CCC->user.usernum)
-				ccptr->kill_me = KILLME_ADMIN_TERMINATE;
-			else
-				ccptr->kill_me = KILLME_IDLE;
-			end_critical_section(S_SESSION_TABLE);
-		}
+			ccptr->kill_me = KILLME_IDLE;
+		end_critical_section(S_SESSION_TABLE);
 	}
 	else
 		end_critical_section(S_SESSION_TABLE);
@@ -244,8 +229,8 @@ void terminate_idle_sessions(void)
 	for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
 		if (
 			(ccptr != CC)
-	   		&& (config.c_sleeping > 0)
-	   		&& (now - (ccptr->lastcmd) > config.c_sleeping)
+	   		&& (CtdlGetConfigLong("c_sleeping") > 0)
+	   		&& (now - (ccptr->lastcmd) > CtdlGetConfigLong("c_sleeping"))
 		) {
 			if (!ccptr->dont_term) {
 				ccptr->kill_me = KILLME_IDLE;
@@ -257,10 +242,12 @@ void terminate_idle_sessions(void)
 		}
 	}
 	end_critical_section(S_SESSION_TABLE);
-	if (killed > 0)
-		CON_syslog(LOG_INFO, "Scheduled %d idle sessions for termination\n", killed);
-	if (longrunners > 0)
-		CON_syslog(LOG_INFO, "Didn't terminate %d protected idle sessions", longrunners);
+	if (killed > 0) {
+		syslog(LOG_INFO, "context: scheduled %d idle sessions for termination", killed);
+	}
+	if (longrunners > 0) {
+		syslog(LOG_INFO, "context: did not terminate %d protected idle sessions", longrunners);
+	}
 }
 
 
@@ -276,12 +263,7 @@ void terminate_all_sessions(void)
 	for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
 		if (ccptr->client_socket != -1)
 		{
-			if (ccptr->IO != NULL) {
-				CON_syslog(LOG_INFO, "terminate_all_sessions() is murdering %s IO[%ld]CC[%d]", ccptr->curr_user, ccptr->IO->ID, ccptr->cs_pid);
-			}
-			else {
-				CON_syslog(LOG_INFO, "terminate_all_sessions() is murdering %s CC[%d]", ccptr->curr_user, ccptr->cs_pid);
-			}
+			syslog(LOG_INFO, "context: terminate_all_sessions() is murdering %s CC[%d]", ccptr->curr_user, ccptr->cs_pid);
 			close(ccptr->client_socket);
 			ccptr->client_socket = -1;
 			killed++;
@@ -289,7 +271,7 @@ void terminate_all_sessions(void)
 	}
 	end_critical_section(S_SESSION_TABLE);
 	if (killed > 0) {
-		CON_syslog(LOG_INFO, "Flushed %d stuck sessions\n", killed);
+		syslog(LOG_INFO, "context: flushed %d stuck sessions", killed);
 	}
 }
 
@@ -302,15 +284,14 @@ void RemoveContext (CitContext *con)
 {
 	const char *c;
 	if (con == NULL) {
-		CONM_syslog(LOG_ERR, "WARNING: RemoveContext() called with NULL!");
+		syslog(LOG_ERR, "context: RemoveContext() called with NULL, this should not happen");
 		return;
 	}
 	c = con->ServiceName;
 	if (c == NULL) {
 		c = "WTF?";
 	}
-	CON_syslog(LOG_DEBUG, "RemoveContext(%s) session %d", c, con->cs_pid);
-///	cit_backtrace();
+	syslog(LOG_DEBUG, "context: RemoveContext(%s) session %d", c, con->cs_pid);
 
 	/* Run any cleanup routines registered by loadable modules.
 	 * Note: We have to "become_session()" because the cleanup functions
@@ -322,7 +303,7 @@ void RemoveContext (CitContext *con)
 	client_close();				/* If the client is still connected, blow 'em away. */
 	become_session(NULL);
 
-	CON_syslog(LOG_NOTICE, "[%3d]SRV[%s] Session ended.", con->cs_pid, c);
+	syslog(LOG_INFO, "context: [%3d]SRV[%s] Session ended.", con->cs_pid, c);
 
 	/* 
 	 * If the client is still connected, blow 'em away. 
@@ -330,7 +311,7 @@ void RemoveContext (CitContext *con)
 	 */
 	if (con->client_socket > 0)
 	{
-		CON_syslog(LOG_NOTICE, "Closing socket %d", con->client_socket);
+		syslog(LOG_INFO, "context: closing socket %d", con->client_socket);
 		close(con->client_socket);
 	}
 
@@ -346,7 +327,7 @@ void RemoveContext (CitContext *con)
 		free(con->cached_msglist);
 	}
 
-	CONM_syslog(LOG_DEBUG, "Done with RemoveContext()");
+	syslog(LOG_DEBUG, "context: done with RemoveContext()");
 }
 
 
@@ -362,7 +343,7 @@ CitContext *CreateNewContext(void) {
 
 	me = (CitContext *) malloc(sizeof(CitContext));
 	if (me == NULL) {
-		CONM_syslog(LOG_ALERT, "citserver: can't allocate memory!!\n");
+		syslog(LOG_ERR, "citserver: malloc() failed: %m");
 		return NULL;
 	}
 	memset(me, 0, sizeof(CitContext));
@@ -411,7 +392,7 @@ CitContext *CloneContext(CitContext *CloneMe) {
 
 	me = (CitContext *) malloc(sizeof(CitContext));
 	if (me == NULL) {
-		CONM_syslog(LOG_ALERT, "citserver: can't allocate memory!!\n");
+		syslog(LOG_ERR, "citserver: malloc() failed: %m");
 		return NULL;
 	}
 	memcpy(me, CloneMe, sizeof(CitContext));
@@ -509,16 +490,12 @@ void begin_session(CitContext *con)
 	strcpy(con->lastcmdname, "    ");
 	strcpy(con->cs_clientname, "(unknown)");
 	strcpy(con->curr_user, NLI);
-	*con->net_node = '\0';
-	*con->fake_username = '\0';
-	*con->fake_hostname = '\0';
-	*con->fake_roomname = '\0';
 	*con->cs_clientinfo = '\0';
-	safestrncpy(con->cs_host, config.c_fqdn, sizeof con->cs_host);
+	safestrncpy(con->cs_host, CtdlGetConfigStr("c_fqdn"), sizeof con->cs_host);
 	safestrncpy(con->cs_addr, "", sizeof con->cs_addr);
 	con->cs_UDSclientUID = -1;
 	con->cs_host[sizeof con->cs_host - 1] = 0;
-	if (!CC->is_local_socket) {
+	if (!CC->is_local_client) {
 		locate_host(con->cs_host, sizeof con->cs_host,
 			con->cs_addr, sizeof con->cs_addr,
 			con->client_socket
@@ -535,7 +512,7 @@ void begin_session(CitContext *con)
 			
 			/*fill in the user data structure */
 			if(getsockopt(con->client_socket, SOL_SOCKET, SO_PEERCRED, &credentials, &ucred_length)) {
-				syslog(LOG_NOTICE, "could obtain credentials from unix domain socket");
+				syslog(LOG_ERR, "context: could obtain credentials from unix domain socket");
 				
 			}
 			else {		
@@ -562,20 +539,15 @@ void begin_session(CitContext *con)
 #endif
 	}
 	con->cs_flags = 0;
-	con->upload_type = UPL_FILE;
-	con->dl_is_net = 0;
 
 	con->nologin = 0;
-	if (((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions)) || CtdlWantSingleUser()) {
+	if (((CtdlGetConfigInt("c_maxsessions") > 0)&&(num_sessions > CtdlGetConfigInt("c_maxsessions"))) || CtdlWantSingleUser()) {
 		con->nologin = 1;
 	}
 
-	if (!CC->is_local_socket) {
-		syslog(LOG_NOTICE, "Session (%s) started from %s (%s).\n", con->ServiceName, con->cs_host, con->cs_addr);
-	}
-	else {
-		syslog(LOG_NOTICE, "Session (%s) started via local socket UID:%d.\n", con->ServiceName, con->cs_UDSclientUID);
-	}
+	syslog(LOG_INFO, "context: session (%s) started from %s (%s) uid=%d",
+		con->ServiceName, con->cs_host, con->cs_addr, con->cs_UDSclientUID
+	);
 
 	/* Run any session startup routines registered by loadable modules */
 	PerformSessionHooks(EVT_START);
@@ -596,22 +568,22 @@ void CtdlFillSystemContext(CitContext *context, char *name)
 	context->cs_pid = 0;
 	strcpy (sysname, "SYS_");
 	strcat (sysname, name);
-	len = cutuserkey(sysname);
+	len = cutusername(sysname);
 	memcpy(context->curr_user, sysname, len + 1);
 	context->client_socket = (-1);
 	context->state = CON_SYS;
 	context->ServiceName = name;
 
-	/* internal_create_user has the side effect of loading the user regardless of wether they
+	/* internal_create_user has the side effect of loading the user regardless of whether they
 	 * already existed or needed to be created
 	 */
-	internal_create_user (sysname, len, &(context->user), -1) ;
+	internal_create_user(sysname, &(context->user), -1) ;
 	
 	/* Check to see if the system user needs upgrading */
 	if (context->user.usernum == 0)
 	{	/* old system user with number 0, upgrade it */
 		context->user.usernum = get_new_user_number();
-		CON_syslog(LOG_INFO, "Upgrading system user \"%s\" from user number 0 to user number %ld\n", context->user.fullname, context->user.usernum);
+		syslog(LOG_INFO, "context: upgrading system user \"%s\" from user number 0 to user number %ld", context->user.fullname, context->user.usernum);
 		/* add user to the database */
 		CtdlPutUser(&(context->user));
 		cdb_store(CDB_USERSBYNUMBER, &(context->user.usernum), sizeof(long), context->user.fullname, strlen(context->user.fullname)+1);
@@ -645,7 +617,7 @@ void context_cleanup(void)
 		rem = ptr->next;
 		--num_sessions;
 
-		CON_syslog(LOG_DEBUG, "context_cleanup(): purging session %d\n", ptr->cs_pid);
+		syslog(LOG_DEBUG, "context: context_cleanup() purging session %d", ptr->cs_pid);
 		RemoveContext(ptr);
 		free (ptr);
 		ptr = rem;
@@ -705,7 +677,7 @@ void dead_session_purge(int force) {
 	 * is allocated privately on this thread's stack.
 	 */
 	while (rem != NULL) {
-		CON_syslog(LOG_DEBUG, "dead_session_purge(): purging session %d, reason=%d\n", rem->cs_pid, rem->kill_me);
+		syslog(LOG_DEBUG, "context: dead_session_purge() purging session %d, reason=%d", rem->cs_pid, rem->kill_me);
 		RemoveContext(rem);
 		ptr = rem;
 		rem = rem->next;
@@ -736,7 +708,7 @@ void InitializeMasterCC(void) {
  */
 void set_async_waiting(struct CitContext *ccptr)
 {
-	CON_syslog(LOG_DEBUG, "Setting async_waiting flag for session %d\n", ccptr->cs_pid);
+	syslog(LOG_DEBUG, "context: setting async_waiting flag for session %d", ccptr->cs_pid);
 	if (ccptr->is_async) {
 		ccptr->async_waiting++;
 		if (ccptr->state == CON_IDLE) {
@@ -746,14 +718,9 @@ void set_async_waiting(struct CitContext *ccptr)
 }
 
 
-void DebugSessionEnable(const int n)
-{
-	DebugSession = n;
-}
 CTDL_MODULE_INIT(session)
 {
 	if (!threading) {
-		CtdlRegisterDebugFlagHook(HKEY("session"), DebugSessionEnable, &DebugSession);
 	}
 	return "session";
 }