X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysdep.c;h=3ec7d16cc6cabb92569d5ff2117e636c8a242a2b;hb=5c39ca8a3c875df98163fed8923c258f21bb3f66;hp=2b83270c01c7d1e10fb0f5036c9be522aba084a7;hpb=5334b5b7a2cabb38106a47e7aa3310e98d2d381b;p=citadel.git diff --git a/citadel/sysdep.c b/citadel/sysdep.c index 2b83270c0..3ec7d16cc 100644 --- a/citadel/sysdep.c +++ b/citadel/sysdep.c @@ -2,93 +2,45 @@ * Citadel "system dependent" stuff. * * 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-2011 by the citadel.org team + * Copyright (c) 1987-2017 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 as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #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" - - /* * Signal handler to shut down the server. */ @@ -306,35 +258,27 @@ 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)); + snprintf(errormessage, SIZ, "citserver: Can't create a socket: %s", strerror(errno)); syslog(LOG_EMERG, "%s", errormessage); return(-1); } if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - snprintf(errormessage, SIZ, - "citserver: Can't bind: %s", - strerror(errno)); + snprintf(errormessage, SIZ, "citserver: Can't bind: %s", strerror(errno)); 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) { - snprintf(errormessage, SIZ, - "citserver: Can't set socket to non-blocking: %s", - strerror(errno)); + snprintf(errormessage, SIZ, "citserver: Can't set socket to non-blocking: %s", strerror(errno)); syslog(LOG_EMERG, "%s", errormessage); close(s); return(-1); } if (listen(s, actual_queue_len) < 0) { - snprintf(errormessage, SIZ, - "citserver: Can't listen: %s", - strerror(errno)); + snprintf(errormessage, SIZ, "citserver: Can't listen: %s", strerror(errno)); syslog(LOG_EMERG, "%s", errormessage); return(-1); } @@ -448,14 +392,15 @@ int client_write(const char *buf, int nbytes) 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); + if (fd == NULL) { + syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno)); + cit_backtrace(); + exit(1); } + fprintf(fd, "Sending: BufSize: %d BufContent: [", nbytes); + rv = fwrite(buf, nbytes, 1, fd); + fprintf(fd, "]\n"); + fclose(fd); } #endif // flush_client_inbuf(); @@ -573,8 +518,12 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout) snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid); fd = fopen(fn, "a+"); - fprintf(fd, "Reading BLOB: BufSize: %d ", - bytes); + if (fd == NULL) { + syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno)); + cit_backtrace(); + exit(1); + } + fprintf(fd, "Reading BLOB: BufSize: %d ", bytes); rv = fwrite(ChrPtr(Target), StrLength(Target), 1, fd); fprintf(fd, "]\n"); @@ -589,12 +538,14 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout) snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid); fd = fopen(fn, "a+"); - fprintf(fd, "Read: %d BufContent: [", - StrLength(Target)); + if (fd == NULL) { + syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno)); + cit_backtrace(); + exit(1); + } + fprintf(fd, "Read: %d BufContent: [", StrLength(Target)); rv = fwrite(ChrPtr(Target), StrLength(Target), 1, fd); fprintf(fd, "]\n"); - - fclose(fd); #endif } @@ -609,12 +560,15 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout) snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid); fd = fopen(fn, "a+"); + if (fd == NULL) { + syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno)); + cit_backtrace(); + exit(1); + } fprintf(fd, "Reading BLOB: BufSize: %d ", bytes); rv = fwrite(ChrPtr(Target), StrLength(Target), 1, fd); fprintf(fd, "]\n"); - - fclose(fd); #endif retval = StrBufReadBLOBBuffered(Target, @@ -624,7 +578,8 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout) 1, bytes, O_TERM, - &Error); + &Error + ); if (retval < 0) { syslog(LOG_CRIT, "client_read_blob() failed: %s", Error); client_close(); @@ -634,6 +589,11 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout) snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid); fd = fopen(fn, "a+"); + if (fd == NULL) { + syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno)); + cit_backtrace(); + exit(1); + } fprintf(fd, "Read: %d BufContent: [", StrLength(Target)); rv = fwrite(ChrPtr(Target), StrLength(Target), 1, fd); @@ -688,16 +648,18 @@ int client_read_random_blob(StrBuf *Target, int timeout) snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid); fd = fopen(fn, "a+"); + if (fd == NULL) { + syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno)); + cit_backtrace(); + exit(1); + } 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); } return rc; @@ -747,7 +709,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) @@ -771,6 +733,11 @@ int CtdlClientGetLine(StrBuf *Target) snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid); fd = fopen(fn, "a+"); + if (fd == NULL) { + syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno)); + cit_backtrace(); + exit(1); + } pch = ChrPtr(CCC->RecvBuf.Buf); len = StrLength(CCC->RecvBuf.Buf); if (CCC->RecvBuf.ReadWritePointer != NULL) @@ -824,6 +791,11 @@ int CtdlClientGetLine(StrBuf *Target) snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid); fd = fopen(fn, "a+"); + if (fd == NULL) { + syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno)); + cit_backtrace(); + exit(1); + } pch = ChrPtr(CCC->RecvBuf.Buf); len = StrLength(CCC->RecvBuf.Buf); if (CCC->RecvBuf.ReadWritePointer != NULL) @@ -843,7 +815,8 @@ int CtdlClientGetLine(StrBuf *Target) &CCC->client_socket, 5, 1, - &Error); + &Error + ); #ifdef BIGBAD_IODBG pch = ChrPtr(CCC->RecvBuf.Buf); @@ -918,7 +891,8 @@ int client_getln(char *buf, int bufsize) void close_masters (void) { struct ServiceFunctionHook *serviceptr; - + const char *Text; + /* * close all protocol master sockets */ @@ -927,18 +901,39 @@ void close_masters (void) if (serviceptr->tcp_port > 0) { - syslog(LOG_INFO, "Closing %d listener on port %d\n", + if (serviceptr->msock == -1) + Text = "not closing again"; + else + Text = "Closing"; + + syslog(LOG_INFO, "%s %d listener on port %d", + Text, serviceptr->msock, - serviceptr->tcp_port); + serviceptr->tcp_port + ); serviceptr->tcp_port = 0; } if (serviceptr->sockpath != NULL) - syslog(LOG_INFO, "Closing %d listener on '%s'\n", + { + if (serviceptr->msock == -1) + Text = "not closing again"; + else + Text = "Closing"; + + syslog(LOG_INFO, "%s %d listener on '%s'", + Text, serviceptr->msock, - serviceptr->sockpath); + serviceptr->sockpath + ); + } + 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); @@ -972,6 +967,7 @@ void sysdep_master_cleanup(void) { CtdlDestroyServiceHook(); CtdlDestroyRoomHooks(); CtdlDestroySearchHooks(); + CtdlDestroyDebugTable(); #ifdef HAVE_BACKTRACE /// eCrash_Uninit(); #endif @@ -1051,7 +1047,7 @@ void start_daemon(int unused) { } waitpid(current_child, &status, 0); } - do_restart = 0; + nFireUpsNonRestart = nFireUps; /* Exit code 0 means the watcher should exit */ @@ -1084,7 +1080,6 @@ void checkcrash(void) if (nFireUpsNonRestart != nFireUps) { StrBuf *CrashMail; - CrashMail = NewStrBuf(); syslog(LOG_ALERT, "Posting crash message\n"); StrBufPrintf(CrashMail, @@ -1113,7 +1108,7 @@ void checkcrash(void) */ int convert_login(char NameToConvert[]) { struct passwd *pw; - int a; + unsigned int a; pw = getpwnam(NameToConvert); if (pw == NULL) { @@ -1130,6 +1125,87 @@ 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_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; + } + } + + } + 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_EMERG, + "Found bad FD: %d and its a server socket! Shutting Down!\n", + serviceptr->msock); + + server_shutting_down = 1; + break; + } + } + + +} + +const char *WorkerLogStr = "W"; /* * This loop just keeps going and going and going... */ @@ -1146,7 +1222,9 @@ void *worker_thread(void *blah) { CitContext *con = NULL; /* Temporary context pointer */ int i; + pthread_mutex_lock(&ThreadCountMutex); ++num_workers; + pthread_mutex_unlock(&ThreadCountMutex); while (!server_shutting_down) { @@ -1221,7 +1299,8 @@ do_select: force_purge = 0; */ if (retval < 0) { if (errno == EBADF) { - syslog(LOG_NOTICE, "select() failed: (%s)\n", strerror(errno)); + syslog(LOG_EMERG, "select() failed: (%s)\n", strerror(errno)); + HuntBadSession (); goto do_select; } if (errno != EINTR) { @@ -1229,9 +1308,6 @@ do_select: force_purge = 0; server_shutting_down = 1; continue; } else { -#if 0 - syslog(LOG_DEBUG, "Interrupted select()\n"); -#endif if (server_shutting_down) { --num_workers; return(NULL); @@ -1260,9 +1336,7 @@ do_select: force_purge = 0; * operations barf on FreeBSD. Not a fatal error. */ if (fcntl(ssock, F_SETFL, 0) < 0) { - syslog(LOG_EMERG, - "citserver: Can't set socket to blocking: %s\n", - strerror(errno)); + syslog(LOG_EMERG, "citserver: Can't set socket to blocking: %s", strerror(errno)); } /* New context will be created already @@ -1271,6 +1345,7 @@ do_select: force_purge = 0; 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; @@ -1327,7 +1402,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); @@ -1361,11 +1439,23 @@ SKIP_SELECT: dead_session_purge(force_purge); do_housekeeping(); + + 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); } /* If control reaches this point, the server is shutting down */ + pthread_mutex_lock(&ThreadCountMutex); --num_workers; + pthread_mutex_unlock(&ThreadCountMutex); return(NULL); }