More debugging

[citadel.git] / citadel / context.c

diff --git a/citadel/context.c b/citadel/context.c
index 32b306bf92f82b53d6d4557e62c42db1de6206da..1bdea382923e744c2e4f5d233c87f40356dc8573 100644 (file)
--- a/citadel/context.c
+++ b/citadel/context.c
@@ -4,7 +4,7 @@
  *
  * 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.
@@ -16,7 +16,7 @@
  *
  * 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"
@@ -167,7 +167,7 @@ int CtdlTerminateOtherSession (int session_num)
                        if ((ccptr->user.usernum == CC->user.usernum)
                           || (CC->user.axlevel >= AxAideU)) {
                                ret |= TERM_ALLOWED;
-                               ccptr->kill_me = 1;
+                               ccptr->kill_me = KILLME_ADMIN_TERMINATE;
                        }
                }
        }
@@ -292,7 +292,7 @@ void terminate_idle_sessions(void)
                && (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 
@@ -332,12 +332,16 @@ void terminate_stuck_sessions(void)
  */
 void RemoveContext (CitContext *con)
 {
+       const char *c;
        if (con==NULL) {
-               syslog(LOG_ERR,
-                       "WARNING: RemoveContext() called with NULL!\n");
+               syslog(LOG_ERR, "WARNING: RemoveContext() called with NULL!\n");
                return;
        }
-       syslog(LOG_DEBUG, "RemoveContext() session %d\n", con->cs_pid);
+       c = con->ServiceName;
+       if (c == NULL)
+               c = "WTF?";
+       syslog(LOG_DEBUG, "RemoveContext(%s) session %d\n", c, con->cs_pid);
+       cit_backtrace ();
 
        /* Run any cleanup routines registered by loadable modules.
         * Note: We have to "become_session()" because the cleanup functions
@@ -350,15 +354,8 @@ void RemoveContext (CitContext *con)
 
        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.
-        */
-       if (con->client_socket != 0)
-       {
-               syslog(LOG_DEBUG, "Closing socket %d\n", con->client_socket);
-               close(con->client_socket);
-       }
+       /* If the client is still connected, blow 'em away. */
+       client_close();
 
        /* If using AUTHMODE_LDAP, free the DN */
        if (con->ldap_dn) {
@@ -369,7 +366,7 @@ void RemoveContext (CitContext *con)
        FreeStrBuf(&con->MigrateBuf);
        FreeStrBuf(&con->RecvBuf.Buf);
        if (con->cached_msglist) {
-               seenit_free(&con->cached_msglist);
+               free(con->cached_msglist);
        }
 
        syslog(LOG_DEBUG, "Done with RemoveContext()\n");
@@ -583,7 +580,7 @@ void context_cleanup(void)
                rem = ptr->next;
                --num_sessions;
 
-               syslog(LOG_DEBUG, "Purging session #%d %s\n", ptr->cs_pid, ptr->ServiceName);
+               syslog(LOG_DEBUG, "context_cleanup(): Purging session #%d %s\n", ptr->cs_pid, ptr->ServiceName);
                RemoveContext(ptr);
                free (ptr);
                ptr = rem;
@@ -592,23 +589,6 @@ void context_cleanup(void)
 
 
 
-/*
- * 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
@@ -618,7 +598,7 @@ void kill_session(int session_to_kill) {
  */
 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 ) {
@@ -660,7 +640,7 @@ void dead_session_purge(int force) {
         * is allocated privately on this thread's stack.
         */
        while (rem != NULL) {
-               syslog(LOG_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;