*
* Copyright (c) 1987-2010 by the citadel.org team
*
- * This program is free software; you can redistribute it and/or modify
+ * This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "sysdep.h"
return TERM_NOTALLOWED;
}
- CtdlLogPrintf(CTDL_DEBUG, "Locating session to kill\n");
+ syslog(LOG_DEBUG, "Locating session to kill\n");
begin_critical_section(S_SESSION_TABLE);
for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
if (session_num == ccptr->cs_pid) {
if ((ccptr->user.usernum == CC->user.usernum)
|| (CC->user.axlevel >= AxAideU)) {
ret |= TERM_ALLOWED;
- ccptr->kill_me = 1;
+ ccptr->kill_me = KILLME_ADMIN_TERMINATE;
}
}
}
&& (config.c_sleeping > 0)
&& (now - (ccptr->lastcmd) > config.c_sleeping) ) {
if (!ccptr->dont_term) {
- ccptr->kill_me = 1;
+ ccptr->kill_me = KILLME_IDLE;
++killed;
}
else
}
end_critical_section(S_SESSION_TABLE);
if (killed > 0)
- CtdlLogPrintf(CTDL_INFO, "Terminated %d idle sessions\n", killed);
+ syslog(LOG_INFO, "Scheduled %d idle sessions for termination\n", killed);
if (longrunners > 0)
- CtdlLogPrintf(CTDL_INFO, "Didn't terminate %d protected idle sessions;\n", killed);
+ syslog(LOG_INFO, "Didn't terminate %d protected idle sessions;\n", killed);
}
void terminate_stuck_sessions(void)
}
end_critical_section(S_SESSION_TABLE);
if (killed > 0)
- CtdlLogPrintf(CTDL_INFO, "Flushed %d stuck sessions\n", killed);
+ syslog(LOG_INFO, "Flushed %d stuck sessions\n", killed);
}
void RemoveContext (CitContext *con)
{
if (con==NULL) {
- CtdlLogPrintf(CTDL_ERR,
+ syslog(LOG_ERR,
"WARNING: RemoveContext() called with NULL!\n");
return;
}
- CtdlLogPrintf(CTDL_DEBUG, "RemoveContext() session %d\n", con->cs_pid);
+ syslog(LOG_DEBUG, "RemoveContext() session %d\n", con->cs_pid);
/* Run any cleanup routines registered by loadable modules.
* Note: We have to "become_session()" because the cleanup functions
PerformSessionHooks(EVT_STOP);
become_session(NULL);
- CtdlLogPrintf(CTDL_NOTICE, "[%3d] Session ended.\n", con->cs_pid);
+ syslog(LOG_NOTICE, "[%3d] Session ended.\n", con->cs_pid);
/*
* If the client is still connected, blow 'em away.
* if the socket is 0, its already gone or was never there.
*/
- CtdlLogPrintf(CTDL_DEBUG, "Closing socket %d\n", con->client_socket);
if (con->client_socket != 0)
{
+ syslog(LOG_DEBUG, "Closing socket %d\n", con->client_socket);
close(con->client_socket);
}
FreeStrBuf(&con->MigrateBuf);
FreeStrBuf(&con->RecvBuf.Buf);
- CtdlLogPrintf(CTDL_DEBUG, "Done with RemoveContext()\n");
+ if (con->cached_msglist) {
+ free(con->cached_msglist);
+ }
+
+ syslog(LOG_DEBUG, "Done with RemoveContext()\n");
}
me = (CitContext *) malloc(sizeof(CitContext));
if (me == NULL) {
- CtdlLogPrintf(CTDL_ALERT, "citserver: can't allocate memory!!\n");
+ syslog(LOG_ALERT, "citserver: can't allocate memory!!\n");
return NULL;
}
memset(me, 0, sizeof(CitContext));
me = (CitContext *) malloc(sizeof(CitContext));
if (me == NULL) {
- CtdlLogPrintf(CTDL_ALERT, "citserver: can't allocate memory!!\n");
+ syslog(LOG_ALERT, "citserver: can't allocate memory!!\n");
return NULL;
}
memcpy(me, CloneMe, sizeof(CitContext));
me->ldap_dn = NULL;
me->session_specific_data = NULL;
+ me->download_fp = NULL;
+ me->upload_fp = NULL;
+ me->client_socket = 0;
+
me->MigrateBuf = NewStrBuf();
me->RecvBuf.Buf = NewStrBuf();
-
+
begin_critical_section(S_SESSION_TABLE);
{
me->cs_pid = ++next_pid;
len = cutuserkey(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
* already existed or needed to be created
if (context->user.usernum == 0)
{ /* old system user with number 0, upgrade it */
context->user.usernum = get_new_user_number();
- CtdlLogPrintf(CTDL_DEBUG, "Upgrading system user \"%s\" from user number 0 to user number %ld\n", context->user.fullname, context->user.usernum);
+ syslog(LOG_DEBUG, "Upgrading system user \"%s\" from user number 0 to user number %ld\n", 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);
/* Remove the session from the active list */
rem = ptr->next;
--num_sessions;
-
- CtdlLogPrintf(CTDL_DEBUG, "Purging session %d\n", ptr->cs_pid);
+
+ syslog(LOG_DEBUG, "context_cleanup(): Purging session #%d %s\n", ptr->cs_pid, ptr->ServiceName);
RemoveContext(ptr);
free (ptr);
ptr = rem;
-/*
- * Terminate another session.
- * (This could justifiably be moved out of sysdep.c because it
- * no longer does anything that is system-dependent.)
- */
-void kill_session(int session_to_kill) {
- CitContext *ptr;
-
- begin_critical_section(S_SESSION_TABLE);
- for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
- if (ptr->cs_pid == session_to_kill) {
- ptr->kill_me = 1;
- }
- }
- end_critical_section(S_SESSION_TABLE);
-}
-
/*
* Purge all sessions which have the 'kill_me' flag set.
* This function has code to prevent it from running more than once every
*/
void dead_session_purge(int force) {
CitContext *ptr, *ptr2; /* general-purpose utility pointer */
- CitContext *rem = NULL; /* list of sessions to be destroyed */
+ CitContext *rem = NULL; /* list of sessions to be destroyed */
if (force == 0) {
if ( (time(NULL) - last_purge) < 5 ) {
* is allocated privately on this thread's stack.
*/
while (rem != NULL) {
- CtdlLogPrintf(CTDL_DEBUG, "Purging session %d\n", rem->cs_pid);
+ syslog(LOG_DEBUG, "dead_session_purge(): purging session %d, reason=%d\n", rem->cs_pid, rem->kill_me);
RemoveContext(rem);
ptr = rem;
rem = rem->next;
*/
void set_async_waiting(struct CitContext *ccptr)
{
- CtdlLogPrintf(CTDL_DEBUG, "Setting async_waiting flag for session %d\n", ccptr->cs_pid);
+ syslog(LOG_DEBUG, "Setting async_waiting flag for session %d\n", ccptr->cs_pid);
if (ccptr->is_async) {
ccptr->async_waiting++;
if (ccptr->state == CON_IDLE) {
projects / citadel.git / blobdiff