X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysdep.c;h=19e5eb5ce7a5df1f1b219a801b270426b14e4325;hb=8357d67fb22adec3b854d61bdbd898dcfcc91959;hp=b59445a850996413b669ab93574c6b6990df29a0;hpb=aa7365c86de8e26e796d3aa3fd605c85d8c26220;p=citadel.git diff --git a/citadel/sysdep.c b/citadel/sysdep.c index b59445a85..19e5eb5ce 100644 --- a/citadel/sysdep.c +++ b/citadel/sysdep.c @@ -19,70 +19,33 @@ */ #include "sysdep.h" -#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 + #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 "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 -#endif - -#ifndef HAVE_SNPRINTF -#include "snprintf.h" -#endif +#include "citserver.h" #include "ctdl_module.h" -#include "threads.h" -#include "user_ops.h" -#include "control.h" +#include "sysdep_decls.h" +#include "modules/crypto/serv_crypto.h" /* Needed for init_ssl, client_write_ssl, client_read_ssl, destruct_ssl */ +#include "housekeeping.h" +#include "context.h" /* * Signal handler to shut down the server. */ @@ -442,14 +405,16 @@ 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(); @@ -567,6 +532,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, "Reading BLOB: BufSize: %d ", bytes); rv = fwrite(ChrPtr(Target), StrLength(Target), 1, fd); @@ -583,6 +553,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); @@ -603,6 +578,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, "Reading BLOB: BufSize: %d ", bytes); rv = fwrite(ChrPtr(Target), StrLength(Target), 1, fd); @@ -628,6 +608,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); @@ -682,6 +667,11 @@ 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); @@ -765,6 +755,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) @@ -818,6 +813,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) @@ -912,7 +912,8 @@ int client_getln(char *buf, int bufsize) void close_masters (void) { struct ServiceFunctionHook *serviceptr; - + const char *Text; + /* * close all protocol master sockets */ @@ -921,18 +922,37 @@ 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\n", + Text, serviceptr->msock, 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'\n", + Text, serviceptr->msock, 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); @@ -963,6 +983,7 @@ void sysdep_master_cleanup(void) { CtdlDestroyCleanupHooks(); CtdlDestroyFixedOutputHooks(); CtdlDestroySessionHooks(); + CtdlDestroyTDAPVetoHooks(); CtdlDestroyServiceHook(); CtdlDestroyRoomHooks(); CtdlDestroySearchHooks(); @@ -1108,7 +1129,7 @@ void checkcrash(void) */ int convert_login(char NameToConvert[]) { struct passwd *pw; - int a; + unsigned int a; pw = getpwnam(NameToConvert); if (pw == NULL) { @@ -1125,6 +1146,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... */ @@ -1141,7 +1243,11 @@ void *worker_thread(void *blah) { CitContext *con = NULL; /* Temporary context pointer */ int i; + pthread_mutex_lock(&ThreadCountMutex); ++num_workers; + pthread_mutex_unlock(&ThreadCountMutex); + + pthread_setspecific(evConKey, WorkerLogStr); while (!server_shutting_down) { @@ -1216,7 +1322,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) { @@ -1323,7 +1430,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); @@ -1357,11 +1467,23 @@ SKIP_SELECT: dead_session_purge(force_purge); do_housekeeping(); + + 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 */ + pthread_mutex_lock(&ThreadCountMutex); --num_workers; + pthread_mutex_unlock(&ThreadCountMutex); return(NULL); }