X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysdep.c;h=67c7a7b9eaf143a50f8bd9c4d8695dc78c627352;hb=e704ad0e3d1ecb2f5e0c46984cc8902fcdc0ec36;hp=816ed3f16d0f527627d6571c4746d7406bef580d;hpb=64b7e8310ecc475692d6ce30c98dbb99fca605b1;p=citadel.git diff --git a/citadel/sysdep.c b/citadel/sysdep.c index 816ed3f16..67c7a7b9e 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. */ @@ -99,7 +51,7 @@ volatile int restart_server = 0; volatile int running_as_daemon = 0; static RETSIGTYPE signal_cleanup(int signum) { - syslog(LOG_DEBUG, "Caught signal %d; shutting down.", signum); + syslog(LOG_DEBUG, "sysdep: caught signal %d; shutting down.", signum); exit_signal = signum; server_shutting_down = 1; } @@ -139,7 +91,7 @@ void init_sysdep(void) { * session to which the calling thread is currently bound. */ if (pthread_key_create(&MyConKey, NULL) != 0) { - syslog(LOG_CRIT, "Can't create TSD key: %s", strerror(errno)); + syslog(LOG_CRIT, "sysdep: can't create TSD key: %s", strerror(errno)); } /* @@ -203,10 +155,8 @@ 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) - ); - syslog(LOG_ALERT, "%s", errormessage); + snprintf(errormessage, SIZ, "Error binding to [%s] : %s", ip_addr, strerror(errno)); + syslog(LOG_ALERT, "tcpserver: %s", errormessage); return (-1); } } @@ -217,14 +167,14 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme snprintf(errormessage, SIZ, "Error binding to [%s] : %s", ip_addr, strerror(errno) ); - syslog(LOG_ALERT, "%s", errormessage); + syslog(LOG_ALERT, "tcpserver: %s", errormessage); return (-1); } } if (port_number == 0) { snprintf(errormessage, SIZ, "Can't start: no port number specified."); - syslog(LOG_ALERT, "%s", errormessage); + syslog(LOG_ALERT, "tcpserver: %s", errormessage); return (-1); } sin6.sin6_port = htons((u_short) port_number); @@ -234,10 +184,8 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme 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) - ); - syslog(LOG_ALERT, "%s", errormessage); + snprintf(errormessage, SIZ, "Can't create a listening socket: %s", strerror(errno)); + syslog(LOG_ALERT, "tcpserver: %s", errormessage); return (-1); } /* Set some socket options that make sense. */ @@ -252,29 +200,22 @@ 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) - ); - syslog(LOG_ALERT, "%s", errormessage); + snprintf(errormessage, SIZ, "Can't bind: %s", strerror(errno)); + syslog(LOG_ALERT, "tcpserver: %s", errormessage); 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) - ); - syslog(LOG_ALERT, "%s", errormessage); + snprintf(errormessage, SIZ, "Can't listen: %s", strerror(errno)); + syslog(LOG_ALERT, "tcpserver: %s", errormessage); return (-1); } return (s); } - - - /* * Create a Unix domain socket and listen on it */ @@ -293,10 +234,8 @@ 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) - ); - syslog(LOG_EMERG, "%s", errormessage); + snprintf(errormessage, SIZ, "can't unlink %s: %s", sockpath, strerror(errno)); + syslog(LOG_EMERG, "udsserver: %s", errormessage); return(-1); } @@ -306,36 +245,28 @@ 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)); - syslog(LOG_EMERG, "%s", errormessage); + snprintf(errormessage, SIZ, "can't create a socket: %s", strerror(errno)); + syslog(LOG_EMERG, "udsserver: %s", errormessage); return(-1); } if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - snprintf(errormessage, SIZ, - "citserver: Can't bind: %s", - strerror(errno)); - syslog(LOG_EMERG, "%s", errormessage); + snprintf(errormessage, SIZ, "can't bind: %s", strerror(errno)); + syslog(LOG_EMERG, "udsserver: %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)); - syslog(LOG_EMERG, "%s", errormessage); + snprintf(errormessage, SIZ, "can't set socket to non-blocking: %s", strerror(errno)); + syslog(LOG_EMERG, "udsserver: %s", errormessage); close(s); return(-1); } if (listen(s, actual_queue_len) < 0) { - snprintf(errormessage, SIZ, - "citserver: Can't listen: %s", - strerror(errno)); - syslog(LOG_EMERG, "%s", errormessage); + snprintf(errormessage, SIZ, "can't listen: %s", strerror(errno)); + syslog(LOG_EMERG, "udsserver: %s", errormessage); return(-1); } @@ -348,7 +279,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). @@ -412,15 +342,12 @@ void client_close(void) { if (!CCC) return; if (CCC->client_socket <= 0) return; - syslog(LOG_DEBUG, "Closing socket %d", CCC->client_socket); - + 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. */ @@ -448,14 +375,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_ERR, "%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(); @@ -482,9 +410,7 @@ int client_write(const char *buf, int nbytes) if (select(1, NULL, &wset, NULL, NULL) == -1) { if (errno == EINTR) { - syslog(LOG_DEBUG, "client_write(%d bytes) select() interrupted.", - nbytes-bytes_written - ); + 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); @@ -494,7 +420,7 @@ int client_write(const char *buf, int nbytes) } } else { syslog(LOG_ERR, - "client_write(%d bytes) select failed: %s (%d)", + "sysdep: client_write(%d bytes) select failed: %s (%d)", nbytes - bytes_written, strerror(errno), errno ); @@ -509,7 +435,7 @@ int client_write(const char *buf, int nbytes) retval = write(Ctx->client_socket, &buf[bytes_written], nbytes - bytes_written); if (retval < 1) { syslog(LOG_ERR, - "client_write(%d bytes) failed: %s (%d)", + "sysdep: client_write(%d bytes) failed: %s (%d)", nbytes - bytes_written, strerror(errno), errno ); @@ -573,8 +499,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_ERR, "%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"); @@ -583,18 +513,20 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout) #endif retval = client_read_sslblob(Target, bytes, timeout); if (retval < 0) { - syslog(LOG_CRIT, "client_read_blob() failed"); + syslog(LOG_ERR, "sysdep: 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)); + if (fd == NULL) { + syslog(LOG_ERR, "%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 +541,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_ERR, "%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,9 +559,10 @@ 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); + syslog(LOG_ERR, "sysdep: client_read_blob() failed: %s", Error); client_close(); return retval; } @@ -634,6 +570,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_ERR, "%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 +629,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_ERR, "%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 +690,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 +714,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_ERR, "%s: %s", fn, strerror(errno)); + cit_backtrace(); + exit(1); + } pch = ChrPtr(CCC->RecvBuf.Buf); len = StrLength(CCC->RecvBuf.Buf); if (CCC->RecvBuf.ReadWritePointer != NULL) @@ -807,7 +755,7 @@ int CtdlClientGetLine(StrBuf *Target) fclose(fd); if (rc < 0) { - syslog(LOG_CRIT, "CtdlClientGetLine() failed"); + syslog(LOG_ERR, "sysdep: CtdlClientGetLine() failed"); } #endif return rc; @@ -824,6 +772,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_ERR, "%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 +796,8 @@ int CtdlClientGetLine(StrBuf *Target) &CCC->client_socket, 5, 1, - &Error); + &Error + ); #ifdef BIGBAD_IODBG pch = ChrPtr(CCC->RecvBuf.Buf); @@ -864,7 +818,7 @@ int CtdlClientGetLine(StrBuf *Target) fclose(fd); if ((rc < 0) && (Error != NULL)) { - syslog(LOG_CRIT, "CtdlClientGetLine() failed: %s", Error); + syslog(LOG_ERR, "sysdep: CtdlClientGetLine() failed: %s", Error); } #endif return rc; @@ -918,7 +872,8 @@ int client_getln(char *buf, int bufsize) void close_masters (void) { struct ServiceFunctionHook *serviceptr; - + const char *Text; + /* * close all protocol master sockets */ @@ -927,16 +882,41 @@ void close_masters (void) if (serviceptr->tcp_port > 0) { - syslog(LOG_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) - syslog(LOG_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); @@ -970,6 +950,7 @@ void sysdep_master_cleanup(void) { CtdlDestroyServiceHook(); CtdlDestroyRoomHooks(); CtdlDestroySearchHooks(); + CtdlDestroyDebugTable(); #ifdef HAVE_BACKTRACE /// eCrash_Uninit(); #endif @@ -1003,10 +984,9 @@ void start_daemon(int unused) { * 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) - syslog(LOG_EMERG, - "unable to change into directory [%s]: %s", - ctdl_run_dir, strerror(errno)); + if (chdir(ctdl_run_dir) != 0) { + syslog(LOG_ERR, "%s: %s", ctdl_run_dir, strerror(errno)); + } child = fork(); if (child != 0) { @@ -1019,28 +999,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)) - syslog(LOG_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: %s", strerror(errno)); + } 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) { @@ -1049,7 +1024,6 @@ void start_daemon(int unused) { } waitpid(current_child, &status, 0); } - do_restart = 0; nFireUpsNonRestart = nFireUps; /* Exit code 0 means the watcher should exit */ @@ -1082,9 +1056,8 @@ void checkcrash(void) if (nFireUpsNonRestart != nFireUps) { StrBuf *CrashMail; - CrashMail = NewStrBuf(); - syslog(LOG_ALERT, "Posting crash message\n"); + syslog(LOG_ALERT, "sysdep: posting crash message"); StrBufPrintf(CrashMail, " \n" " The Citadel server process (citserver) terminated unexpectedly." @@ -1093,7 +1066,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" @@ -1111,7 +1084,7 @@ void checkcrash(void) */ int convert_login(char NameToConvert[]) { struct passwd *pw; - int a; + unsigned int a; pw = getpwnam(NameToConvert); if (pw == NULL) { @@ -1128,6 +1101,84 @@ 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:%d] User[%s] Host[%s:%s]", + 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_ERR, "sysdep: found bad FD: %d and its a server socket! Shutting Down!", serviceptr->msock); + server_shutting_down = 1; + break; + } + } + + +} + +const char *WorkerLogStr = "W"; /* * This loop just keeps going and going and going... */ @@ -1144,7 +1195,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) { @@ -1219,17 +1272,15 @@ do_select: force_purge = 0; */ if (retval < 0) { if (errno == EBADF) { - syslog(LOG_NOTICE, "select() failed: (%s)\n", strerror(errno)); + syslog(LOG_ERR, "sysdep: select() failed: (%s)", strerror(errno)); + HuntBadSession(); goto do_select; } if (errno != EINTR) { - syslog(LOG_EMERG, "Exiting (%s)\n", strerror(errno)); + syslog(LOG_ERR, "sysdep: exiting (%s)", 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); @@ -1251,16 +1302,14 @@ do_select: force_purge = 0; if (FD_ISSET(serviceptr->msock, &readfds)) { ssock = accept(serviceptr->msock, NULL, 0); if (ssock >= 0) { - syslog(LOG_DEBUG, "New client socket %d", ssock); + 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_EMERG, - "citserver: Can't set socket to blocking: %s\n", - strerror(errno)); + syslog(LOG_ERR, "sysdep: Can't set socket to blocking: %s", strerror(errno)); } /* New context will be created already @@ -1269,6 +1318,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; @@ -1325,7 +1375,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); @@ -1359,11 +1412,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); }