#include "housekeeping.h"
#include "modules/crypto/serv_crypto.h" /* Needed for init_ssl, client_write_ssl, client_read_ssl, destruct_ssl */
#include "ecrash.h"
+#include "context.h"
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif
-citthread_key_t MyConKey; /* TSD key for MyContext() */
-
int verbosity = DEFAULT_VERBOSITY; /* Logging level */
-struct CitContext masterCC;
-time_t last_purge = 0; /* Last dead session purge */
-int num_sessions = 0; /* Current number of sessions */
-
int syslog_facility = LOG_DAEMON;
int enable_syslog = 0;
-/* Flag for single user mode */
-static int want_single_user = 0;
-
-/* Try to go single user */
-
-int CtdlTrySingleUser(void)
-{
- int can_do = 0;
-
- begin_critical_section(S_SINGLE_USER);
- if (want_single_user)
- can_do = 0;
- else
- {
- can_do = 1;
- want_single_user = 1;
- }
- end_critical_section(S_SINGLE_USER);
- return can_do;
-}
-
-void CtdlEndSingleUser(void)
-{
- begin_critical_section(S_SINGLE_USER);
- want_single_user = 0;
- end_critical_section(S_SINGLE_USER);
-}
-
-
-int CtdlWantSingleUser(void)
-{
- return want_single_user;
-}
-
-int CtdlIsSingleUser(void)
-{
- if (want_single_user)
- {
- /* check for only one context here */
- if (num_sessions == 1)
- return TRUE;
- }
- return FALSE;
-}
-
-
/*
* CtdlLogPrintf() ... Write logging information
*/
struct timeval tv;
struct tm tim;
time_t unixtime;
+ CitContext *CCC = CC;
gettimeofday(&tv, NULL);
/* Promote to time_t; types differ on some OSes (like darwin) */
unixtime = tv.tv_sec;
localtime_r(&unixtime, &tim);
- if (CC->cs_pid != 0) {
+ if ((CCC != NULL) && (CCC->cs_pid != 0)) {
sprintf(buf,
"%04d/%02d/%02d %2d:%02d:%02d.%06ld [%3d] ",
tim.tm_year + 1900, tim.tm_mon + 1,
tim.tm_mday, tim.tm_hour, tim.tm_min,
tim.tm_sec, (long)tv.tv_usec,
- CC->cs_pid);
+ CCC->cs_pid);
} else {
sprintf(buf,
"%04d/%02d/%02d %2d:%02d:%02d.%06ld ",
volatile int running_as_daemon = 0;
static RETSIGTYPE signal_cleanup(int signum) {
-#ifdef THREADS_USESIGNALS
+
if (CT)
CT->signal = signum;
else
-#endif
{
CtdlLogPrintf(CTDL_DEBUG, "Caught signal %d; shutting down.\n", signum);
exit_signal = signum;
int s;
int i;
int actual_queue_len;
+#ifdef HAVE_STRUCT_UCRED
+ int passcred = 1;
+#endif
actual_queue_len = queue_len;
if (actual_queue_len < 5) actual_queue_len = 5;
return(-1);
}
+#ifdef HAVE_STRUCT_UCRED
+ setsockopt(s, SOL_SOCKET, SO_PASSCRED, &passcred, sizeof(passcred));
+#endif
+
chmod(sockpath, S_ISGID|S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IWGRP|S_IXGRP|S_IROTH|S_IWOTH|S_IXOTH);
return(s);
}
-/*
- * Return a pointer to the CitContext structure bound to the thread which
- * called this function. If there's no such binding (for example, if it's
- * called by the housekeeper thread) then a generic 'master' CC is returned.
- *
- * This function is used *VERY* frequently and must be kept small.
- */
-struct CitContext *MyContext(void) {
-
- register struct CitContext *c;
-
- return ((c = (struct CitContext *) citthread_getspecific(MyConKey),
- c == NULL) ? &masterCC : c
- );
-}
-
-
-/*
- * 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).
- */
-struct CitContext *CreateNewContext(void) {
- struct CitContext *me;
- static int next_pid = 0;
-
- me = (struct CitContext *) malloc(sizeof(struct CitContext));
- if (me == NULL) {
- CtdlLogPrintf(CTDL_ALERT, "citserver: can't allocate memory!!\n");
- return NULL;
- }
-
- memset(me, 0, sizeof(struct CitContext));
-
- /* Give the contaxt a name. Hopefully makes it easier to track */
- strcpy (me->user.fullname, "SYS_notauth");
-
- /* The new context will be created already in the CON_EXECUTING state
- * in order to prevent another thread from grabbing it while it's
- * being set up.
- */
- me->state = CON_EXECUTING;
- /*
- * Generate a unique session number and insert this context into
- * the list.
- */
- begin_critical_section(S_SESSION_TABLE);
- me->cs_pid = ++next_pid;
- me->prev = NULL;
- me->next = ContextList;
- ContextList = me;
- if (me->next != NULL) {
- me->next->prev = me;
- }
- ++num_sessions;
- end_critical_section(S_SESSION_TABLE);
- return (me);
-}
-
-
-struct CitContext *CtdlGetContextArray(int *count)
-{
- int nContexts, i;
- struct CitContext *nptr, *cptr;
-
- nContexts = num_sessions;
- nptr = malloc(sizeof(struct CitContext) * nContexts);
- if (!nptr)
- return NULL;
- begin_critical_section(S_SESSION_TABLE);
- for (cptr = ContextList, i=0; cptr != NULL && i < nContexts; cptr = cptr->next, i++)
- memcpy(&nptr[i], cptr, sizeof (struct CitContext));
- end_critical_section (S_SESSION_TABLE);
-
- *count = i;
- return nptr;
-}
-
-
-
-/**
- * This function fills in a context and its user field correctly
- * Then creates/loads that user
- */
-void CtdlFillSystemContext(struct CitContext *context, char *name)
-{
- char sysname[USERNAME_SIZE];
-
- memset(context, 0, sizeof(struct CitContext));
- context->internal_pgm = 1;
- context->cs_pid = 0;
- strcpy (sysname, "SYS_");
- strcat (sysname, name);
- /* 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) ;
-
- /* 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);
- /* add user to the database */
- putuser(&(context->user));
- cdb_store(CDB_USERSBYNUMBER, &(context->user.usernum), sizeof(long), context->user.fullname, strlen(context->user.fullname)+1);
- }
-}
-
/*
* The following functions implement output buffering on operating systems which
* support it (such as Linux and various BSD flavors).
void buffer_output(void) {
#ifdef HAVE_TCP_BUFFERING
- if (!CC->redirect_ssl) {
+#ifdef HAVE_OPENSSL
+ if (!CC->redirect_ssl)
+#endif
setsockopt(CC->client_socket, IPPROTO_TCP, TCP_CORK, &on, 4);
- }
#endif
}
void unbuffer_output(void) {
#ifdef HAVE_TCP_BUFFERING
- if (!CC->redirect_ssl) {
+#ifdef HAVE_OPENSSL
+ if (!CC->redirect_ssl)
+#endif
setsockopt(CC->client_socket, IPPROTO_TCP, TCP_CORK, &off, 4);
- }
#endif
}
int old_buffer_len = 0;
#endif
fd_set wset;
- t_context *Ctx;
+ CitContext *Ctx;
int fdflags;
Ctx = CC;
FD_ZERO(&wset);
FD_SET(Ctx->client_socket, &wset);
if (select(1, NULL, &wset, NULL, NULL) == -1) {
- CtdlLogPrintf(CTDL_ERR,
- "client_write(%d bytes) select failed: %s (%d)\n",
- nbytes - bytes_written,
- strerror(errno), errno);
- cit_backtrace();
- Ctx->kill_me = 1;
- return -1;
+ if (errno == EINTR)
+ {
+ CtdlLogPrintf(CTDL_DEBUG, "client_write(%d bytes) select() interrupted.\n", nbytes-bytes_written);
+ if (CtdlThreadCheckStop()) {
+ CC->kill_me = 1;
+ return (-1);
+ } else {
+ /* can't trust fd's and stuff so we need to re-create them */
+ continue;
+ }
+ } else {
+ CtdlLogPrintf(CTDL_ERR,
+ "client_write(%d bytes) select failed: %s (%d)\n",
+ nbytes - bytes_written,
+ strerror(errno), errno);
+ cit_backtrace();
+ Ctx->kill_me = 1;
+ return -1;
+ }
}
}
{
if (errno == EINTR)
{
- CtdlLogPrintf(CTDL_DEBUG, "Interrupted select().\n");
+ CtdlLogPrintf(CTDL_DEBUG, "Interrupted select() in client_read_to().\n");
+ if (CtdlThreadCheckStop()) {
+ CC->kill_me = 1;
+ return (-1);
+ } else {
+ /* can't trust fd's and stuff so we need to re-create them */
+ continue;
+ }
+ }
+ else {
+ CtdlLogPrintf(CTDL_DEBUG, "Failed select() in client_read_to().\n");
CC->kill_me = 1;
return (-1);
}
/*
* Cleanup any contexts that are left lying around
*/
-void context_cleanup(void)
-{
- struct CitContext *ptr = NULL;
- struct CitContext *rem = NULL;
-
- /*
- * Clean up the contexts.
- * There are no threads so no critical_section stuff is needed.
- */
- ptr = ContextList;
-
- /* We need to update the ContextList because some modules may want to itterate it
- * Question is should we NULL it before iterating here or should we just keep updating it
- * as we remove items?
- *
- * Answer is to NULL it first to prevent modules from doing any actions on the list at all
- */
- ContextList=NULL;
- while (ptr != NULL){
- /* Remove the session from the active list */
- rem = ptr->next;
- --num_sessions;
-
- CtdlLogPrintf(CTDL_DEBUG, "Purging session %d\n", ptr->cs_pid);
- RemoveContext(ptr);
- free (ptr);
- ptr = rem;
- }
-}
-
void close_masters (void)
CtdlDestroySessionHooks();
CtdlDestroyServiceHook();
CtdlDestroyRoomHooks();
- CtdlDestroyDirectoryServiceFuncs();
#ifdef HAVE_BACKTRACE
eCrash_Uninit();
#endif
-/*
- * 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) {
- struct 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);
-}
-
pid_t current_child;
void graceful_shutdown(int signum) {
kill(current_child, signum);
" The Citadel server process (citserver) terminated unexpectedly."
"\n \n"
" This could be the result of a bug in the server program, or some external "
- "factor. You can obtain more information about this by enabling core dumps. "
- "For more information, please see: "
- "http://citadel.org/doku.php/faq:mastering_your_os:gdb#how.do.i.make.my.system.produce.core-files"
+ "factor.\n \n"
+ " You can obtain more information about this by enabling core dumps.\n \n"
+ " For more information, please see:\n \n"
+ " http://citadel.org/doku.php/faq:mastering_your_os:gdb#how.do.i.make.my.system.produce.core-files"
"\n \n"
" If you have already done this, the core dump is likely to be found at %score.%d\n"
,
ctdl_run_dir, ForkedPid);
- aide_message(ChrPtr(CrashMail), "Citadel server process terminated unexpectedly");
+ CtdlAideMessage(ChrPtr(CrashMail), "Citadel server process terminated unexpectedly");
FreeStrBuf(&CrashMail);
}
}
}
}
-/*
- * Purge all sessions which have the 'kill_me' flag set.
- * This function has code to prevent it from running more than once every
- * few seconds, because running it after every single unbind would waste a lot
- * of CPU time and keep the context list locked too much. To force it to run
- * anyway, set "force" to nonzero.
- */
-void dead_session_purge(int force) {
- struct CitContext *ptr, *ptr2; /* general-purpose utility pointer */
- struct CitContext *rem = NULL; /* list of sessions to be destroyed */
-
- if (force == 0) {
- if ( (time(NULL) - last_purge) < 5 ) {
- return; /* Too soon, go away */
- }
- }
- time(&last_purge);
-
- if (try_critical_section(S_SESSION_TABLE))
- return;
-
- ptr = ContextList;
- while (ptr) {
- ptr2 = ptr;
- ptr = ptr->next;
-
- if ( (ptr2->state == CON_IDLE) && (ptr2->kill_me) ) {
- /* Remove the session from the active list */
- if (ptr2->prev) {
- ptr2->prev->next = ptr2->next;
- }
- else {
- ContextList = ptr2->next;
- }
- if (ptr2->next) {
- ptr2->next->prev = ptr2->prev;
- }
-
- --num_sessions;
- /* And put it on our to-be-destroyed list */
- ptr2->next = rem;
- rem = ptr2;
- }
- }
- end_critical_section(S_SESSION_TABLE);
-
- /* Now that we no longer have the session list locked, we can take
- * our time and destroy any sessions on the to-be-killed list, which
- * is allocated privately on this thread's stack.
- */
- while (rem != NULL) {
- CtdlLogPrintf(CTDL_DEBUG, "Purging session %d\n", rem->cs_pid);
- RemoveContext(rem);
- ptr = rem;
- rem = rem->next;
- free(ptr);
- }
-}
-
-
-
-
-
-/*
- * masterCC is the context we use when not attached to a session. This
- * function initializes it.
- */
-void InitializeMasterCC(void) {
- memset(&masterCC, 0, sizeof(struct CitContext));
- masterCC.internal_pgm = 1;
- masterCC.cs_pid = 0;
-}
-
-
-
-
-/*
- * Bind a thread to a context. (It's inline merely to speed things up.)
- */
-INLINE void become_session(struct CitContext *which_con) {
- citthread_setspecific(MyConKey, (void *)which_con );
-}
-
/*
*/
void *worker_thread(void *arg) {
- int i;
int highest;
- struct CitContext *ptr;
- struct CitContext *bind_me = NULL;
+ CitContext *ptr;
+ CitContext *bind_me = NULL;
fd_set readfds;
int retval = 0;
- struct CitContext *con= NULL; /* Temporary context pointer */
- struct ServiceFunctionHook *serviceptr;
- int ssock; /* Descriptor for client socket */
struct timeval tv;
int force_purge = 0;
- int m;
while (!CtdlThreadCheckStop()) {
begin_critical_section(S_SESSION_TABLE);
for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
- if (ptr->state == CON_IDLE) {
+ /* Dont select on dead sessions only truly idle ones */
+ if ((ptr->state == CON_IDLE)) {
FD_SET(ptr->client_socket, &readfds);
if (ptr->client_socket > highest)
highest = ptr->client_socket;
if ((bind_me == NULL) && (ptr->state == CON_READY)) {
bind_me = ptr;
ptr->state = CON_EXECUTING;
+ break;
+ }
+ if ((bind_me == NULL) && (ptr->state == CON_STARTING)) {
+ bind_me = ptr;
+ break;
}
}
end_critical_section(S_SESSION_TABLE);
* ahead and get ready to select().
*/
+ if (!CtdlThreadCheckStop()) {
+ tv.tv_sec = 1; /* wake up every second if no input */
+ tv.tv_usec = 0;
+ retval = CtdlThreadSelect(highest + 1, &readfds, NULL, NULL, &tv);
+ }
+ else
+ return NULL;
+
+ /* Now figure out who made this select() unblock.
+ * First, check for an error or exit condition.
+ */
+ if (retval < 0) {
+ if (errno == EBADF) {
+ CtdlLogPrintf(CTDL_NOTICE, "select() failed: (%s)\n",
+ strerror(errno));
+ goto do_select;
+ }
+ if (errno != EINTR) {
+ CtdlLogPrintf(CTDL_EMERG, "Exiting (%s)\n", strerror(errno));
+ CtdlThreadStopAll();
+ continue;
+ } else {
+ CtdlLogPrintf(CTDL_DEBUG, "Interrupted CtdlThreadSelect.\n");
+ if (CtdlThreadCheckStop()) return(NULL);
+ goto do_select;
+ }
+ }
+ else if(retval == 0) {
+ if (CtdlThreadCheckStop()) return(NULL);
+ }
+
+ /* It must be a client socket. Find a context that has data
+ * waiting on its socket *and* is in the CON_IDLE state. Any
+ * active sockets other than our chosen one are marked as
+ * CON_READY so the next thread that comes around can just bind
+ * to one without having to select() again.
+ */
+ begin_critical_section(S_SESSION_TABLE);
+ for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
+ if ( (FD_ISSET(ptr->client_socket, &readfds))
+ && (ptr->state != CON_EXECUTING) ) {
+ ptr->input_waiting = 1;
+ if (!bind_me) {
+ bind_me = ptr; /* I choose you! */
+ bind_me->state = CON_EXECUTING;
+ }
+ else {
+ ptr->state = CON_READY;
+ }
+ }
+ }
+ end_critical_section(S_SESSION_TABLE);
+
+SKIP_SELECT:
+ /* We're bound to a session */
+ if (bind_me != NULL) {
+ become_session(bind_me);
+
+ if (bind_me->state == CON_STARTING) {
+ bind_me->state = CON_EXECUTING;
+ begin_session(bind_me);
+ bind_me->h_greeting_function();
+ }
+ /* If the client has sent a command, execute it. */
+ if (CC->input_waiting) {
+ CC->h_command_function();
+ CC->input_waiting = 0;
+ }
+
+ /* If there are asynchronous messages waiting and the
+ * client supports it, do those now */
+ if ((CC->is_async) && (CC->async_waiting)
+ && (CC->h_async_function != NULL)) {
+ CC->h_async_function();
+ CC->async_waiting = 0;
+ }
+
+ force_purge = CC->kill_me;
+ become_session(NULL);
+ bind_me->state = CON_IDLE;
+ }
+
+ dead_session_purge(force_purge);
+ do_housekeeping();
+ }
+ /* If control reaches this point, the server is shutting down */
+ return(NULL);
+}
+
+
+
+
+/*
+ * A function to handle selecting on master sockets.
+ * In other words it handles new connections.
+ * It is a thread.
+ */
+void *select_on_master (void *arg)
+{
+ struct ServiceFunctionHook *serviceptr;
+ fd_set master_fds;
+ int highest;
+ struct timeval tv;
+ int ssock; /* Descriptor for client socket */
+ CitContext *con= NULL; /* Temporary context pointer */
+ int m;
+ int i;
+ int retval;
+
+ while (!CtdlThreadCheckStop()) {
+ /* Initialize the fdset. */
+ FD_ZERO(&master_fds);
+ highest = 0;
+
/* First, add the various master sockets to the fdset. */
for (serviceptr = ServiceHookTable; serviceptr != NULL;
serviceptr = serviceptr->next ) {
m = serviceptr->msock;
- FD_SET(m, &readfds);
+ FD_SET(m, &master_fds);
if (m > highest) {
highest = m;
}
}
if (!CtdlThreadCheckStop()) {
- tv.tv_sec = 1; /* wake up every second if no input */
+ tv.tv_sec = 60; /* wake up every second if no input */
tv.tv_usec = 0;
- retval = CtdlThreadSelect(highest + 1, &readfds, NULL, NULL, &tv);
+ retval = CtdlThreadSelect(highest + 1, &master_fds, NULL, NULL, &tv);
}
else
return NULL;
if (errno == EBADF) {
CtdlLogPrintf(CTDL_NOTICE, "select() failed: (%s)\n",
strerror(errno));
- goto do_select;
+ continue;
}
if (errno != EINTR) {
CtdlLogPrintf(CTDL_EMERG, "Exiting (%s)\n", strerror(errno));
} else {
CtdlLogPrintf(CTDL_DEBUG, "Interrupted CtdlThreadSelect.\n");
if (CtdlThreadCheckStop()) return(NULL);
- goto do_select;
+ continue;
}
}
else if(retval == 0) {
if (CtdlThreadCheckStop()) return(NULL);
- goto SKIP_SELECT;
+ continue;
}
/* Next, check to see if it's a new client connecting
* on a master socket.
else for (serviceptr = ServiceHookTable; serviceptr != NULL;
serviceptr = serviceptr->next ) {
- if (FD_ISSET(serviceptr->msock, &readfds)) {
+ if (FD_ISSET(serviceptr->msock, &master_fds)) {
ssock = accept(serviceptr->msock, NULL, 0);
if (ssock >= 0) {
CtdlLogPrintf(CTDL_DEBUG,
serviceptr->h_command_function;
con->h_async_function =
serviceptr->h_async_function;
+ con->h_greeting_function = serviceptr->h_greeting_function;
con->ServiceName =
serviceptr->ServiceName;
SO_REUSEADDR,
&i, sizeof(i));
- become_session(con);
- begin_session(con);
- serviceptr->h_greeting_function();
- become_session(NULL);
- con->state = CON_IDLE;
- goto do_select;
- }
- }
- }
+ con->state = CON_STARTING;
- /* It must be a client socket. Find a context that has data
- * waiting on its socket *and* is in the CON_IDLE state. Any
- * active sockets other than our chosen one are marked as
- * CON_READY so the next thread that comes around can just bind
- * to one without having to select() again.
- */
- begin_critical_section(S_SESSION_TABLE);
- for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
- if ( (FD_ISSET(ptr->client_socket, &readfds))
- && (ptr->state != CON_EXECUTING) ) {
- ptr->input_waiting = 1;
- if (!bind_me) {
- bind_me = ptr; /* I choose you! */
- bind_me->state = CON_EXECUTING;
- }
- else {
- ptr->state = CON_READY;
+ retval--;
+ if (retval == 0)
+ break;
}
}
}
- end_critical_section(S_SESSION_TABLE);
-
-SKIP_SELECT:
- /* We're bound to a session */
- if (bind_me != NULL) {
- become_session(bind_me);
-
- /* If the client has sent a command, execute it. */
- if (CC->input_waiting) {
- CC->h_command_function();
- CC->input_waiting = 0;
- }
-
- /* If there are asynchronous messages waiting and the
- * client supports it, do those now */
- if ((CC->is_async) && (CC->async_waiting)
- && (CC->h_async_function != NULL)) {
- CC->h_async_function();
- CC->async_waiting = 0;
- }
-
- force_purge = CC->kill_me;
- become_session(NULL);
- bind_me->state = CON_IDLE;
- }
-
- dead_session_purge(force_purge);
- do_housekeeping();
}
- /* If control reaches this point, the server is shutting down */
- return(NULL);
+ return NULL;
}
-
/*
* SyslogFacility()
* Translate text facility name to syslog.h defined value.
projects / citadel.git / blobdiff