/*
- * $Id$
- *
* Citadel "system dependent" stuff.
- * See copyright.txt for copyright information.
*
* Here's where we (hopefully) have most parts of the Citadel server that
* would need to be altered to run the server in a non-POSIX environment.
* If we ever port to a different platform and either have multiple
* variants of this file or simply load it up with #ifdefs.
*
+ * Copyright (c) 1987-2011 by the citadel.org team
+ *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*/
#include "sysdep.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 <errno.h>
#include <stdarg.h>
#include <grp.h>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
+#define SHOW_ME_VAPPEND_PRINTF
+#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
-#include "serv_extensions.h"
#include "sysdep_decls.h"
#include "citserver.h"
#include "support.h"
#include "config.h"
#include "database.h"
#include "housekeeping.h"
-#include "tools.h"
-#include "serv_crypto.h"
-#include "serv_fulltext.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
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
-
-#ifdef DEBUG_MEMORY_LEAKS
-struct igheap {
- struct igheap *next;
- char file[32];
- int line;
- void *block;
-};
-
-struct igheap *igheap = NULL;
-#endif
-
-
-pthread_mutex_t Critters[MAX_SEMAPHORES]; /* Things needing locking */
-pthread_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 */
-static int num_threads = 0; /* Current number of threads */
-int num_sessions = 0; /* Current number of sessions */
-pthread_t indexer_thread_tid;
-pthread_t checkpoint_thread_tid;
-
-int syslog_facility = LOG_DAEMON;
-int enable_syslog = 0;
-extern int running_as_daemon;
-
-/*
- * lprintf() ... Write logging information
- */
-void lprintf(enum LogLevel loglevel, const char *format, ...) {
- va_list arg_ptr;
-
- if (enable_syslog) {
- va_start(arg_ptr, format);
- vsyslog((syslog_facility | loglevel), format, arg_ptr);
- va_end(arg_ptr);
- }
-
- /* 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;
-
- 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) {
- fprintf(stderr,
- "%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);
- } else {
- fprintf(stderr,
- "%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);
- }
- va_start(arg_ptr, format);
- vfprintf(stderr, format, arg_ptr);
- va_end(arg_ptr);
- fflush(stderr);
- }
-}
-
+#include "ctdl_module.h"
+#include "threads.h"
+#include "user_ops.h"
+#include "control.h"
/*
* Signal handler to shut down the server.
*/
-volatile int time_to_die = 0;
+volatile int exit_signal = 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);
+ syslog(LOG_DEBUG, "Caught signal %d; shutting down.", signum);
+ exit_signal = signum;
+ server_shutting_down = 1;
}
+static RETSIGTYPE signal_exit(int signum) {
+ exit(1);
+}
+
+
/*
* Some initialization stuff...
*/
void init_sysdep(void) {
- int i;
sigset_t set;
/* Avoid vulnerabilities related to FD_SETSIZE if we can. */
init_ssl();
#endif
- /* Set up a bunch of semaphores to be used for critical sections */
- for (i=0; i<MAX_SEMAPHORES; ++i) {
- pthread_mutex_init(&Critters[i], NULL);
- }
-
/*
* Set up a place to put thread-specific data.
* We only need a single pointer per thread - it points to the
* 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));
+ syslog(LOG_CRIT, "Can't create TSD key: %s", strerror(errno));
}
/*
- * The action for unexpected signals and exceptions should be to
- * call signal_cleanup() to gracefully shut down the server.
+ * Interript, hangup, and terminate signals should cause the server
+ * to gracefully clean up and shut down.
*/
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);
+ signal(SIGUSR2, signal_exit);
/*
* Do not shut down the server on broken pipe signals, otherwise the
}
-/*
- * Obtain a semaphore lock to begin a critical section.
- */
-void begin_critical_section(int which_one)
-{
- /* lprintf(CTDL_DEBUG, "begin_critical_section(%d)\n", which_one); */
-
- /* For all types of critical sections except those listed here,
- * ensure nobody ever tries to do a critical section within a
- * transaction; this could lead to deadlock.
- */
- if ( (which_one != S_FLOORCACHE)
-#ifdef DEBUG_MEMORY_LEAKS
- && (which_one != S_DEBUGMEMLEAKS)
-#endif
- && (which_one != S_RPLIST)
- ) {
- cdb_check_handles();
- }
- pthread_mutex_lock(&Critters[which_one]);
-}
-
-/*
- * Release a semaphore lock to end a critical section.
- */
-void end_critical_section(int which_one)
-{
- pthread_mutex_unlock(&Critters[which_one]);
-}
-
-
-
-/*
+/*
* This is a generic function to set up a master socket for listening on
- * a TCP port. The server shuts down if the bind fails.
+ * a TCP port. The server shuts down if the bind fails. (IPv4/IPv6 version)
*
+ * ip_addr IP address to bind
+ * port_number port number to bind
+ * queue_len number of incoming connections to allow in the queue
*/
-int ig_tcp_server(char *ip_addr, int port_number, int queue_len, char **errormessage)
+int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errormessage)
{
- struct sockaddr_in sin;
- int s, i;
- int actual_queue_len;
-
- actual_queue_len = queue_len;
- if (actual_queue_len < 5) actual_queue_len = 5;
-
- memset(&sin, 0, sizeof(sin));
- sin.sin_family = AF_INET;
- sin.sin_port = htons((u_short)port_number);
- if (ip_addr == NULL) {
- sin.sin_addr.s_addr = INADDR_ANY;
+ struct protoent *p;
+ struct sockaddr_in6 sin6;
+ struct sockaddr_in sin4;
+ int s, i, b;
+ int ip_version = 6;
+
+ memset(&sin6, 0, sizeof(sin6));
+ memset(&sin4, 0, sizeof(sin4));
+ sin6.sin6_family = AF_INET6;
+ sin4.sin_family = AF_INET;
+
+ if ( (ip_addr == NULL) /* any IPv6 */
+ || (IsEmptyStr(ip_addr))
+ || (!strcmp(ip_addr, "*"))
+ ) {
+ ip_version = 6;
+ sin6.sin6_addr = in6addr_any;
}
- else {
- sin.sin_addr.s_addr = inet_addr(ip_addr);
+ else if (!strcmp(ip_addr, "0.0.0.0")) /* any IPv4 */
+ {
+ ip_version = 4;
+ sin4.sin_addr.s_addr = INADDR_ANY;
+ }
+ else if ((strchr(ip_addr, '.')) && (!strchr(ip_addr, ':'))) /* specific IPv4 */
+ {
+ ip_version = 4;
+ if (inet_pton(AF_INET, ip_addr, &sin4.sin_addr) <= 0) {
+ snprintf(errormessage, SIZ,
+ "Error binding to [%s] : %s", ip_addr, strerror(errno)
+ );
+ syslog(LOG_ALERT, "%s", errormessage);
+ return (-1);
+ }
}
-
- if (sin.sin_addr.s_addr == INADDR_NONE) {
- sin.sin_addr.s_addr = INADDR_ANY;
+ else /* specific IPv6 */
+ {
+ ip_version = 6;
+ if (inet_pton(AF_INET6, ip_addr, &sin6.sin6_addr) <= 0) {
+ snprintf(errormessage, SIZ,
+ "Error binding to [%s] : %s", ip_addr, strerror(errno)
+ );
+ syslog(LOG_ALERT, "%s", errormessage);
+ return (-1);
+ }
}
- s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+ if (port_number == 0) {
+ snprintf(errormessage, SIZ, "Can't start: no port number specified.");
+ syslog(LOG_ALERT, "%s", errormessage);
+ return (-1);
+ }
+ sin6.sin6_port = htons((u_short) port_number);
+ sin4.sin_port = htons((u_short) port_number);
+ p = getprotobyname("tcp");
+
+ s = socket( ((ip_version == 6) ? PF_INET6 : PF_INET), SOCK_STREAM, (p->p_proto));
if (s < 0) {
- *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);
+ snprintf(errormessage, SIZ,
+ "Can't create a listening socket: %s", strerror(errno)
+ );
+ syslog(LOG_ALERT, "%s", errormessage);
+ return (-1);
}
-
+ /* Set some socket options that make sense. */
i = 1;
setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i));
- if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
- *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);
+ if (ip_version == 6) {
+ b = bind(s, (struct sockaddr *) &sin6, sizeof(sin6));
}
-
- /* 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);
+ else {
+ b = bind(s, (struct sockaddr *) &sin4, sizeof(sin4));
}
- if (listen(s, actual_queue_len) < 0) {
- *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);
+ if (b < 0) {
+ snprintf(errormessage, SIZ,
+ "Can't bind: %s", strerror(errno)
+ );
+ syslog(LOG_ALERT, "%s", errormessage);
+ return (-1);
}
- return(s);
+ fcntl(s, F_SETFL, O_NONBLOCK);
+
+ if (listen(s, ((queue_len >= 5) ? queue_len : 5) ) < 0) {
+ snprintf(errormessage, SIZ,
+ "Can't listen: %s", strerror(errno)
+ );
+ syslog(LOG_ALERT, "%s", errormessage);
+ return (-1);
+ }
+ return (s);
}
+
+
/*
* Create a Unix domain socket and listen on it
*/
-int ig_uds_server(char *sockpath, int queue_len, char **errormessage)
+int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage)
{
struct sockaddr_un addr;
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;
i = unlink(sockpath);
- if (i != 0) if (errno != ENOENT) {
- *errormessage = (char*) malloc(SIZ + 1);
- snprintf(*errormessage, SIZ, "citserver: can't unlink %s: %s",
- sockpath, strerror(errno));
- lprintf(CTDL_EMERG, "%s\n", *errormessage);
+ if ((i != 0) && (errno != ENOENT)) {
+ snprintf(errormessage, SIZ, "citserver: can't unlink %s: %s",
+ sockpath, strerror(errno)
+ );
+ syslog(LOG_EMERG, "%s", errormessage);
return(-1);
}
s = socket(AF_UNIX, SOCK_STREAM, 0);
if (s < 0) {
- *errormessage = (char*) malloc(SIZ + 1);
- snprintf(*errormessage, SIZ,
+ snprintf(errormessage, SIZ,
"citserver: Can't create a socket: %s",
strerror(errno));
- lprintf(CTDL_EMERG, "%s\n", *errormessage);
+ syslog(LOG_EMERG, "%s", errormessage);
return(-1);
}
if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
- *errormessage = (char*) malloc(SIZ + 1);
- snprintf(*errormessage, SIZ,
+ snprintf(errormessage, SIZ,
"citserver: Can't bind: %s",
strerror(errno));
- lprintf(CTDL_EMERG, "%s\n", *errormessage);
+ syslog(LOG_EMERG, "%s", 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,
+ snprintf(errormessage, SIZ,
"citserver: Can't set socket to non-blocking: %s",
strerror(errno));
- lprintf(CTDL_EMERG, "%s\n", *errormessage);
+ syslog(LOG_EMERG, "%s", errormessage);
close(s);
return(-1);
}
if (listen(s, actual_queue_len) < 0) {
- *errormessage = (char*) malloc(SIZ + 1);
- snprintf(*errormessage, SIZ,
+ snprintf(errormessage, SIZ,
"citserver: Can't listen: %s",
strerror(errno));
- lprintf(CTDL_EMERG, "%s\n", *errormessage);
+ syslog(LOG_EMERG, "%s", errormessage);
return(-1);
}
- chmod(sockpath, 0777);
- 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;
+#ifdef HAVE_STRUCT_UCRED
+ setsockopt(s, SOL_SOCKET, SO_PASSCRED, &passcred, sizeof(passcred));
+#endif
- return ((c = (struct CitContext *) pthread_getspecific(MyConKey),
- c == NULL) ? &masterCC : c
- );
+ chmod(sockpath, S_ISGID|S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IWGRP|S_IXGRP|S_IROTH|S_IWOTH|S_IXOTH);
+ return(s);
}
-/*
- * 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) {
- lprintf(CTDL_ALERT, "citserver: can't allocate memory!!\n");
- return NULL;
- }
- memset(me, 0, sizeof(struct CitContext));
-
- /* 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);
-}
-
/*
- * The following functions implement output buffering. If the kernel supplies
- * native TCP buffering (Linux & *BSD), use that; otherwise, emulate it with
- * user-space buffering.
+ * The following functions implement output buffering on operating systems which
+ * support it (such as Linux and various BSD flavors).
*/
+#ifndef HAVE_DARWIN
#ifdef TCP_CORK
# define HAVE_TCP_BUFFERING
#else
# define HAVE_TCP_BUFFERING
# define TCP_CORK TCP_NOPUSH
# endif
-#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;
+#ifdef HAVE_TCP_BUFFERING
+#ifdef HAVE_OPENSSL
+ if (!CC->redirect_ssl)
+#endif
+ setsockopt(CC->client_socket, IPPROTO_TCP, TCP_CORK, &on, 4);
+#endif
}
void unbuffer_output(void) {
- struct CitContext *ctx = MyContext();
- setsockopt(ctx->client_socket, IPPROTO_TCP, TCP_CORK, &off, 4);
- ctx->buffering = 0;
+#ifdef HAVE_TCP_BUFFERING
+#ifdef HAVE_OPENSSL
+ if (!CC->redirect_ssl)
+#endif
+ setsockopt(CC->client_socket, IPPROTO_TCP, TCP_CORK, &off, 4);
+#endif
}
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);
-}
-#else
-void buffer_output(void) {
- if (CC->buffering == 0) {
- CC->buffering = 1;
- CC->buffer_len = 0;
- CC->output_buffer = malloc(SIZ);
- }
+#ifdef HAVE_TCP_BUFFERING
+ struct CitContext *CCC = CC;
+ setsockopt(CCC->client_socket, IPPROTO_TCP, TCP_CORK, &off, 4);
+ setsockopt(CCC->client_socket, IPPROTO_TCP, TCP_CORK, &on, 4);
+#endif
}
-void flush_output(void) {
- if (CC->buffering == 1) {
- client_write(CC->output_buffer, CC->buffer_len);
- CC->buffer_len = 0;
- }
+/*
+static void flush_client_inbuf(void)
+{
+ CitContext *CCC=CC;
+
+ FlushStrBuf(CCC->ReadBuf);
+ CCC->RecvBuf->ReadWritePointer = NULL;
+
}
+*/
-void unbuffer_output(void) {
- if (CC->buffering == 1) {
- CC->buffering = 0;
- /* We don't call flush_output because we can't. */
- client_write(CC->output_buffer, CC->buffer_len);
- CC->buffer_len = 0;
- free(CC->output_buffer);
- CC->output_buffer = NULL;
- }
+
+/*
+ * client_close() ... close the client socket
+ */
+void client_close(void) {
+ CitContext *CCC = CC;
+
+ if (!CCC) return;
+ if (CCC->client_socket <= 0) return;
+ syslog(LOG_DEBUG, "Closing socket %d", CCC->client_socket);
+
+ close(CCC->client_socket);
+ CCC->client_socket = -1 ;
}
-#endif
+
/*
* client_write() ... Send binary data to the client.
*/
-void client_write(char *buf, int nbytes)
+int client_write(const char *buf, int nbytes)
{
int bytes_written = 0;
int retval;
#ifndef HAVE_TCP_BUFFERING
int old_buffer_len = 0;
#endif
+ fd_set wset;
+ CitContext *Ctx;
+ int fdflags;
- 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 (nbytes < 1) return(0);
-#ifndef HAVE_TCP_BUFFERING
- /* If we're buffering for later, do that now. */
- if (CC->buffering) {
- old_buffer_len = CC->buffer_len;
- CC->buffer_len += nbytes;
- CC->output_buffer = realloc(CC->output_buffer, CC->buffer_len);
- memcpy(&CC->output_buffer[old_buffer_len], buf, nbytes);
- return;
+ Ctx = CC;
+
+#ifdef BIGBAD_IODBG
+ {
+ int rv = 0;
+ char fn [SIZ];
+ FILE *fd;
+
+ snprintf(fn, SIZ, "/tmp/foolog_%s.%d", Ctx->ServiceName, Ctx->cs_pid);
+
+ fd = fopen(fn, "a+");
+ if (fd)
+ {
+ fprintf(fd, "Sending: BufSize: %d BufContent: [",
+ nbytes);
+ rv = fwrite(buf, nbytes, 1, fd);
+ fprintf(fd, "]\n");
+ fclose(fd);
+ }
}
#endif
-
- /* Ok, at this point we're not buffering. Go ahead and write. */
+// flush_client_inbuf();
+ if (Ctx->redirect_buffer != NULL) {
+ StrBufAppendBufPlain(Ctx->redirect_buffer,
+ buf, nbytes, 0);
+ return 0;
+ }
#ifdef HAVE_OPENSSL
- if (CC->redirect_ssl) {
+ if (Ctx->redirect_ssl) {
client_write_ssl(buf, nbytes);
- return;
+ return 0;
}
#endif
+ if (Ctx->client_socket == -1) return -1;
+
+ fdflags = fcntl(Ctx->client_socket, F_GETFL);
+
+ while ((bytes_written < nbytes) && (Ctx->client_socket != -1)){
+ if ((fdflags & O_NONBLOCK) == O_NONBLOCK) {
+ FD_ZERO(&wset);
+ FD_SET(Ctx->client_socket, &wset);
+ if (select(1, NULL, &wset, NULL, NULL) == -1) {
+ if (errno == EINTR)
+ {
+ syslog(LOG_DEBUG, "client_write(%d bytes) select() interrupted.",
+ nbytes-bytes_written
+ );
+ if (server_shutting_down) {
+ CC->kill_me = KILLME_SELECT_INTERRUPTED;
+ return (-1);
+ } else {
+ /* can't trust fd's and stuff so we need to re-create them */
+ continue;
+ }
+ } else {
+ syslog(LOG_ERR,
+ "client_write(%d bytes) select failed: %s (%d)",
+ nbytes - bytes_written,
+ strerror(errno), errno
+ );
+ cit_backtrace();
+ client_close();
+ Ctx->kill_me = KILLME_SELECT_FAILED;
+ return -1;
+ }
+ }
+ }
- while (bytes_written < nbytes) {
- retval = write(CC->client_socket, &buf[bytes_written],
- nbytes - bytes_written);
+ retval = write(Ctx->client_socket, &buf[bytes_written], nbytes - bytes_written);
if (retval < 1) {
- lprintf(CTDL_ERR,
- "client_write(%d bytes) failed: %s (%d)\n",
+ syslog(LOG_ERR,
+ "client_write(%d bytes) failed: %s (%d)",
nbytes - bytes_written,
- strerror(errno), errno);
- CC->kill_me = 1;
- return;
+ strerror(errno), errno
+ );
+ cit_backtrace();
+ client_close();
+ Ctx->kill_me = KILLME_WRITE_FAILED;
+ return -1;
}
bytes_written = bytes_written + retval;
}
+ return 0;
}
+void cputbuf(const StrBuf *Buf) {
+ client_write(ChrPtr(Buf), StrLength(Buf));
+}
+
/*
- * cprintf() ... Send formatted printable data to the client. It is
- * implemented in terms of client_write() but remains in
- * sysdep.c in case we port to somewhere without va_args...
+ * cprintf() Send formatted printable data to the client.
+ * Implemented in terms of client_write() so it's technically not sysdep...
*/
void cprintf(const char *format, ...) {
va_list arg_ptr;
- char buf[1024];
+ char buf[1024];
va_start(arg_ptr, format);
if (vsnprintf(buf, sizeof buf, format, arg_ptr) == -1)
/*
* Read data from the client socket.
- * Return values are:
- * 1 Requested number of bytes has been read.
- * 0 Request timed out.
- * -1 The socket is broken.
- * If the socket breaks, the session will be terminated.
+ *
+ * sock socket fd to read from
+ * buf buffer to read into
+ * bytes number of bytes to read
+ * timeout Number of seconds to wait before timing out
+ *
+ * Possible return values:
+ * 1 Requested number of bytes has been read.
+ * 0 Request timed out.
+ * -1 Connection is broken, or other error.
*/
-int client_read_to(char *buf, int bytes, int timeout)
+int client_read_blob(StrBuf *Target, int bytes, int timeout)
{
- int len,rlen;
- fd_set rfds;
- struct timeval tv;
- int retval;
+ CitContext *CCC=CC;
+ const char *Error;
+ int retval = 0;
#ifdef HAVE_OPENSSL
- if (CC->redirect_ssl) {
- return (client_read_ssl(buf, bytes, timeout));
+ if (CCC->redirect_ssl) {
+#ifdef BIGBAD_IODBG
+ int rv = 0;
+ char fn [SIZ];
+ FILE *fd;
+
+ snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid);
+
+ fd = fopen(fn, "a+");
+ fprintf(fd, "Reading BLOB: BufSize: %d ",
+ bytes);
+ rv = fwrite(ChrPtr(Target), StrLength(Target), 1, fd);
+ fprintf(fd, "]\n");
+
+
+ fclose(fd);
+#endif
+ retval = client_read_sslblob(Target, bytes, timeout);
+ if (retval < 0) {
+ syslog(LOG_CRIT, "client_read_blob() failed");
+ }
+#ifdef BIGBAD_IODBG
+ snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid);
+
+ fd = fopen(fn, "a+");
+ fprintf(fd, "Read: %d BufContent: [",
+ StrLength(Target));
+ rv = fwrite(ChrPtr(Target), StrLength(Target), 1, fd);
+ fprintf(fd, "]\n");
+
+
+ fclose(fd);
+#endif
}
+ else
#endif
- len = 0;
- while(len<bytes) {
- FD_ZERO(&rfds);
- FD_SET(CC->client_socket, &rfds);
- tv.tv_sec = timeout;
- tv.tv_usec = 0;
+ {
+#ifdef BIGBAD_IODBG
+ int rv = 0;
+ char fn [SIZ];
+ FILE *fd;
+
+ snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid);
+
+ fd = fopen(fn, "a+");
+ fprintf(fd, "Reading BLOB: BufSize: %d ",
+ bytes);
+ rv = fwrite(ChrPtr(Target), StrLength(Target), 1, fd);
+ fprintf(fd, "]\n");
+
+
+ fclose(fd);
+#endif
+ retval = StrBufReadBLOBBuffered(Target,
+ CCC->RecvBuf.Buf,
+ &CCC->RecvBuf.ReadWritePointer,
+ &CCC->client_socket,
+ 1,
+ bytes,
+ O_TERM,
+ &Error);
+ if (retval < 0) {
+ syslog(LOG_CRIT, "client_read_blob() failed: %s", Error);
+ client_close();
+ return retval;
+ }
+#ifdef BIGBAD_IODBG
+ snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid);
+
+ fd = fopen(fn, "a+");
+ fprintf(fd, "Read: %d BufContent: [",
+ StrLength(Target));
+ rv = fwrite(ChrPtr(Target), StrLength(Target), 1, fd);
+ fprintf(fd, "]\n");
+ fclose(fd);
+#endif
+ }
+ return retval;
+}
- retval = select( (CC->client_socket)+1,
- &rfds, NULL, NULL, &tv);
- if (FD_ISSET(CC->client_socket, &rfds) == 0) {
- return(0);
- }
+/*
+ * to make client_read_random_blob() more efficient, increase buffer size.
+ * just use in greeting function, else your buffer may be flushed
+ */
+void client_set_inbound_buf(long N)
+{
+ CitContext *CCC=CC;
+ FlushStrBuf(CCC->RecvBuf.Buf);
+ ReAdjustEmptyBuf(CCC->RecvBuf.Buf, N * SIZ, N * SIZ);
+}
+
+int client_read_random_blob(StrBuf *Target, int timeout)
+{
+ CitContext *CCC=CC;
+ int rc;
- rlen = read(CC->client_socket, &buf[len], bytes-len);
- if (rlen<1) {
- /* The socket has been disconnected! */
- CC->kill_me = 1;
- return(-1);
+ rc = client_read_blob(Target, 1, timeout);
+ if (rc > 0)
+ {
+ long len;
+ const char *pch;
+
+ len = StrLength(CCC->RecvBuf.Buf);
+ pch = ChrPtr(CCC->RecvBuf.Buf);
+
+ if (len > 0)
+ {
+ if (CCC->RecvBuf.ReadWritePointer != NULL) {
+ len -= CCC->RecvBuf.ReadWritePointer - pch;
+ pch = CCC->RecvBuf.ReadWritePointer;
+ }
+ StrBufAppendBufPlain(Target, pch, len, 0);
+ FlushStrBuf(CCC->RecvBuf.Buf);
+ CCC->RecvBuf.ReadWritePointer = NULL;
+#ifdef BIGBAD_IODBG
+ {
+ int rv = 0;
+ char fn [SIZ];
+ FILE *fd;
+
+ snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid);
+
+ fd = fopen(fn, "a+");
+ fprintf(fd, "Read: BufSize: %d BufContent: [",
+ StrLength(Target));
+ rv = fwrite(ChrPtr(Target), StrLength(Target), 1, fd);
+ fprintf(fd, "]\n");
+
+
+ fclose(fd);
+ }
+#endif
+
+ return StrLength(Target);
}
- len = len + rlen;
+ return rc;
+ }
+ else
+ return rc;
+}
+
+int client_read_to(char *buf, int bytes, int timeout)
+{
+ CitContext *CCC=CC;
+ int rc;
+
+ rc = client_read_blob(CCC->MigrateBuf, bytes, timeout);
+ if (rc < 0)
+ {
+ *buf = '\0';
+ return rc;
+ }
+ else
+ {
+ memcpy(buf,
+ ChrPtr(CCC->MigrateBuf),
+ StrLength(CCC->MigrateBuf) + 1);
+ FlushStrBuf(CCC->MigrateBuf);
+ return rc;
}
- return(1);
}
+
+int HaveMoreLinesWaiting(CitContext *CCC)
+{
+ if ((CCC->kill_me != 0) ||
+ ( (CCC->RecvBuf.ReadWritePointer == NULL) &&
+ (StrLength(CCC->RecvBuf.Buf) == 0) &&
+ (CCC->client_socket != -1)) )
+ return 0;
+ else
+ return 1;
+}
+
+
/*
* Read data from the client socket with default timeout.
* (This is implemented in terms of client_read_to() and could be
return(client_read_to(buf, bytes, config.c_sleeping));
}
+int CtdlClientGetLine(StrBuf *Target)
+{
+ CitContext *CCC=CC;
+ const char *Error;
+ int rc;
+
+ FlushStrBuf(Target);
+#ifdef HAVE_OPENSSL
+ if (CCC->redirect_ssl) {
+#ifdef BIGBAD_IODBG
+ char fn [SIZ];
+ FILE *fd;
+ int len = 0;
+ int rlen = 0;
+ int nlen = 0;
+ int nrlen = 0;
+ const char *pch;
+
+ snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid);
+
+ fd = fopen(fn, "a+");
+ pch = ChrPtr(CCC->RecvBuf.Buf);
+ len = StrLength(CCC->RecvBuf.Buf);
+ if (CCC->RecvBuf.ReadWritePointer != NULL)
+ rlen = CCC->RecvBuf.ReadWritePointer - pch;
+ else
+ rlen = 0;
+
+/* fprintf(fd, "\n\n\nBufSize: %d BufPos: %d \nBufContent: [%s]\n\n_____________________\n",
+ len, rlen, pch);
+*/
+ fprintf(fd, "\n\n\nSSL1: BufSize: %d BufPos: %d \n_____________________\n",
+ len, rlen);
+#endif
+ rc = client_readline_sslbuffer(Target,
+ CCC->RecvBuf.Buf,
+ &CCC->RecvBuf.ReadWritePointer,
+ 1);
+#ifdef BIGBAD_IODBG
+ pch = ChrPtr(CCC->RecvBuf.Buf);
+ nlen = StrLength(CCC->RecvBuf.Buf);
+ if (CCC->RecvBuf.ReadWritePointer != NULL)
+ nrlen = CCC->RecvBuf.ReadWritePointer - pch;
+ else
+ nrlen = 0;
+/*
+ fprintf(fd, "\n\n\nBufSize: was: %d is: %d BufPos: was: %d is: %d \nBufContent: [%s]\n\n_____________________\n",
+ len, nlen, rlen, nrlen, pch);
+*/
+ fprintf(fd, "\n\n\nSSL2: BufSize: was: %d is: %d BufPos: was: %d is: %d \n",
+ len, nlen, rlen, nrlen);
+
+ fprintf(fd, "SSL3: Read: BufSize: %d BufContent: [%s]\n\n*************\n",
+ StrLength(Target), ChrPtr(Target));
+ fclose(fd);
+
+ if (rc < 0) {
+ syslog(LOG_CRIT, "CtdlClientGetLine() failed");
+ }
+#endif
+ return rc;
+ }
+ else
+#endif
+ {
+#ifdef BIGBAD_IODBG
+ char fn [SIZ];
+ FILE *fd;
+ int len, rlen, nlen, nrlen;
+ const char *pch;
+
+ snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid);
+
+ fd = fopen(fn, "a+");
+ pch = ChrPtr(CCC->RecvBuf.Buf);
+ len = StrLength(CCC->RecvBuf.Buf);
+ if (CCC->RecvBuf.ReadWritePointer != NULL)
+ rlen = CCC->RecvBuf.ReadWritePointer - pch;
+ else
+ rlen = 0;
+
+/* fprintf(fd, "\n\n\nBufSize: %d BufPos: %d \nBufContent: [%s]\n\n_____________________\n",
+ len, rlen, pch);
+*/
+ fprintf(fd, "\n\n\nBufSize: %d BufPos: %d \n_____________________\n",
+ len, rlen);
+#endif
+ rc = StrBufTCP_read_buffered_line_fast(Target,
+ CCC->RecvBuf.Buf,
+ &CCC->RecvBuf.ReadWritePointer,
+ &CCC->client_socket,
+ 5,
+ 1,
+ &Error);
+
+#ifdef BIGBAD_IODBG
+ pch = ChrPtr(CCC->RecvBuf.Buf);
+ nlen = StrLength(CCC->RecvBuf.Buf);
+ if (CCC->RecvBuf.ReadWritePointer != NULL)
+ nrlen = CCC->RecvBuf.ReadWritePointer - pch;
+ else
+ nrlen = 0;
+/*
+ fprintf(fd, "\n\n\nBufSize: was: %d is: %d BufPos: was: %d is: %d \nBufContent: [%s]\n\n_____________________\n",
+ len, nlen, rlen, nrlen, pch);
+*/
+ fprintf(fd, "\n\n\nBufSize: was: %d is: %d BufPos: was: %d is: %d \n",
+ len, nlen, rlen, nrlen);
+
+ fprintf(fd, "Read: BufSize: %d BufContent: [%s]\n\n*************\n",
+ StrLength(Target), ChrPtr(Target));
+ fclose(fd);
+
+ if ((rc < 0) && (Error != NULL)) {
+ syslog(LOG_CRIT, "CtdlClientGetLine() failed: %s", Error);
+ }
+#endif
+ return rc;
+ }
+}
+
/*
* client_getln() ... Get a LF-terminated line of text from the client.
int client_getln(char *buf, int bufsize)
{
int i, retval;
+ CitContext *CCC=CC;
+ const char *pCh;
- /* Read one character at a time.
- */
- for (i = 0;;i++) {
- retval = client_read(&buf[i], 1);
- if (retval != 1 || buf[i] == '\n' || i == (bufsize-1))
- break;
- }
+ retval = CtdlClientGetLine(CCC->MigrateBuf);
+ if (retval < 0)
+ return(retval >= 0);
- /* If we got a long line, discard characters until the newline.
- */
- if (i == (bufsize-1))
- while (buf[i] != '\n' && retval == 1)
- retval = client_read(&buf[i], 1);
+ i = StrLength(CCC->MigrateBuf);
+ pCh = ChrPtr(CCC->MigrateBuf);
/* Strip the trailing LF, and the trailing CR if present.
*/
+ if (bufsize <= i)
+ i = bufsize - 1;
+ while ( (i > 0)
+ && ( (pCh[i - 1]==13)
+ || ( pCh[i - 1]==10)) ) {
+ i--;
+ }
+ memcpy(buf, pCh, i);
buf[i] = 0;
- while ( (strlen(buf) > 0) && ((buf[strlen(buf)-1]==10) || (buf[strlen(buf)-1] == 13)) ) {
- buf[strlen(buf)-1] = 0;
+
+ FlushStrBuf(CCC->MigrateBuf);
+ if (retval < 0) {
+ safestrncpy(&buf[i], "000", bufsize - i);
}
- if (retval < 0) safestrncpy(buf, "000", bufsize);
- return(retval);
+ return(retval >= 0);
}
-
/*
- * The system-dependent part of master_cleanup() - close the master socket.
+ * Cleanup any contexts that are left lying around
*/
-void sysdep_master_cleanup(void) {
+
+
+void close_masters (void)
+{
struct ServiceFunctionHook *serviceptr;
+ const char *Text;
/*
* close all protocol master sockets
serviceptr = serviceptr->next ) {
if (serviceptr->tcp_port > 0)
- lprintf(CTDL_INFO, "Closing listener on port %d\n",
- serviceptr->tcp_port);
-
+ {
+ if (serviceptr->msock == -1)
+ Text = "not closing again";
+ else
+ Text = "Closing";
+
+ syslog(LOG_INFO, "%s %d listener on port %d\n",
+ Text,
+ serviceptr->msock,
+ serviceptr->tcp_port);
+ serviceptr->tcp_port = 0;
+ }
+
if (serviceptr->sockpath != NULL)
- lprintf(CTDL_INFO, "Closing listener on '%s'\n",
- serviceptr->sockpath);
+ {
+ if (serviceptr->msock == -1)
+ Text = "not closing again";
+ else
+ Text = "Closing";
+
+ syslog(LOG_INFO, "%s %d listener on '%s'\n",
+ Text,
+ serviceptr->msock,
+ serviceptr->sockpath);
+ }
- close(serviceptr->msock);
+ if (serviceptr->msock != -1)
+ {
+ close(serviceptr->msock);
+ serviceptr->msock = -1;
+ }
/* If it's a Unix domain socket, remove the file. */
if (serviceptr->sockpath != NULL) {
unlink(serviceptr->sockpath);
+ serviceptr->sockpath = NULL;
}
}
}
/*
- * Terminate another session.
- * (This could justifiably be moved out of sysdep.c because it
- * no longer does anything that is system-dependent.)
+ * The system-dependent part of master_cleanup() - close the master socket.
*/
-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);
+void sysdep_master_cleanup(void) {
+
+ close_masters();
+
+ context_cleanup();
+
+#ifdef HAVE_OPENSSL
+ destruct_ssl();
+#endif
+ CtdlDestroyProtoHooks();
+ CtdlDestroyDeleteHooks();
+ CtdlDestroyXmsgHooks();
+ CtdlDestroyNetprocHooks();
+ CtdlDestroyUserHooks();
+ CtdlDestroyMessageHook();
+ CtdlDestroyCleanupHooks();
+ CtdlDestroyFixedOutputHooks();
+ CtdlDestroySessionHooks();
+ CtdlDestroyTDAPVetoHooks();
+ CtdlDestroyServiceHook();
+ CtdlDestroyRoomHooks();
+ CtdlDestroySearchHooks();
+ CtdlDestroyDebugTable();
+ #ifdef HAVE_BACKTRACE
+/// eCrash_Uninit();
+ #endif
}
+
+
pid_t current_child;
void graceful_shutdown(int signum) {
kill(current_child, signum);
exit(0);
}
+int nFireUps = 0;
+int nFireUpsNonRestart = 0;
+pid_t ForkedPid = 1;
/*
* Start running as a daemon.
* We don't just call close() because we don't want these fd's
* to be reused for other files.
*/
- chdir(ctdl_run_dir);
+ if (chdir(ctdl_run_dir) != 0)
+ syslog(LOG_EMERG,
+ "unable to change into directory [%s]: %s",
+ ctdl_run_dir, strerror(errno));
child = fork();
if (child != 0) {
- fp = fopen(file_pid_file, "w");
- if (fp != NULL) {
- fprintf(fp, "%d\n", child);
- fclose(fp);
- }
exit(0);
}
setsid();
umask(0);
- freopen("/dev/null", "r", stdin);
- freopen("/dev/null", "w", stdout);
- freopen("/dev/null", "w", stderr);
+ if ((freopen("/dev/null", "r", stdin) != stdin) ||
+ (freopen("/dev/null", "w", stdout) != stdout) ||
+ (freopen("/dev/null", "w", stderr) != stderr))
+ syslog(LOG_EMERG,
+ "unable to reopen stdin/out/err %s",
+ strerror(errno));
+
do {
current_child = fork();
}
else {
+ fp = fopen(file_pid_file, "w");
+ if (fp != NULL) {
+ fprintf(fp, ""F_PID_T"\n", getpid());
+ 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;
- }
+ nFireUpsNonRestart = nFireUps;
+
+ /* Exit code 0 means the watcher should exit */
+ if (WIFEXITED(status) && (WEXITSTATUS(status) == CTDLEXIT_SHUTDOWN)) {
+ do_restart = 0;
+ }
- /* Any other exit code means we should restart. */
- else {
- do_restart = 1;
- }
+ /* Exit code 101-109 means the watcher should exit */
+ else if (WIFEXITED(status) && (WEXITSTATUS(status) >= 101) && (WEXITSTATUS(status) <= 109)) {
+ do_restart = 0;
}
- /* Any other type of termination (signals, etc.) should also restart. */
+ /* Any other exit code, or no exit code, means we should restart. */
else {
do_restart = 1;
+ nFireUps++;
+ ForkedPid = current_child;
}
} while (do_restart);
+void checkcrash(void)
+{
+ if (nFireUpsNonRestart != nFireUps)
+ {
+ StrBuf *CrashMail;
+
+ CrashMail = NewStrBuf();
+ syslog(LOG_ALERT, "Posting crash message\n");
+ StrBufPrintf(CrashMail,
+ " \n"
+ " 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.\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?id=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);
+ CtdlAideMessage(ChrPtr(CrashMail), "Citadel server process terminated unexpectedly");
+ FreeStrBuf(&CrashMail);
+ }
+}
+
+
/*
* Generic routine to convert a login name to a full name (gecos)
* Returns nonzero if a conversion took place
}
}
-struct worker_node *worker_list = NULL;
-
-
-/*
- * create a worker thread. this function must always be called from within
- * an S_WORKER_LIST critical section!
- */
-void create_worker(void) {
- int ret;
- struct worker_node *n;
- pthread_attr_t attr;
-
- n = malloc(sizeof(struct worker_node));
- if (n == NULL) {
- lprintf(CTDL_EMERG, "can't allocate worker_node, exiting\n");
- time_to_die = -1;
- return;
- }
-
- 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;
- }
-
- if ((ret = pthread_create(&n->tid, &attr, worker_thread, NULL) != 0))
- {
-
- lprintf(CTDL_ALERT, "Can't create worker thread: %s\n",
- strerror(ret));
- }
-
- n->next = worker_list;
- worker_list = n;
- pthread_attr_destroy(&attr);
-}
-
-
-/*
- * Create the indexer thread and begin its operation.
- * Then create the checkpoint thread and begin its 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;
- }
-
- if ((ret = pthread_create(&indexer_thread_tid, &attr, indexer_thread, NULL) != 0)) {
- lprintf(CTDL_ALERT, "Can't create thread: %s\n", strerror(ret));
- }
-
- if ((ret = pthread_create(&checkpoint_thread_tid, &attr, checkpoint_thread, NULL) != 0)) {
- lprintf(CTDL_ALERT, "Can't create thread: %s\n", strerror(ret));
- }
-
- pthread_attr_destroy(&attr);
-}
+void HuntBadSession(void)
+{
+ int highest;
+ CitContext *ptr;
+ fd_set readfds;
+ struct timeval tv;
+ struct ServiceFunctionHook *serviceptr;
-/*
- * 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.
- *
- *
- * After that's done, we raise the size of the worker thread pool
- * if such an action is appropriate.
- */
-void dead_session_purge(int force) {
- 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 ) {
- return; /* Too soon, go away */
- }
- }
- time(&last_purge);
+ /* Next, add all of the client sockets. */
begin_critical_section(S_SESSION_TABLE);
for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
- if ( (ptr->state == CON_IDLE) && (ptr->kill_me) ) {
+ if ((ptr->state == CON_SYS) && (ptr->client_socket == 0))
+ continue;
+ /* Initialize the fdset. */
+ FD_ZERO(&readfds);
+ highest = 0;
+ tv.tv_sec = 0; /* wake up every second if no input */
+ tv.tv_usec = 0;
- /* Remove the session from the active list */
- if (ptr->prev) {
- ptr->prev->next = ptr->next;
- }
- else {
- ContextList = ptr->next;
- }
- if (ptr->next) {
- ptr->next->prev = ptr->prev;
+ /* Don't select on dead sessions, only truly idle ones */
+ if ( (ptr->state == CON_IDLE)
+ && (ptr->kill_me == 0)
+ && (ptr->client_socket > 0)
+ ) {
+ FD_SET(ptr->client_socket, &readfds);
+ if (ptr->client_socket > highest)
+ highest = ptr->client_socket;
+
+ if ((select(highest + 1, &readfds, NULL, NULL, &tv) < 0) &&
+ (errno == EBADF))
+ {
+ /* Gotcha! */
+ syslog(LOG_EMERG,
+ "Killing Session CC[%d] bad FD: [%d:%d] User[%s] Host[%s:%s]\n",
+ ptr->cs_pid,
+ ptr->client_socket,
+ ptr->is_local_socket,
+ ptr->curr_user,
+ ptr->cs_host,ptr->cs_addr);
+
+ ptr->kill_me = 1;
+ ptr->client_socket = -1;
+ break;
}
-
- --num_sessions;
-
- /* And put it on our to-be-destroyed list */
- ptr->next = rem;
- rem = ptr;
-
}
+
}
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) {
- 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);
- create_worker();
- end_critical_section(S_WORKER_LIST);
- }
-}
-
-
-
-
-
-/*
- * 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;
-}
-
+ /* First, add the various master sockets to the fdset. */
+ for (serviceptr = ServiceHookTable; serviceptr != NULL; serviceptr = serviceptr->next ) {
+ /* Initialize the fdset. */
+ highest = 0;
+ tv.tv_sec = 0; /* wake up every second if no input */
+ tv.tv_usec = 0;
+ FD_SET(serviceptr->msock, &readfds);
+ if (serviceptr->msock > highest) {
+ highest = serviceptr->msock;
+ }
+ if ((select(highest + 1, &readfds, NULL, NULL, &tv) < 0) &&
+ (errno == EBADF))
+ {
+ /* Gotcha! server socket dead? commit suicide! */
+ syslog(LOG_EMERG,
+ "Found bad FD: %d and its a server socket! Shutting Down!\n",
+ serviceptr->msock);
+
+ server_shutting_down = 1;
+ break;
+ }
+ }
-/*
- * Bind a thread to a context. (It's inline merely to speed things up.)
- */
-INLINE void become_session(struct CitContext *which_con) {
- pthread_setspecific(MyConKey, (void *)which_con );
}
-
/*
* This loop just keeps going and going and going...
- */
-void *worker_thread(void *arg) {
- int i;
+ */
+void *worker_thread(void *blah) {
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;
-
- num_threads++;
+ struct ServiceFunctionHook *serviceptr;
+ int ssock; /* Descriptor for client socket */
+ CitContext *con = NULL; /* Temporary context pointer */
+ int i;
- cdb_allocate_tsd();
+ pthread_mutex_lock(&ThreadCountMutex);
+ ++num_workers;
+ pthread_mutex_unlock(&ThreadCountMutex);
- while (!time_to_die) {
+ while (!server_shutting_down) {
/* make doubly sure we're not holding any stale db handles
* which might cause a deadlock.
FD_ZERO(&readfds);
highest = 0;
+ /* First, add the various master sockets to the fdset. */
+ for (serviceptr = ServiceHookTable; serviceptr != NULL; serviceptr = serviceptr->next ) {
+ FD_SET(serviceptr->msock, &readfds);
+ if (serviceptr->msock > highest) {
+ highest = serviceptr->msock;
+ }
+ }
+
+ /* Next, add all of the client sockets. */
begin_critical_section(S_SESSION_TABLE);
for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
- if (ptr->state == CON_IDLE) {
+ if ((ptr->state == CON_SYS) && (ptr->client_socket == 0))
+ continue;
+
+ /* Don't select on dead sessions, only truly idle ones */
+ if ( (ptr->state == CON_IDLE)
+ && (ptr->kill_me == 0)
+ && (ptr->client_socket > 0)
+ ) {
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_GREETING)) {
+ bind_me = ptr;
+ ptr->state = CON_STARTING;
+ break;
}
}
end_critical_section(S_SESSION_TABLE);
* ahead and get ready to select().
*/
- /* First, add the various master sockets to the fdset. */
- for (serviceptr = ServiceHookTable; serviceptr != NULL;
- serviceptr = serviceptr->next ) {
- m = serviceptr->msock;
- FD_SET(m, &readfds);
- if (m > highest) {
- highest = m;
- }
- }
-
- if (!time_to_die) {
+ if (!server_shutting_down) {
tv.tv_sec = 1; /* wake up every second if no input */
tv.tv_usec = 0;
retval = select(highest + 1, &readfds, NULL, NULL, &tv);
}
-
- if (time_to_die) return(NULL);
+ else {
+ --num_workers;
+ return NULL;
+ }
/* Now figure out who made this select() unblock.
* First, check for an error or exit condition.
*/
if (retval < 0) {
if (errno == EBADF) {
- lprintf(CTDL_NOTICE, "select() failed: (%s)\n",
- strerror(errno));
+ syslog(LOG_EMERG, "select() failed: (%s)\n", strerror(errno));
+ HuntBadSession ();
goto do_select;
}
if (errno != EINTR) {
- lprintf(CTDL_EMERG, "Exiting (%s)\n", strerror(errno));
- time_to_die = 1;
- } else if (!time_to_die)
+ syslog(LOG_EMERG, "Exiting (%s)\n", strerror(errno));
+ server_shutting_down = 1;
+ continue;
+ } else {
+#if 0
+ syslog(LOG_DEBUG, "Interrupted select()\n");
+#endif
+ if (server_shutting_down) {
+ --num_workers;
+ return(NULL);
+ }
goto do_select;
+ }
+ }
+ else if (retval == 0) {
+ if (server_shutting_down) {
+ --num_workers;
+ return(NULL);
+ }
}
- /* Next, check to see if it's a new client connecting
- * on a master socket.
- */
- else for (serviceptr = ServiceHookTable; serviceptr != NULL;
- serviceptr = serviceptr->next ) {
+ /* Next, check to see if it's a new client connecting * on a master socket. */
+
+ else if ((retval > 0) && (!server_shutting_down)) for (serviceptr = ServiceHookTable; serviceptr != NULL; serviceptr = serviceptr->next) {
if (FD_ISSET(serviceptr->msock, &readfds)) {
ssock = accept(serviceptr->msock, NULL, 0);
if (ssock >= 0) {
- lprintf(CTDL_DEBUG,
- "New client socket %d\n",
- ssock);
+ syslog(LOG_DEBUG, "New client socket %d", 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,
+ syslog(LOG_EMERG,
"citserver: Can't set socket to blocking: %s\n",
strerror(errno));
}
con = CreateNewContext();
/* Assign our new socket number to it. */
+ con->tcp_port = serviceptr->tcp_port;
con->client_socket = ssock;
- con->h_command_function =
- serviceptr->h_command_function;
- con->h_async_function =
- serviceptr->h_async_function;
-
+ con->h_command_function = serviceptr->h_command_function;
+ con->h_async_function = serviceptr->h_async_function;
+ con->h_greeting_function = serviceptr->h_greeting_function;
+ con->ServiceName = serviceptr->ServiceName;
+
/* Determine whether it's a local socket */
- if (serviceptr->sockpath != NULL)
+ if (serviceptr->sockpath != NULL) {
con->is_local_socket = 1;
+ }
/* Set the SO_REUSEADDR socket option */
i = 1;
- setsockopt(ssock, SOL_SOCKET,
- 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;
+ setsockopt(ssock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i));
+ con->state = CON_GREETING;
+ retval--;
+ if (retval == 0)
+ break;
}
}
}
*/
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;
+ int checkfd = ptr->client_socket;
+ if ((checkfd != -1) && (ptr->state == CON_IDLE) ){
+ if (FD_ISSET(checkfd, &readfds)) {
+ ptr->input_waiting = 1;
+ if (!bind_me) {
+ bind_me = ptr; /* I choose you! */
+ bind_me->state = CON_EXECUTING;
+ }
+ else {
+ ptr->state = CON_READY;
+ }
+ } else if ((ptr->is_async) && (ptr->async_waiting) && (ptr->h_async_function)) {
+ if (!bind_me) {
+ bind_me = ptr; /* I choose you! */
+ bind_me->state = CON_EXECUTING;
+ }
+ else {
+ ptr->state = CON_READY;
+ }
}
}
}
SKIP_SELECT:
/* We're bound to a session */
+ pthread_mutex_lock(&ThreadCountMutex);
+ ++active_workers;
+ pthread_mutex_unlock(&ThreadCountMutex);
+
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();
+
+ while (HaveMoreLinesWaiting(CC))
+ CC->h_command_function();
+
CC->input_waiting = 0;
}
dead_session_purge(force_purge);
do_housekeeping();
- check_sched_shutdown();
+
+ pthread_mutex_lock(&ThreadCountMutex);
+ --active_workers;
+ if ((active_workers + config.c_min_workers < num_workers) &&
+ (num_workers > config.c_min_workers))
+ {
+ num_workers--;
+ pthread_mutex_unlock(&ThreadCountMutex);
+ return (NULL);
+ }
+ pthread_mutex_unlock(&ThreadCountMutex);
}
- /* If control reaches this point, the server is shutting down */
+ /* If control reaches this point, the server is shutting down */
+ pthread_mutex_lock(&ThreadCountMutex);
+ --num_workers;
+ pthread_mutex_unlock(&ThreadCountMutex);
return(NULL);
}
-
/*
* SyslogFacility()
* Translate text facility name to syslog.h defined value.
if(!strcasecmp(name, facTbl[i].name))
return facTbl[i].facility;
}
- enable_syslog = 0;
return LOG_DAEMON;
}
-
-
-/********** MEM CHEQQER ***********/
-
-#ifdef DEBUG_MEMORY_LEAKS
-
-#undef malloc
-#undef realloc
-#undef strdup
-#undef free
-
-void *tracked_malloc(size_t size, char *file, int line) {
- struct igheap *thisheap;
- void *block;
-
- block = malloc(size);
- if (block == NULL) return(block);
-
- thisheap = malloc(sizeof(struct igheap));
- if (thisheap == NULL) {
- free(block);
- return(NULL);
- }
-
- thisheap->block = block;
- strcpy(thisheap->file, file);
- thisheap->line = line;
-
- begin_critical_section(S_DEBUGMEMLEAKS);
- thisheap->next = igheap;
- igheap = thisheap;
- end_critical_section(S_DEBUGMEMLEAKS);
-
- return(block);
-}
-
-
-void *tracked_realloc(void *ptr, size_t size, char *file, int line) {
- struct igheap *thisheap;
- void *block;
-
- block = realloc(ptr, size);
- if (block == NULL) return(block);
-
- thisheap = malloc(sizeof(struct igheap));
- if (thisheap == NULL) {
- free(block);
- return(NULL);
- }
-
- thisheap->block = block;
- strcpy(thisheap->file, file);
- thisheap->line = line;
-
- begin_critical_section(S_DEBUGMEMLEAKS);
- thisheap->next = igheap;
- igheap = thisheap;
- end_critical_section(S_DEBUGMEMLEAKS);
-
- return(block);
-}
-
-
-
-void tracked_free(void *ptr) {
- struct igheap *thisheap;
- struct igheap *trash;
-
- free(ptr);
-
- if (igheap == NULL) return;
- begin_critical_section(S_DEBUGMEMLEAKS);
- for (thisheap = igheap; thisheap != NULL; thisheap = thisheap->next) {
- if (thisheap->next != NULL) {
- if (thisheap->next->block == ptr) {
- trash = thisheap->next;
- thisheap->next = thisheap->next->next;
- free(trash);
- }
- }
- }
- if (igheap->block == ptr) {
- trash = igheap;
- igheap = igheap->next;
- free(trash);
- }
- end_critical_section(S_DEBUGMEMLEAKS);
-}
-
-char *tracked_strdup(const char *s, char *file, int line) {
- char *ptr;
-
- if (s == NULL) return(NULL);
- ptr = tracked_malloc(strlen(s) + 1, file, line);
- if (ptr == NULL) return(NULL);
- strncpy(ptr, s, strlen(s));
- return(ptr);
-}
-
-void dump_heap(void) {
- struct igheap *thisheap;
-
- for (thisheap = igheap; thisheap != NULL; thisheap = thisheap->next) {
- lprintf(CTDL_CRIT, "UNFREED: %30s : %d\n",
- thisheap->file, thisheap->line);
- }
-}
-
-#endif /* DEBUG_MEMORY_LEAKS */