*
*/
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/socket.h>
+#include <syslog.h>
#include <sys/syslog.h>
#if TIME_WITH_SYS_TIME
#include <limits.h>
#include <sys/resource.h>
#include <netinet/in.h>
+#include <netinet/tcp.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <sys/un.h>
#endif
#include "citadel.h"
#include "server.h"
-#include "serv_extensions.h"
#include "sysdep_decls.h"
#include "citserver.h"
#include "support.h"
#include "database.h"
#include "housekeeping.h"
#include "tools.h"
-#include "serv_crypto.h"
+#include "modules/crypto/serv_crypto.h" /* Needed for init_ssl, client_write_ssl, client_read_ssl, destruct_ssl */
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
static int num_threads = 0; /* Current number of threads */
int num_sessions = 0; /* Current number of sessions */
-int syslog_facility = (-1);
+int syslog_facility = LOG_DAEMON;
+int enable_syslog = 0;
+void DestroyWorkerList(void);
/*
* lprintf() ... Write logging information
- *
- * Note: the variable "buf" below needs to be large enough to handle any
- * log data sent through this function. BE CAREFUL!
*/
void lprintf(enum LogLevel loglevel, const char *format, ...) {
va_list arg_ptr;
- char buf[SIZ];
- va_start(arg_ptr, format);
- vsnprintf(buf, sizeof(buf), format, arg_ptr);
- va_end(arg_ptr);
-
- if (syslog_facility >= 0) {
- if (loglevel <= verbosity) {
- /* Hackery -IO */
- if (CC->cs_pid != 0) {
- memmove(&buf[6], buf, sizeof(buf) - 6);
- snprintf(buf, 6, "[%3d]", CC->cs_pid);
- buf[5] = ' ';
- }
- syslog(loglevel, "%s", buf);
- }
+ if (enable_syslog) {
+ va_start(arg_ptr, format);
+ vsyslog((syslog_facility | loglevel), format, arg_ptr);
+ va_end(arg_ptr);
}
- else if (loglevel <= verbosity) {
+
+ /* stderr output code */
+ if (enable_syslog || running_as_daemon) return;
+
+ /* if we run in forground and syslog is disabled, log to terminal */
+ if (loglevel <= verbosity) {
struct timeval tv;
struct tm tim;
time_t unixtime;
localtime_r(&unixtime, &tim);
if (CC->cs_pid != 0) {
fprintf(stderr,
- "%04d/%02d/%02d %2d:%02d:%02d.%06ld [%3d] %s",
+ "%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, buf);
+ CC->cs_pid);
} else {
fprintf(stderr,
- "%04d/%02d/%02d %2d:%02d:%02d.%06ld %s",
+ "%04d/%02d/%02d %2d:%02d:%02d.%06ld ",
tim.tm_year + 1900, tim.tm_mon + 1,
tim.tm_mday, tim.tm_hour, tim.tm_min,
- tim.tm_sec, (long)tv.tv_usec, buf);
+ tim.tm_sec, (long)tv.tv_usec);
}
+ va_start(arg_ptr, format);
+ vfprintf(stderr, format, arg_ptr);
+ va_end(arg_ptr);
fflush(stderr);
}
-
- PerformLogHooks(loglevel, buf);
}
/*
- * We used to use master_cleanup() as a signal handler to shut down the server.
- * however, master_cleanup() and the functions it calls do some things that
- * aren't such a good idea to do from a signal handler: acquiring mutexes,
- * playing with signal masks on BSDI systems, etc. so instead we install the
- * following signal handler to set a global variable to inform the main loop
- * that it's time to call master_cleanup() and exit.
+ * Signal handler to shut down the server.
*/
volatile int time_to_die = 0;
+volatile int shutdown_and_halt = 0;
+volatile int restart_server = 0;
+volatile int running_as_daemon = 0;
static RETSIGTYPE signal_cleanup(int signum) {
+ lprintf(CTDL_DEBUG, "Caught signal %d; shutting down.\n", signum);
time_to_die = 1;
+ master_cleanup(signum);
}
-
/*
* Some initialization stuff...
*/
void init_sysdep(void) {
int i;
+ sigset_t set;
/* Avoid vulnerabilities related to FD_SETSIZE if we can. */
#ifdef FD_SETSIZE
* session to which the calling thread is currently bound.
*/
if (pthread_key_create(&MyConKey, NULL) != 0) {
- lprintf(CTDL_CRIT, "Can't create TSD key!! %s\n", strerror(errno));
+ lprintf(CTDL_CRIT, "Can't create TSD key: %s\n",
+ strerror(errno));
}
/*
* The action for unexpected signals and exceptions should be to
* call signal_cleanup() to gracefully shut down the server.
*/
+ sigemptyset(&set);
+ sigaddset(&set, SIGINT);
+ sigaddset(&set, SIGQUIT);
+ sigaddset(&set, SIGHUP);
+ sigaddset(&set, SIGTERM);
+ // sigaddset(&set, SIGSEGV); commented out because
+ // sigaddset(&set, SIGILL); we want core dumps
+ // sigaddset(&set, SIGBUS);
+ sigprocmask(SIG_UNBLOCK, &set, NULL);
+
signal(SIGINT, signal_cleanup);
signal(SIGQUIT, signal_cleanup);
signal(SIGHUP, signal_cleanup);
signal(SIGTERM, signal_cleanup);
+ // signal(SIGSEGV, signal_cleanup); commented out because
+ // signal(SIGILL, signal_cleanup); we want core dumps
+ // signal(SIGBUS, signal_cleanup);
/*
* Do not shut down the server on broken pipe signals, otherwise the
#ifdef DEBUG_MEMORY_LEAKS
&& (which_one != S_DEBUGMEMLEAKS)
#endif
+ && (which_one != S_RPLIST)
) {
cdb_check_handles();
}
* a TCP port. The server shuts down if the bind fails.
*
*/
-int ig_tcp_server(char *ip_addr, int port_number, int queue_len)
+int ig_tcp_server(char *ip_addr, int port_number, int queue_len, char **errormessage)
{
struct sockaddr_in sin;
int s, i;
sin.sin_addr.s_addr = inet_addr(ip_addr);
}
- if (sin.sin_addr.s_addr == INADDR_NONE) {
+ if (sin.sin_addr.s_addr == !INADDR_ANY) {
sin.sin_addr.s_addr = INADDR_ANY;
}
s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
if (s < 0) {
- lprintf(CTDL_EMERG, "citserver: Can't create a socket: %s\n",
- strerror(errno));
+ *errormessage = (char*) malloc(SIZ + 1);
+ snprintf(*errormessage, SIZ,
+ "citserver: Can't create a socket: %s",
+ strerror(errno));
+ lprintf(CTDL_EMERG, "%s\n", *errormessage);
return(-1);
}
setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i));
if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
- lprintf(CTDL_EMERG, "citserver: Can't bind: %s\n",
- strerror(errno));
+ *errormessage = (char*) malloc(SIZ + 1);
+ snprintf(*errormessage, SIZ,
+ "citserver: Can't bind: %s",
+ strerror(errno));
+ lprintf(CTDL_EMERG, "%s\n", *errormessage);
+ close(s);
+ return(-1);
+ }
+
+ /* set to nonblock - we need this for some obscure situations */
+ if (fcntl(s, F_SETFL, O_NONBLOCK) < 0) {
+ *errormessage = (char*) malloc(SIZ + 1);
+ snprintf(*errormessage, SIZ,
+ "citserver: Can't set socket to non-blocking: %s",
+ strerror(errno));
+ lprintf(CTDL_EMERG, "%s\n", *errormessage);
close(s);
return(-1);
}
if (listen(s, actual_queue_len) < 0) {
- lprintf(CTDL_EMERG, "citserver: Can't listen: %s\n", strerror(errno));
+ *errormessage = (char*) malloc(SIZ + 1);
+ snprintf(*errormessage, SIZ,
+ "citserver: Can't listen: %s",
+ strerror(errno));
+ lprintf(CTDL_EMERG, "%s\n", *errormessage);
close(s);
return(-1);
}
/*
* Create a Unix domain socket and listen on it
*/
-int ig_uds_server(char *sockpath, int queue_len)
+int ig_uds_server(char *sockpath, int queue_len, char **errormessage)
{
struct sockaddr_un addr;
int s;
i = unlink(sockpath);
if (i != 0) if (errno != ENOENT) {
- lprintf(CTDL_EMERG, "citserver: can't unlink %s: %s\n",
+ *errormessage = (char*) malloc(SIZ + 1);
+ snprintf(*errormessage, SIZ, "citserver: can't unlink %s: %s",
sockpath, strerror(errno));
+ lprintf(CTDL_EMERG, "%s\n", *errormessage);
return(-1);
}
s = socket(AF_UNIX, SOCK_STREAM, 0);
if (s < 0) {
- lprintf(CTDL_EMERG, "citserver: Can't create a socket: %s\n",
- strerror(errno));
+ *errormessage = (char*) malloc(SIZ + 1);
+ snprintf(*errormessage, SIZ,
+ "citserver: Can't create a socket: %s",
+ strerror(errno));
+ lprintf(CTDL_EMERG, "%s\n", *errormessage);
return(-1);
}
if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
- lprintf(CTDL_EMERG, "citserver: Can't bind: %s\n",
- strerror(errno));
+ *errormessage = (char*) malloc(SIZ + 1);
+ snprintf(*errormessage, SIZ,
+ "citserver: Can't bind: %s",
+ strerror(errno));
+ lprintf(CTDL_EMERG, "%s\n", *errormessage);
+ return(-1);
+ }
+
+ /* set to nonblock - we need this for some obscure situations */
+ if (fcntl(s, F_SETFL, O_NONBLOCK) < 0) {
+ *errormessage = (char*) malloc(SIZ + 1);
+ snprintf(*errormessage, SIZ,
+ "citserver: Can't set socket to non-blocking: %s",
+ strerror(errno));
+ lprintf(CTDL_EMERG, "%s\n", *errormessage);
+ close(s);
return(-1);
}
if (listen(s, actual_queue_len) < 0) {
- lprintf(CTDL_EMERG, "citserver: Can't listen: %s\n", strerror(errno));
+ *errormessage = (char*) malloc(SIZ + 1);
+ snprintf(*errormessage, SIZ,
+ "citserver: Can't listen: %s",
+ strerror(errno));
+ lprintf(CTDL_EMERG, "%s\n", *errormessage);
return(-1);
}
* 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) and re-using them when
- * sessions terminate.
+ * at 1 (don't change it to 0 because masterCC uses 0).
*/
struct CitContext *CreateNewContext(void) {
- struct CitContext *me, *ptr;
+ struct CitContext *me;
+ static int next_pid = 0;
me = (struct CitContext *) malloc(sizeof(struct CitContext));
if (me == NULL) {
*/
me->state = CON_EXECUTING;
-
/*
* Generate a unique session number and insert this context into
* the list.
*/
begin_critical_section(S_SESSION_TABLE);
-
- if (ContextList == NULL) {
- ContextList = me;
- me->cs_pid = 1;
- me->next = NULL;
- }
-
- else if (ContextList->cs_pid > 1) {
- me->next = ContextList;
- ContextList = me;
- me->cs_pid = 1;
+ me->cs_pid = ++next_pid;
+ me->prev = NULL;
+ me->next = ContextList;
+ ContextList = me;
+ if (me->next != NULL) {
+ me->next->prev = me;
}
-
- else {
- for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
- if (ptr->next == NULL) {
- ptr->next = me;
- me->cs_pid = ptr->cs_pid + 1;
- me->next = NULL;
- goto DONE;
- }
- else if (ptr->next->cs_pid > (ptr->cs_pid+1)) {
- me->next = ptr->next;
- ptr->next = me;
- me->cs_pid = ptr->cs_pid + 1;
- goto DONE;
- }
- }
- }
-
-DONE: ++num_sessions;
+ ++num_sessions;
end_critical_section(S_SESSION_TABLE);
return(me);
}
/*
- * buffer_output() ... tell client_write to buffer all output until
- * instructed to dump it all out later
+ * The following functions implement output buffering. If the kernel supplies
+ * native TCP buffering (Linux & *BSD), use that; otherwise, emulate it with
+ * user-space buffering.
*/
+#ifndef HAVE_DARWIN
+#ifdef TCP_CORK
+# define HAVE_TCP_BUFFERING
+#else
+# ifdef TCP_NOPUSH
+# define HAVE_TCP_BUFFERING
+# define TCP_CORK TCP_NOPUSH
+# endif
+#endif /* TCP_CORK */
+#endif /* HAVE_DARWIN */
+
+#ifdef HAVE_TCP_BUFFERING
+static unsigned on = 1, off = 0;
+void buffer_output(void) {
+ struct CitContext *ctx = MyContext();
+ setsockopt(ctx->client_socket, IPPROTO_TCP, TCP_CORK, &on, 4);
+ ctx->buffering = 1;
+}
+
+void unbuffer_output(void) {
+ struct CitContext *ctx = MyContext();
+ setsockopt(ctx->client_socket, IPPROTO_TCP, TCP_CORK, &off, 4);
+ ctx->buffering = 0;
+}
+
+void flush_output(void) {
+ struct CitContext *ctx = MyContext();
+ setsockopt(ctx->client_socket, IPPROTO_TCP, TCP_CORK, &off, 4);
+ setsockopt(ctx->client_socket, IPPROTO_TCP, TCP_CORK, &on, 4);
+}
+#elif HAVE_DARWIN
+/* Stub functions for Darwin/OS X where TCP buffering isn't liked at all */
+void buffer_output(void) {
+CC->buffering = 0;
+}
+void unbuffer_output(void) {
+CC->buffering = 0;
+}
+void flush_output(void) {
+}
+#else
void buffer_output(void) {
if (CC->buffering == 0) {
CC->buffering = 1;
}
}
-/*
- * flush_output() ... dump out all that output we've been buffering.
- */
void flush_output(void) {
if (CC->buffering == 1) {
client_write(CC->output_buffer, CC->buffer_len);
}
}
-/*
- * unbuffer_output() ... stop buffering output.
- */
void unbuffer_output(void) {
if (CC->buffering == 1) {
CC->buffering = 0;
CC->output_buffer = NULL;
}
}
+#endif
{
int bytes_written = 0;
int retval;
- int sock;
+#ifndef HAVE_TCP_BUFFERING
int old_buffer_len = 0;
+#endif
- if (CC->redirect_fp != NULL) {
- fwrite(buf, (size_t)nbytes, (size_t)1, CC->redirect_fp);
+ if (CC->redirect_buffer != NULL) {
+ if ((CC->redirect_len + nbytes + 2) >= CC->redirect_alloc) {
+ CC->redirect_alloc = (CC->redirect_alloc * 2) + nbytes;
+ CC->redirect_buffer = realloc(CC->redirect_buffer,
+ CC->redirect_alloc);
+ }
+ memcpy(&CC->redirect_buffer[CC->redirect_len], buf, nbytes);
+ CC->redirect_len += nbytes;
+ CC->redirect_buffer[CC->redirect_len] = 0;
return;
}
- if (CC->redirect_sock > 0) {
- sock = CC->redirect_sock; /* and continue below... */
- }
- else {
- sock = CC->client_socket;
- }
-
+#ifndef HAVE_TCP_BUFFERING
/* If we're buffering for later, do that now. */
if (CC->buffering) {
old_buffer_len = CC->buffer_len;
memcpy(&CC->output_buffer[old_buffer_len], buf, nbytes);
return;
}
+#endif
/* Ok, at this point we're not buffering. Go ahead and write. */
#endif
while (bytes_written < nbytes) {
- retval = write(sock, &buf[bytes_written],
+ retval = write(CC->client_socket, &buf[bytes_written],
nbytes - bytes_written);
if (retval < 1) {
- lprintf(CTDL_ERR, "client_write() failed: %s\n",
- strerror(errno));
- if (sock == CC->client_socket) CC->kill_me = 1;
+ lprintf(CTDL_ERR,
+ "client_write(%d bytes) failed: %s (%d)\n",
+ nbytes - bytes_written,
+ strerror(errno), errno);
+ CC->kill_me = 1;
return;
}
bytes_written = bytes_written + retval;
*/
void cprintf(const char *format, ...) {
va_list arg_ptr;
- char buf[SIZ];
+ char buf[1024];
va_start(arg_ptr, format);
if (vsnprintf(buf, sizeof buf, format, arg_ptr) == -1)
rlen = read(CC->client_socket, &buf[len], bytes-len);
if (rlen<1) {
- lprintf(CTDL_ERR, "client_read() failed: %s\n",
- strerror(errno));
+ /* The socket has been disconnected! */
CC->kill_me = 1;
return(-1);
}
/*
- * client_gets() ... Get a LF-terminated line of text from the client.
+ * client_getln() ... Get a LF-terminated line of text from the client.
* (This is implemented in terms of client_read() and could be
* justifiably moved out of sysdep.c)
*/
-int client_gets(char *buf)
+int client_getln(char *buf, int bufsize)
{
int i, retval;
*/
for (i = 0;;i++) {
retval = client_read(&buf[i], 1);
- if (retval != 1 || buf[i] == '\n' || i == (SIZ-1))
+ if (retval != 1 || buf[i] == '\n' || i == (bufsize-1))
break;
}
/* If we got a long line, discard characters until the newline.
*/
- if (i == (SIZ-1))
+ if (i == (bufsize-1))
while (buf[i] != '\n' && retval == 1)
retval = client_read(&buf[i], 1);
- /* Strip the trailing newline and any trailing nonprintables (cr's)
+ /* Strip the trailing LF, and the trailing CR if present.
*/
buf[i] = 0;
- while ((strlen(buf)>0)&&(!isprint(buf[strlen(buf)-1])))
+ while ( (!IsEmptyStr(buf)) && ((buf[strlen(buf)-1]==10) || (buf[strlen(buf)-1] == 13)) ) {
buf[strlen(buf)-1] = 0;
- if (retval < 0) strcpy(buf, "000");
+ }
+ if (retval < 0) safestrncpy(buf, "000", bufsize);
return(retval);
}
void sysdep_master_cleanup(void) {
struct ServiceFunctionHook *serviceptr;
+///// DestroyWorkerList();
/*
* close all protocol master sockets
*/
unlink(serviceptr->sockpath);
}
}
+#ifdef HAVE_OPENSSL
+ destruct_ssl();
+#endif
+ serv_calendar_destroy();
+ CtdlDestroyProtoHooks();
+ CtdlDestroyDeleteHooks();
+ CtdlDestroyXmsgHooks();
+ CtdlDestroyNetprocHooks();
+ CtdlDestroyUserHooks();
+ CtdlDestroyMessageHook();
+ CtdlDestroyCleanupHooks();
+ CtdlDestroyFixedOutputHooks();
+ CtdlDestroySessionHooks();
+ CtdlDestroyServiceHook();
}
+
+
/*
* Terminate another session.
* (This could justifiably be moved out of sysdep.c because it
end_critical_section(S_SESSION_TABLE);
}
-
+pid_t current_child;
+void graceful_shutdown(int signum) {
+ kill(current_child, signum);
+ unlink(file_pid_file);
+ exit(0);
+}
/*
- * Start running as a daemon. Only close stdio if do_close_stdio is set.
+ * Start running as a daemon.
*/
-void start_daemon(int do_close_stdio) {
- if (do_close_stdio) {
- /* close(0); */
- close(1);
- close(2);
+void start_daemon(int unused) {
+ int status = 0;
+ pid_t child = 0;
+ FILE *fp;
+ int do_restart = 0;
+
+ current_child = 0;
+
+ /* Close stdin/stdout/stderr and replace them with /dev/null.
+ * We don't just call close() because we don't want these fd's
+ * to be reused for other files.
+ */
+ chdir(ctdl_run_dir);
+
+ child = fork();
+ if (child != 0) {
+ exit(0);
}
- signal(SIGHUP,SIG_IGN);
- signal(SIGINT,SIG_IGN);
- signal(SIGQUIT,SIG_IGN);
- if (fork()!=0) exit(0);
+
+ signal(SIGHUP, SIG_IGN);
+ signal(SIGINT, SIG_IGN);
+ signal(SIGQUIT, SIG_IGN);
+
+ setsid();
+ umask(0);
+ freopen("/dev/null", "r", stdin);
+ freopen("/dev/null", "w", stdout);
+ freopen("/dev/null", "w", stderr);
+
+ do {
+ current_child = fork();
+
+ signal(SIGTERM, graceful_shutdown);
+
+ if (current_child < 0) {
+ perror("fork");
+ exit(errno);
+ }
+
+ else if (current_child == 0) {
+ return; /* continue starting citadel. */
+ }
+
+ else {
+ fp = fopen(file_pid_file, "w");
+ if (fp != NULL) {
+ fprintf(fp, ""F_PID_T"\n", child);
+ fclose(fp);
+ }
+ waitpid(current_child, &status, 0);
+ }
+
+ do_restart = 0;
+
+ /* Did the main process exit with an actual exit code? */
+ if (WIFEXITED(status)) {
+
+ /* Exit code 0 means the watcher should exit */
+ if (WEXITSTATUS(status) == 0) {
+ do_restart = 0;
+ }
+
+ /* Exit code 101-109 means the watcher should exit */
+ else if ( (WEXITSTATUS(status) >= 101) && (WEXITSTATUS(status) <= 109) ) {
+ do_restart = 0;
+ }
+
+ /* Any other exit code means we should restart. */
+ else {
+ do_restart = 1;
+ }
+ }
+
+ /* Any other type of termination (signals, etc.) should also restart. */
+ else {
+ do_restart = 1;
+ }
+
+ } while (do_restart);
+
+ unlink(file_pid_file);
+ exit(WEXITSTATUS(status));
}
return;
}
- /* Our per-thread stacks need to be bigger than the default size, otherwise
- * the MIME parser crashes on FreeBSD, and the IMAP service crashes on
- * 64-bit Linux.
+ /* Our per-thread stacks need to be bigger than the default size,
+ * otherwise the MIME parser crashes on FreeBSD, and the IMAP service
+ * crashes on 64-bit Linux.
*/
- if ((ret = pthread_attr_setstacksize(&attr, 1024 * 1024))) {
- lprintf(CTDL_EMERG, "pthread_attr_setstacksize: %s\n", strerror(ret));
+ if ((ret = pthread_attr_setstacksize(&attr, THREADSTACKSIZE))) {
+ lprintf(CTDL_EMERG, "pthread_attr_setstacksize: %s\n",
+ strerror(ret));
time_to_die = -1;
pthread_attr_destroy(&attr);
return;
pthread_attr_destroy(&attr);
}
+void DestroyWorkerList(void)
+{
+ struct CitContext *ptr; /* general-purpose utility pointer */
+ struct CitContext *rem = NULL; /* list of sessions to be destroyed */
+
+ begin_critical_section(S_SESSION_TABLE);
+ ptr = ContextList;
+ while (ptr != NULL){
+ /* Remove the session from the active list */
+ rem = ptr->next;
+ --num_sessions;
+
+ lprintf(CTDL_DEBUG, "Purging session %d\n", rem->cs_pid);
+ end_critical_section(S_SESSION_TABLE);
+ RemoveContext(ptr);
+ begin_critical_section(S_SESSION_TABLE);
+ free (ptr);
+ ptr = rem;
+ }
+ end_critical_section(S_SESSION_TABLE);
+
+ struct worker_node *cur, *p;
+ cur = worker_list;
+ while (cur != NULL)
+ {
+ p = cur->next;
+ free (cur);
+ cur = p;
+ }
+ worker_list = NULL;
+}
+
+/*
+ * Create the maintenance threads and begin their operation.
+ */
+void create_maintenance_threads(void) {
+ int ret;
+ pthread_attr_t attr;
+
+ if ((ret = pthread_attr_init(&attr))) {
+ lprintf(CTDL_EMERG, "pthread_attr_init: %s\n", strerror(ret));
+ time_to_die = -1;
+ return;
+ }
+
+ /* Our per-thread stacks need to be bigger than the default size,
+ * otherwise the MIME parser crashes on FreeBSD, and the IMAP service
+ * crashes on 64-bit Linux.
+ */
+ if ((ret = pthread_attr_setstacksize(&attr, THREADSTACKSIZE))) {
+ lprintf(CTDL_EMERG, "pthread_attr_setstacksize: %s\n",
+ strerror(ret));
+ time_to_die = -1;
+ pthread_attr_destroy(&attr);
+ return;
+ }
+
+ struct MaintenanceThreadHook *fcn;
+
+ lprintf(CTDL_DEBUG, "Performing startup of maintenance thread hooks\n");
+
+ for (fcn = MaintenanceThreadHookTable; fcn != NULL; fcn = fcn->next) {
+ if ((ret = pthread_create(&(fcn->MaintenanceThread_tid), &attr, fcn->fcn_ptr, NULL) != 0)) {
+ lprintf(CTDL_ALERT, "Can't create thread: %s\n", strerror(ret));
+ }
+ else
+ {
+ lprintf(CTDL_NOTICE, "Spawned a new maintenance thread \"%s\" (%ld). \n", fcn->name,
+ fcn->MaintenanceThread_tid);
+ }
+ }
+
+
+ pthread_attr_destroy(&attr);
+}
+
/*
* if such an action is appropriate.
*/
void dead_session_purge(int force) {
- struct CitContext *ptr, *rem;
+ struct CitContext *ptr; /* general-purpose utility pointer */
+ struct CitContext *rem = NULL; /* list of sessions to be destroyed */
if (force == 0) {
if ( (time(NULL) - last_purge) < 5 ) {
}
time(&last_purge);
- do {
- rem = NULL;
- begin_critical_section(S_SESSION_TABLE);
- for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
- if ( (ptr->state == CON_IDLE) && (ptr->kill_me) ) {
- rem = ptr;
+ begin_critical_section(S_SESSION_TABLE);
+ for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
+ if ( (ptr->state == CON_IDLE) && (ptr->kill_me) ) {
+
+ /* Remove the session from the active list */
+ if (ptr->prev) {
+ ptr->prev->next = ptr->next;
}
- }
- end_critical_section(S_SESSION_TABLE);
+ else {
+ ContextList = ptr->next;
+ }
+ if (ptr->next) {
+ ptr->next->prev = ptr->prev;
+ }
+
+ --num_sessions;
+
+ /* And put it on our to-be-destroyed list */
+ ptr->next = rem;
+ rem = ptr;
- /* RemoveContext() enters its own S_SESSION_TABLE critical
- * section, so we have to do it like this.
- */
- if (rem != NULL) {
- lprintf(CTDL_DEBUG, "Purging session %d\n", rem->cs_pid);
- RemoveContext(rem);
}
+ }
+ end_critical_section(S_SESSION_TABLE);
- } while (rem != NULL);
+ /* 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) {
+ lprintf(CTDL_DEBUG, "Purging session %d\n", rem->cs_pid);
+ RemoveContext(rem);
+ ptr = rem;
+ rem = rem->next;
+ free(ptr);
+ }
/* Raise the size of the worker thread pool if necessary. */
-
if ( (num_sessions > num_threads)
&& (num_threads < config.c_max_workers) ) {
begin_critical_section(S_WORKER_LIST);
-/*
- * Redirect a session's output to a file or socket.
- * This function may be called with a file handle *or* a socket (but not
- * both). Call with neither to return output to its normal client socket.
- */
-void CtdlRedirectOutput(FILE *fp, int sock) {
-
- if (fp != NULL) CC->redirect_fp = fp;
- else CC->redirect_fp = NULL;
-
- if (sock > 0) CC->redirect_sock = sock;
- else CC->redirect_sock = (-1);
-
-}
-
-
/*
* masterCC is the context we use when not attached to a session. This
* function initializes it.
}
end_critical_section(S_SESSION_TABLE);
- if (bind_me) goto SKIP_SELECT;
+ if (bind_me) {
+ goto SKIP_SELECT;
+ }
/* If we got this far, it means that there are no sessions
* which a previous thread marked for attention, so we go
if (FD_ISSET(serviceptr->msock, &readfds)) {
ssock = accept(serviceptr->msock, NULL, 0);
- if (ssock < 0) {
- lprintf(CTDL_CRIT,
- "citserver: accept(): %s\n",
- strerror(errno));
- }
- else {
+ if (ssock >= 0) {
lprintf(CTDL_DEBUG,
"New client socket %d\n",
ssock);
+ /* The master socket is non-blocking but the client
+ * sockets need to be blocking, otherwise certain
+ * operations barf on FreeBSD. Not a fatal error.
+ */
+ if (fcntl(ssock, F_SETFL, 0) < 0) {
+ lprintf(CTDL_EMERG,
+ "citserver: Can't set socket to blocking: %s\n",
+ strerror(errno));
+ }
+
/* New context will be created already
- * set up in the CON_EXECUTING state.
- */
+ * set up in the CON_EXECUTING state.
+ */
con = CreateNewContext();
- /* Assign new socket number to it. */
+ /* Assign our new socket number to it. */
con->client_socket = ssock;
con->h_command_function =
serviceptr->h_command_function;
con->h_async_function =
serviceptr->h_async_function;
- /* Determine whether local socket */
+ /* Determine whether it's a local socket */
if (serviceptr->sockpath != NULL)
con->is_local_socket = 1;
do_housekeeping();
check_sched_shutdown();
}
-
+ if (con != NULL) free (con);//// TODO: could this harm other threads?
/* If control reaches this point, the server is shutting down */
return(NULL);
}
if(!strcasecmp(name, facTbl[i].name))
return facTbl[i].facility;
}
- return -1;
+ enable_syslog = 0;
+ return LOG_DAEMON;
}
projects / citadel.git / blobdiff