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) {
}
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)
+{
+ 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)
+ 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. */
- CtdlLogPrintf(CTDL_DEBUG, "Closing socket %d\n", con->client_socket);
- close(con->client_socket);
+ /*
+ * 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 using AUTHMODE_LDAP, free the DN */
if (con->ldap_dn) {
}
FreeStrBuf(&con->MigrateBuf);
- FreeStrBuf(&con->ReadBuf);
- CtdlLogPrintf(CTDL_DEBUG, "Done with RemoveContext()\n");
+ FreeStrBuf(&con->RecvBuf.Buf);
+ 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));
* 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;
}
+/*
+ * Initialize a new context and place it in the list. The session number
+ * used to be the PID (which is why it's called cs_pid), but that was when we
+ * had one process per session. Now we just assign them sequentially, starting
+ * at 1 (don't change it to 0 because masterCC uses 0).
+ */
+CitContext *CloneContext(CitContext *CloneMe) {
+ CitContext *me;
+ static int next_pid = 0;
+
+ me = (CitContext *) malloc(sizeof(CitContext));
+ if (me == NULL) {
+ syslog(LOG_ALERT, "citserver: can't allocate memory!!\n");
+ return NULL;
+ }
+ memcpy(me, CloneMe, sizeof(CitContext));
+
+ memset(&me->RecvBuf, 0, sizeof(IOBuffer));
+ memset(&me->SendBuf, 0, sizeof(IOBuffer));
+ memset(&me->SBuf, 0, sizeof(IOBuffer));
+ me->MigrateBuf = NULL;
+ me->sMigrateBuf = NULL;
+ me->redirect_buffer = NULL;
+#ifdef HAVE_OPENSSL
+ me->ssl = NULL;
+#endif
+
+ me->download_fp = NULL;
+ me->upload_fp = NULL;
+ /// TODO: what about the room/user?
+ me->ma = NULL;
+ me->openid_data = NULL;
+ 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;
+ 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;
+ }
+ ++num_sessions;
+ }
+ end_critical_section(S_SESSION_TABLE);
+ return (me);
+}
+
+
/*
* Return an array containing a copy of the context list.
* This allows worker threads to perform "for each context" operations without
strcat (sysname, name);
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 %d\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, "Purging session #%d %s\n", ptr->cs_pid, ptr->ServiceName);
RemoveContext(ptr);
free (ptr);
ptr = rem;
* is allocated privately on this thread's stack.
*/
while (rem != NULL) {
- CtdlLogPrintf(CTDL_DEBUG, "Purging session %d\n", rem->cs_pid);
+ syslog(LOG_DEBUG, "Purging session %d\n", rem->cs_pid);
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