/*
- * $Id: sysdep.c 7989 2009-10-31 15:29:37Z davew $
- *
* Citadel context management stuff.
* Here's where we (hopefully) have all the code that manipulates contexts.
*
#include <sys/socket.h>
#include <syslog.h>
#include <sys/syslog.h>
+/*
+#include <sys/syscall.h>
+*/
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
if (session_num == ccptr->cs_pid) {
ret |= TERM_FOUND;
if ((ccptr->user.usernum == CC->user.usernum)
- || (CC->user.axlevel >= 6)) {
+ || (CC->user.axlevel >= AxAideU)) {
ret |= TERM_ALLOWED;
ccptr->kill_me = 1;
}
CtdlLogPrintf(CTDL_INFO, "Didn't terminate %d protected idle sessions;\n", killed);
}
+void terminate_stuck_sessions(void)
+{
+ CitContext *ccptr;
+ int killed = 0;
+
+ begin_critical_section(S_SESSION_TABLE);
+ for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
+ if (ccptr->client_socket != -1)
+ {
+ close(ccptr->client_socket);
+ ccptr->client_socket = -1;
+ killed++;
+ }
+ }
+ end_critical_section(S_SESSION_TABLE);
+ if (killed > 0)
+ CtdlLogPrintf(CTDL_INFO, "Flushed %d stuck sessions\n", killed);
+}
+
/*
}
FreeStrBuf(&con->MigrateBuf);
- FreeStrBuf(&con->ReadBuf);
+ FreeStrBuf(&con->RecvBuf.Buf);
CtdlLogPrintf(CTDL_DEBUG, "Done with RemoveContext()\n");
}
return NULL;
}
memset(me, 0, sizeof(CitContext));
-
/* Give the contaxt a name. Hopefully makes it easier to track */
strcpy (me->user.fullname, "SYS_notauth");
* the list.
*/
me->MigrateBuf = NewStrBuf();
- me->ReadBuf = NewStrBuf();
+ me->RecvBuf.Buf = NewStrBuf();
begin_critical_section(S_SESSION_TABLE);
me->cs_pid = ++next_pid;
me->prev = NULL;
me->next = ContextList;
+ me->lastcmd = time(NULL); /* set lastcmd to now to prevent idle timer infanticide */
ContextList = me;
if (me->next != NULL) {
me->next->prev = me;
*/
void CtdlFillSystemContext(CitContext *context, char *name)
{
- char sysname[USERNAME_SIZE];
+ char sysname[SIZ];
+ long len;
memset(context, 0, sizeof(CitContext));
context->internal_pgm = 1;
context->cs_pid = 0;
strcpy (sysname, "SYS_");
strcat (sysname, name);
+ len = cutuserkey(sysname);
+ memcpy(context->curr_user, sysname, len + 1);
+ context->client_socket = (-1);
+
/* internal_create_user has the side effect of loading the user regardless of wether they
* already existed or needed to be created
*/
- internal_create_user (sysname, &(context->user), -1) ;
+ internal_create_user (sysname, len, &(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();
- CtdlLogPrintf(CTDL_DEBUG, "Upgrading system user \"%s\" from user number 0 to user number %d\n", context->user.fullname, context->user.usernum);
+ CtdlLogPrintf(CTDL_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);
}
}
+/*
+ * flush it again...
+ */
+void CtdlClearSystemContext(void)
+{
+ CitContext *CCC = MyContext();
+
+ memset(CCC, 0, sizeof(CitContext));
+ citthread_setspecific(MyConKey, NULL);
+}
+
/*
* Cleanup any contexts that are left lying around
*/
-/*
- * Bind a thread to a context. (It's inline merely to speed things up.)
- */
-INLINE void become_session(CitContext *which_con) {
- citthread_setspecific(MyConKey, (void *)which_con );
-}
-
/*
* Set the "async waiting" flag for a session, if applicable
{
CtdlLogPrintf(CTDL_DEBUG, "Setting async_waiting flag for session %d\n", ccptr->cs_pid);
if (ccptr->is_async) {
- ccptr->async_waiting = 1;
+ ccptr->async_waiting++;
if (ccptr->state == CON_IDLE) {
ccptr->state = CON_READY;
}