X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysdep.c;h=1a30b4df769a3dae66824e09d0c27b424aa9fdd1;hb=540b297c61acd828808872500bc7633577b04b29;hp=f4ac8d70bb5d39ef54b0f68f5b6d384f102bddc3;hpb=7ead4dce463c76a42b50aa3c7581fc88eea15f8d;p=citadel.git diff --git a/citadel/sysdep.c b/citadel/sysdep.c index f4ac8d70b..1a30b4df7 100644 --- a/citadel/sysdep.c +++ b/citadel/sysdep.c @@ -1,171 +1,47 @@ /* - * $Id$ - * * Citadel "system dependent" stuff. - * See COPYING 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. + * might need tweaking when run on different operating system variants. + * + * Copyright (c) 1987-2021 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 #include -#include -#include -#include -#include -#include #include -#include -#include +#include +#include +#include #include #include - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - -#include -#include +#include +#include +#include +#include #include +#include #include #include -#include -#include -#include -#include -#include -#include -#include #define SHOW_ME_VAPPEND_PRINTF #include -#include "citadel.h" -#include "server.h" -#include "sysdep_decls.h" #include "citserver.h" -#include "support.h" #include "config.h" -#include "database.h" -#include "housekeeping.h" +#include "ctdl_module.h" +#include "sysdep_decls.h" #include "modules/crypto/serv_crypto.h" /* Needed for init_ssl, client_write_ssl, client_read_ssl, destruct_ssl */ -#include "ecrash.h" +#include "housekeeping.h" #include "context.h" -#ifdef HAVE_SYS_SELECT_H -#include -#endif - -#ifndef HAVE_SNPRINTF -#include "snprintf.h" -#endif - -#include "ctdl_module.h" -#include "threads.h" -#include "user_ops.h" -#include "control.h" - - -#ifdef DEBUG_MEMORY_LEAKS -struct igheap { - struct igheap *next; - char file[32]; - int line; - void *block; -}; - -struct igheap *igheap = NULL; -#endif - - -int verbosity = DEFAULT_VERBOSITY; /* Logging level */ - -int syslog_facility = LOG_DAEMON; -int enable_syslog = 0; -int print_to_logfile = 1; - -/* - * CtdlLogPrintf() ... Write logging information - */ -void CtdlLogPrintf(enum LogLevel loglevel, const char *format, ...) { - va_list arg_ptr; - va_start(arg_ptr, format); - vCtdlLogPrintf(loglevel, format, arg_ptr); - va_end(arg_ptr); -} - -void vCtdlLogPrintf(enum LogLevel loglevel, const char *format, va_list arg_ptr) -{ - - if (enable_syslog) { - vsyslog((syslog_facility | loglevel), format, arg_ptr); - } - - /* stderr output code */ - if (enable_syslog || !print_to_logfile) 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; - CitContext *CCC = MyContext(); - ThreadTSD *cTSD = CTP; - CtdlThreadNode *node = NULL; - long lwpid = 0; - - if (cTSD != NULL) { - node = cTSD->self; - } - - if ((node != NULL) && (node->reltid != 0)) { - lwpid = node->reltid; - } - - gettimeofday(&tv, NULL); - - /* Promote to time_t; types differ on some OSes (like darwin) */ - unixtime = tv.tv_sec; - localtime_r(&unixtime, &tim); - - 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 - ); - - if (lwpid != 0) { - fprintf(stderr, "[LWP:%ld] ", lwpid); - } - - if (CCC != NULL) { - if (CCC->cs_pid != 0) { - fprintf(stderr, "[%3d] ", CCC->cs_pid); - } - else if (CCC->user.usernum != 0) { - fprintf(stderr, "[:%ld] ", CCC->user.usernum); - } - } - - vfprintf(stderr, format, arg_ptr); - fflush(stderr); - } -} - - - /* * Signal handler to shut down the server. */ @@ -175,23 +51,19 @@ volatile int shutdown_and_halt = 0; volatile int restart_server = 0; volatile int running_as_daemon = 0; -static RETSIGTYPE signal_cleanup(int signum) { - if (CT) - CT->signal = signum; - else - { - CtdlLogPrintf(CTDL_DEBUG, "Caught signal %d; shutting down.\n", signum); - exit_signal = signum; - } +static RETSIGTYPE signal_cleanup(int signum) { + syslog(LOG_DEBUG, "sysdep: caught signal %d; shutting down.", signum); + exit_signal = signum; + server_shutting_down = 1; } + static RETSIGTYPE signal_exit(int signum) { exit(1); } - /* * Some initialization stuff... */ @@ -214,39 +86,30 @@ void init_sysdep(void) { init_ssl(); #endif - /* - * Set up a place to put thread-specific data. - * We only need a single pointer per thread - it points to the - * CitContext structure (in the ContextList linked list) of the - * session to which the calling thread is currently bound. - */ - if (citthread_key_create(&MyConKey, NULL) != 0) { - CtdlLogPrintf(CTDL_CRIT, "Can't create TSD key: %s\n", - strerror(errno)); + if (pthread_key_create(&ThreadKey, NULL) != 0) { // TSD for threads + syslog(LOG_ERR, "pthread_key_create() : %m"); + abort(); + } + + if (pthread_key_create(&MyConKey, NULL) != 0) { // TSD for sessions + syslog(LOG_CRIT, "sysdep: can't create TSD key: %m"); + abort(); } /* - * 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); // intr = shutdown - // sigaddset(&set, SIGQUIT); // quit = force quit + sigaddset(&set, SIGINT); sigaddset(&set, SIGHUP); sigaddset(&set, SIGTERM); - // sigaddset(&set, SIGSEGV); // we want core dumps - // sigaddset(&set, SIGILL); // we want core dumps - // sigaddset(&set, SIGBUS); sigprocmask(SIG_UNBLOCK, &set, NULL); - signal(SIGINT, signal_cleanup); // intr = shutdown - // signal(SIGQUIT, signal_cleanup); // quit = force quit + signal(SIGINT, signal_cleanup); signal(SIGHUP, signal_cleanup); signal(SIGTERM, signal_cleanup); signal(SIGUSR2, signal_exit); - // signal(SIGSEGV, signal_cleanup); // we want coredumps - // signal(SIGILL, signal_cleanup); // we want core dumps - // signal(SIGBUS, signal_cleanup); /* * Do not shut down the server on broken pipe signals, otherwise the @@ -265,7 +128,7 @@ void init_sysdep(void) { * port_number port number to bind * queue_len number of incoming connections to allow in the queue */ -int ctdl_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) { struct protoent *p; struct sockaddr_in6 sin6; @@ -294,10 +157,7 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme { 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) - ); - CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage); + syslog(LOG_ALERT, "tcpserver: inet_pton: %m"); return (-1); } } @@ -305,32 +165,27 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme { 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) - ); - CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage); + syslog(LOG_ALERT, "tcpserver: inet_pton: %m"); return (-1); } } if (port_number == 0) { - snprintf(errormessage, SIZ, - "Can't start: no port number specified." - ); - CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage); + syslog(LOG_ALERT, "tcpserver: no port number was specified"); return (-1); } sin6.sin6_port = htons((u_short) port_number); sin4.sin_port = htons((u_short) port_number); p = getprotobyname("tcp"); + if (p == NULL) { + syslog(LOG_ALERT, "tcpserver: getprotobyname: %m"); + return (-1); + } s = socket( ((ip_version == 6) ? PF_INET6 : PF_INET), SOCK_STREAM, (p->p_proto)); if (s < 0) { - snprintf(errormessage, SIZ, - "Can't create a listening socket: %s", strerror(errno) - ); - CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage); + syslog(LOG_ALERT, "tcpserver: socket: %m"); return (-1); } /* Set some socket options that make sense. */ @@ -345,33 +200,24 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme } if (b < 0) { - snprintf(errormessage, SIZ, - "Can't bind: %s", strerror(errno) - ); - CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage); + syslog(LOG_ALERT, "tcpserver: bind: %m"); return (-1); } 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) - ); - CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage); + syslog(LOG_ALERT, "tcpserver: listen: %m"); return (-1); } return (s); } - - - /* * Create a Unix domain socket and listen on it */ -int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage) +int ctdl_uds_server(char *sockpath, int queue_len) { struct sockaddr_un addr; int s; @@ -386,10 +232,7 @@ int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage) i = unlink(sockpath); if ((i != 0) && (errno != ENOENT)) { - snprintf(errormessage, SIZ, "citserver: can't unlink %s: %s", - sockpath, strerror(errno) - ); - CtdlLogPrintf(CTDL_EMERG, "%s\n", errormessage); + syslog(LOG_ERR, "udsserver: %m"); return(-1); } @@ -399,36 +242,24 @@ int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage) s = socket(AF_UNIX, SOCK_STREAM, 0); if (s < 0) { - snprintf(errormessage, SIZ, - "citserver: Can't create a socket: %s", - strerror(errno)); - CtdlLogPrintf(CTDL_EMERG, "%s\n", errormessage); + syslog(LOG_ERR, "udsserver: socket: %m"); return(-1); } if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - snprintf(errormessage, SIZ, - "citserver: Can't bind: %s", - strerror(errno)); - CtdlLogPrintf(CTDL_EMERG, "%s\n", errormessage); + syslog(LOG_ERR, "udsserver: bind: %m"); return(-1); } /* set to nonblock - we need this for some obscure situations */ if (fcntl(s, F_SETFL, O_NONBLOCK) < 0) { - snprintf(errormessage, SIZ, - "citserver: Can't set socket to non-blocking: %s", - strerror(errno)); - CtdlLogPrintf(CTDL_EMERG, "%s\n", errormessage); + syslog(LOG_ERR, "udsserver: fcntl: %m"); close(s); return(-1); } if (listen(s, actual_queue_len) < 0) { - snprintf(errormessage, SIZ, - "citserver: Can't listen: %s", - strerror(errno)); - CtdlLogPrintf(CTDL_EMERG, "%s\n", errormessage); + syslog(LOG_ERR, "udsserver: listen: %m"); return(-1); } @@ -441,7 +272,6 @@ int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage) } - /* * The following functions implement output buffering on operating systems which * support it (such as Linux and various BSD flavors). @@ -491,11 +321,25 @@ static void flush_client_inbuf(void) CitContext *CCC=CC; FlushStrBuf(CCC->ReadBuf); - CCC->Pos = NULL; - + CCC->RecvBuf->ReadWritePointer = 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, "sysdep: closing socket %d", CCC->client_socket); + close(CCC->client_socket); + CCC->client_socket = -1 ; +} + + /* * client_write() ... Send binary data to the client. */ @@ -512,8 +356,8 @@ int client_write(const char *buf, int nbytes) if (nbytes < 1) return(0); -// flush_client_inbuf(); Ctx = CC; + if (Ctx->redirect_buffer != NULL) { StrBufAppendBufPlain(Ctx->redirect_buffer, buf, nbytes, 0); @@ -537,36 +381,28 @@ int client_write(const char *buf, int nbytes) if (select(1, NULL, &wset, NULL, NULL) == -1) { if (errno == EINTR) { - CtdlLogPrintf(CTDL_DEBUG, "client_write(%d bytes) select() interrupted.\n", nbytes-bytes_written); - if (CtdlThreadCheckStop()) { - CC->kill_me = 1; + syslog(LOG_DEBUG, "sysdep: 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 { - CtdlLogPrintf(CTDL_ERR, - "client_write(%d bytes) select failed: %s (%d)\n", - nbytes - bytes_written, - strerror(errno), errno); - cit_backtrace(); - Ctx->kill_me = 1; + syslog(LOG_ERR, "sysdep: client_write(%d bytes) select failed: %m", nbytes - bytes_written); + client_close(); + Ctx->kill_me = KILLME_SELECT_FAILED; return -1; } } } - retval = write(Ctx->client_socket, &buf[bytes_written], - nbytes - bytes_written); + retval = write(Ctx->client_socket, &buf[bytes_written], nbytes - bytes_written); if (retval < 1) { - CtdlLogPrintf(CTDL_ERR, - "client_write(%d bytes) failed: %s (%d)\n", - nbytes - bytes_written, - strerror(errno), errno); - cit_backtrace(); - // CtdlLogPrintf(CTDL_DEBUG, "Tried to send: %s", &buf[bytes_written]); - Ctx->kill_me = 1; + syslog(LOG_ERR, "sysdep: client_write(%d bytes) failed: %m", nbytes - bytes_written); + client_close(); + Ctx->kill_me = KILLME_WRITE_FAILED; return -1; } bytes_written = bytes_written + retval; @@ -618,49 +454,26 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout) if (CCC->redirect_ssl) { retval = client_read_sslblob(Target, bytes, timeout); if (retval < 0) { - CtdlLogPrintf(CTDL_CRIT, - "%s failed\n", - __FUNCTION__); + syslog(LOG_ERR, "sysdep: client_read_blob() failed"); } } else #endif { retval = StrBufReadBLOBBuffered(Target, - CCC->ReadBuf, - &CCC->Pos, + CCC->RecvBuf.Buf, + &CCC->RecvBuf.ReadWritePointer, &CCC->client_socket, 1, bytes, O_TERM, - &Error); + &Error + ); if (retval < 0) { - CtdlLogPrintf(CTDL_CRIT, - "%s failed: %s\n", - __FUNCTION__, - Error); + syslog(LOG_ERR, "sysdep: client_read_blob() failed: %s", Error); + client_close(); return retval; } - else - { -#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 retval; } @@ -672,8 +485,9 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout) */ void client_set_inbound_buf(long N) { - FlushStrBuf(CC->ReadBuf); - ReAdjustEmptyBuf(CC->ReadBuf, N * SIZ, N * SIZ); + CitContext *CCC=CC; + FlushStrBuf(CCC->RecvBuf.Buf); + ReAdjustEmptyBuf(CCC->RecvBuf.Buf, N * SIZ, N * SIZ); } int client_read_random_blob(StrBuf *Target, int timeout) @@ -687,37 +501,18 @@ int client_read_random_blob(StrBuf *Target, int timeout) long len; const char *pch; - len = StrLength(CCC->ReadBuf); - pch = ChrPtr(CCC->ReadBuf); + len = StrLength(CCC->RecvBuf.Buf); + pch = ChrPtr(CCC->RecvBuf.Buf); if (len > 0) { - if (CCC->Pos != NULL) { - len -= CCC->Pos - pch; - pch = CCC->Pos; + if (CCC->RecvBuf.ReadWritePointer != NULL) { + len -= CCC->RecvBuf.ReadWritePointer - pch; + pch = CCC->RecvBuf.ReadWritePointer; } StrBufAppendBufPlain(Target, pch, len, 0); - FlushStrBuf(CCC->ReadBuf); - CCC->Pos = 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 - + FlushStrBuf(CCC->RecvBuf.Buf); + CCC->RecvBuf.ReadWritePointer = NULL; return StrLength(Target); } return rc; @@ -750,10 +545,10 @@ int client_read_to(char *buf, int bytes, int timeout) int HaveMoreLinesWaiting(CitContext *CCC) { - if ((CCC->kill_me == 1) || ( - (CCC->Pos == NULL) && - (StrLength(CCC->ReadBuf) == 0) && - (CCC->client_socket != -1)) ) + if ((CCC->kill_me != 0) || + ( (CCC->RecvBuf.ReadWritePointer == NULL) && + (StrLength(CCC->RecvBuf.Buf) == 0) && + (CCC->client_socket != -1)) ) return 0; else return 1; @@ -767,7 +562,7 @@ int HaveMoreLinesWaiting(CitContext *CCC) */ INLINE int client_read(char *buf, int bytes) { - return(client_read_to(buf, bytes, config.c_sleeping)); + return(client_read_to(buf, bytes, CtdlGetConfigInt("c_sleeping"))); } int CtdlClientGetLine(StrBuf *Target) @@ -779,117 +574,20 @@ int CtdlClientGetLine(StrBuf *Target) 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->ReadBuf); - len = StrLength(CCC->ReadBuf); - if (CCC->Pos != NULL) - rlen = CC->Pos - 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->ReadBuf, - &CCC->Pos, - 1); -#ifdef BIGBAD_IODBG - pch = ChrPtr(CCC->ReadBuf); - nlen = StrLength(CCC->ReadBuf); - if (CCC->Pos != NULL) - nrlen = CC->Pos - 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) - CtdlLogPrintf(CTDL_CRIT, - "%s failed\n", - __FUNCTION__); -#endif + rc = client_readline_sslbuffer(Target, CCC->RecvBuf.Buf, &CCC->RecvBuf.ReadWritePointer, 1); 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->ReadBuf); - len = StrLength(CCC->ReadBuf); - if (CCC->Pos != NULL) - rlen = CC->Pos - 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->ReadBuf, - &CCC->Pos, + CCC->RecvBuf.Buf, + &CCC->RecvBuf.ReadWritePointer, &CCC->client_socket, 5, 1, - &Error); - -#ifdef BIGBAD_IODBG - pch = ChrPtr(CCC->ReadBuf); - nlen = StrLength(CCC->ReadBuf); - if (CCC->Pos != NULL) - nrlen = CC->Pos - 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)) - CtdlLogPrintf(CTDL_CRIT, - "%s failed: %s\n", - __FUNCTION__, - Error); -#endif + &Error + ); return rc; } } @@ -941,7 +639,8 @@ int client_getln(char *buf, int bufsize) void close_masters (void) { struct ServiceFunctionHook *serviceptr; - + const char *Text; + /* * close all protocol master sockets */ @@ -950,16 +649,41 @@ void close_masters (void) if (serviceptr->tcp_port > 0) { - CtdlLogPrintf(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, "sysdep: %s %d listener on port %d", + Text, + serviceptr->msock, + serviceptr->tcp_port + ); serviceptr->tcp_port = 0; } if (serviceptr->sockpath != NULL) - CtdlLogPrintf(CTDL_INFO, "Closing listener on '%s'\n", - serviceptr->sockpath); + { + if (serviceptr->msock == -1) { + Text = "not closing again"; + } + else { + Text = "Closing"; + } + syslog(LOG_INFO, "sysdep: %s %d listener on '%s'", + Text, + serviceptr->msock, + serviceptr->sockpath + ); + } + + if (serviceptr->msock != -1) + { + close(serviceptr->msock); + serviceptr->msock = -1; + } - close(serviceptr->msock); /* If it's a Unix domain socket, remove the file. */ if (serviceptr->sockpath != NULL) { unlink(serviceptr->sockpath); @@ -984,7 +708,6 @@ void sysdep_master_cleanup(void) { CtdlDestroyProtoHooks(); CtdlDestroyDeleteHooks(); CtdlDestroyXmsgHooks(); - CtdlDestroyNetprocHooks(); CtdlDestroyUserHooks(); CtdlDestroyMessageHook(); CtdlDestroyCleanupHooks(); @@ -992,9 +715,7 @@ void sysdep_master_cleanup(void) { CtdlDestroySessionHooks(); CtdlDestroyServiceHook(); CtdlDestroyRoomHooks(); - #ifdef HAVE_BACKTRACE -/// eCrash_Uninit(); - #endif + CtdlDestroySearchHooks(); } @@ -1018,18 +739,16 @@ void start_daemon(int unused) { pid_t child = 0; FILE *fp; int do_restart = 0; - current_child = 0; + //if (chdir(ctdl_run_dir) != 0) { + //syslog(LOG_ERR, "%s: %m", ctdl_run_dir); + //} + /* 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. */ - if (chdir(ctdl_run_dir) != 0) - CtdlLogPrintf(CTDL_EMERG, - "unable to change into directory [%s]: %s", - ctdl_run_dir, strerror(errno)); - child = fork(); if (child != 0) { exit(0); @@ -1041,28 +760,23 @@ void start_daemon(int unused) { setsid(); umask(0); - if ((freopen("/dev/null", "r", stdin) != stdin) || - (freopen("/dev/null", "w", stdout) != stdout) || - (freopen("/dev/null", "w", stderr) != stderr)) - CtdlLogPrintf(CTDL_EMERG, - "unable to reopen stdin/out/err %s", - strerror(errno)); - + if ( (freopen("/dev/null", "r", stdin) != stdin) || + (freopen("/dev/null", "w", stdout) != stdout) || + (freopen("/dev/null", "w", stderr) != stderr) + ) { + syslog(LOG_ERR, "sysdep: unable to reopen stdio: %m"); + } 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) { @@ -1071,7 +785,6 @@ void start_daemon(int unused) { } waitpid(current_child, &status, 0); } - do_restart = 0; nFireUpsNonRestart = nFireUps; /* Exit code 0 means the watcher should exit */ @@ -1104,9 +817,8 @@ void checkcrash(void) if (nFireUpsNonRestart != nFireUps) { StrBuf *CrashMail; - CrashMail = NewStrBuf(); - CtdlLogPrintf(CTDL_ALERT, "Posting crash message\n"); + syslog(LOG_ALERT, "sysdep: posting crash message"); StrBufPrintf(CrashMail, " \n" " The Citadel server process (citserver) terminated unexpectedly." @@ -1115,7 +827,7 @@ void checkcrash(void) "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" + " 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" @@ -1133,7 +845,7 @@ void checkcrash(void) */ int convert_login(char NameToConvert[]) { struct passwd *pw; - int a; + unsigned int a; pw = getpwnam(NameToConvert); if (pw == NULL) { @@ -1150,35 +862,81 @@ int convert_login(char NameToConvert[]) { +void HuntBadSession(void) +{ + int highest; + CitContext *ptr; + fd_set readfds; + struct timeval tv; + struct ServiceFunctionHook *serviceptr; + + /* 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_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; + + /* 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_ERR, + "sysdep: killing session CC[%d] bad FD: [%d] User[%s] Host[%s:%s]", + ptr->cs_pid, + ptr->client_socket, + ptr->curr_user, + ptr->cs_host, + ptr->cs_addr + ); + ptr->kill_me = 1; + ptr->client_socket = -1; + break; + } + } + } + end_critical_section(S_SESSION_TABLE); + + /* 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_ERR, "sysdep: found bad FD: %d and its a server socket! Shutting Down!", serviceptr->msock); + server_shutting_down = 1; + break; + } + } +} + + /* * This loop just keeps going and going and going... */ -/* - * FIXME: - * This current implimentation of worker_thread creates a bottle neck in several situations - * The first thing to remember is that a single thread can handle more than one connection at a time. - * More threads mean less memory for the system to run in. - * So for efficiency we want every thread to be doing something useful or waiting in the main loop for - * something to happen anywhere. - * This current implimentation requires worker threads to wait in other locations, after it has - * been committed to a single connection which is very wasteful. - * As an extreme case consider this: - * A slow client connects and this slow client sends only one character each second. - * With this current implimentation a single worker thread is dispatched to handle that connection - * until such times as the client timeout expires, an error occurs on the socket or the client - * completes its transmission. - * THIS IS VERY BAD since that thread could have handled a read from many more clients in each one - * second interval between chars. - * - * It is my intention to re-write this code and the associated client_getln, client_read functions - * to allow any thread to read data on behalf of any connection (context). - * To do this I intend to have this main loop read chars into a buffer stored in the context. - * Once the correct criteria for a full buffer is met then we will dispatch a thread to - * process it. - * This worker thread loop also needs to be able to handle binary data. - */ - -void *worker_thread(void *arg) { +void *worker_thread(void *blah) { int highest; CitContext *ptr; CitContext *bind_me = NULL; @@ -1186,13 +944,18 @@ void *worker_thread(void *arg) { int retval = 0; struct timeval tv; int force_purge = 0; - + struct ServiceFunctionHook *serviceptr; + int ssock; /* Descriptor for client socket */ + CitContext *con = NULL; /* Temporary context pointer */ + int i; - while (!CtdlThreadCheckStop()) { + pthread_mutex_lock(&ThreadCountMutex); + ++num_workers; + pthread_mutex_unlock(&ThreadCountMutex); - /* make doubly sure we're not holding any stale db handles - * which might cause a deadlock. - */ + while (!server_shutting_down) { + + /* make doubly sure we're not holding any stale db handles * which might cause a deadlock */ cdb_check_handles(); do_select: force_purge = 0; bind_me = NULL; /* Which session shall we handle? */ @@ -1201,18 +964,28 @@ do_select: force_purge = 0; 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) { - int client_socket; - client_socket = ptr->client_socket; - /* Dont select on dead sessions only truly idle ones */ - if ((ptr->state == CON_IDLE) && - (CC->kill_me == 0) && - (client_socket != -1)) - { - FD_SET(client_socket, &readfds); - if (client_socket > highest) - highest = client_socket; + 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; @@ -1236,35 +1009,88 @@ do_select: force_purge = 0; * ahead and get ready to select(). */ - if (!CtdlThreadCheckStop()) { + if (!server_shutting_down) { tv.tv_sec = 1; /* wake up every second if no input */ tv.tv_usec = 0; - retval = CtdlThreadSelect(highest + 1, &readfds, NULL, NULL, &tv); + retval = select(highest + 1, &readfds, NULL, NULL, &tv); } - else + 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) { - CtdlLogPrintf(CTDL_NOTICE, "select() failed: (%s)\n", - strerror(errno)); + syslog(LOG_ERR, "sysdep: select() failed: %m"); + HuntBadSession(); goto do_select; } if (errno != EINTR) { - CtdlLogPrintf(CTDL_EMERG, "Exiting (%s)\n", strerror(errno)); - CtdlThreadStopAll(); + syslog(LOG_ERR, "sysdep: exiting: %m"); + server_shutting_down = 1; continue; } else { - CtdlLogPrintf(CTDL_DEBUG, "Interrupted CtdlThreadSelect.\n"); - if (CtdlThreadCheckStop()) return(NULL); + if (server_shutting_down) { + --num_workers; + return(NULL); + } goto do_select; } } - else if(retval == 0) { - if (CtdlThreadCheckStop()) return(NULL); + 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 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) { + syslog(LOG_DEBUG, "sysdep: 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) { + syslog(LOG_ERR, "sysdep: Can't set socket to blocking: %m"); + } + + /* New context will be created already + * set up in the CON_EXECUTING state. + */ + 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_greeting_function = serviceptr->h_greeting_function; + con->ServiceName = serviceptr->ServiceName; + + /* Connections on a local client are always from the same host */ + if (serviceptr->sockpath != NULL) { + con->is_local_client = 1; + } + + /* Set the SO_REUSEADDR socket option */ + i = 1; + setsockopt(ssock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)); + con->state = CON_GREETING; + retval--; + if (retval == 0) + break; + } + } } /* It must be a client socket. Find a context that has data @@ -1301,6 +1127,10 @@ do_select: force_purge = 0; 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); @@ -1319,14 +1149,12 @@ SKIP_SELECT: 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)) { + /* 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; @@ -1334,144 +1162,27 @@ SKIP_SELECT: 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; - struct CitContext select_on_master_CC; - - CtdlFillSystemContext(&select_on_master_CC, "select_on_master"); - citthread_setspecific(MyConKey, (void *)&select_on_master_CC); - - 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, &master_fds); - if (m > highest) { - highest = m; - } - } - - if (!CtdlThreadCheckStop()) { - tv.tv_sec = 60; /* wake up every second if no input */ - tv.tv_usec = 0; - retval = CtdlThreadSelect(highest + 1, &master_fds, 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)); - continue; - } - if (errno != EINTR) { - CtdlLogPrintf(CTDL_EMERG, "Exiting (%s)\n", strerror(errno)); - CtdlThreadStopAll(); - } else { - CtdlLogPrintf(CTDL_DEBUG, "Interrupted CtdlThreadSelect.\n"); - if (CtdlThreadCheckStop()) return(NULL); - continue; - } - } - else if(retval == 0) { - if (CtdlThreadCheckStop()) return(NULL); - 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, &master_fds)) { - ssock = accept(serviceptr->msock, NULL, 0); - if (ssock >= 0) { - CtdlLogPrintf(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) { - CtdlLogPrintf(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. - */ - con = CreateNewContext(); - - /* 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; - con->h_greeting_function = serviceptr->h_greeting_function; - con->ServiceName = - serviceptr->ServiceName; - - /* Determine whether it's a local socket */ - 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)); - - con->state = CON_GREETING; - - retval--; - if (retval == 0) - break; - } - } + pthread_mutex_lock(&ThreadCountMutex); + --active_workers; + if ((active_workers + CtdlGetConfigInt("c_min_workers") < num_workers) && + (num_workers > CtdlGetConfigInt("c_min_workers"))) + { + num_workers--; + pthread_mutex_unlock(&ThreadCountMutex); + return (NULL); } + pthread_mutex_unlock(&ThreadCountMutex); } - CtdlClearSystemContext(); - return NULL; + /* 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. @@ -1508,115 +1219,5 @@ int SyslogFacility(char *name) 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) { - CtdlLogPrintf(CTDL_CRIT, "UNFREED: %30s : %d\n", - thisheap->file, thisheap->line); - } -} - -#endif /* DEBUG_MEMORY_LEAKS */