* 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-2015 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.
#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;
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) {
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);
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;
}
}
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);
+ }
}
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++;
}
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);
}
}
{
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);
+ syslog(LOG_DEBUG, "context: RemoveContext(%s) session %d", c, con->cs_pid);
/// cit_backtrace();
/* Run any cleanup routines registered by loadable modules.
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.
*/
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);
}
free(con->cached_msglist);
}
- CONM_syslog(LOG_DEBUG, "Done with RemoveContext()");
+ syslog(LOG_DEBUG, "context: done with RemoveContext()");
}
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));
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));
*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;
/*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 {
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);
+ syslog(LOG_INFO, "context: session (%s) started from %s (%s)", 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 via local socket with uid=%d", con->ServiceName, con->cs_UDSclientUID);
}
/* Run any session startup routines registered by loadable modules */
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);
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;
* 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;
*/
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) {
}
-void DebugSessionEnable(const int n)
-{
- DebugSession = n;
-}
CTDL_MODULE_INIT(session)
{
if (!threading) {
- CtdlRegisterDebugFlagHook(HKEY("session"), DebugSessionEnable, &DebugSession);
}
return "session";
}