X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysdep.c;h=e16c8a50b2228371d28a926b72fd17bb517ece86;hb=cb8cd32734a354007d10d75959ba990ac8baaa19;hp=a2c74f31e8f11309bf55be1e56fd2f6ef2ea0fbf;hpb=2b04732314572d8a432b706f3d3d5c34d67f16a4;p=citadel.git diff --git a/citadel/sysdep.c b/citadel/sysdep.c index a2c74f31e..e16c8a50b 100644 --- a/citadel/sysdep.c +++ b/citadel/sysdep.c @@ -1,6 +1,5 @@ /* * 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. @@ -8,6 +7,21 @@ * 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 as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * 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" @@ -75,101 +89,6 @@ #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; - char formatbuf[SIZ]; - char LWP[64]; - char SESS[64]; - - 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); - - *LWP = '\0'; - if (lwpid != 0) { - snprintf(LWP, 64, "[LWP:%ld] ", lwpid); - } - - *SESS = '\0'; - if (CCC != NULL) { - if (CCC->cs_pid != 0) { - snprintf(SESS, 64, " [%3d] ", CCC->cs_pid); - } - else if (CCC->user.usernum != 0) { - snprintf(SESS, 64, " [:%ld] ", CCC->user.usernum); - } - } - - snprintf(formatbuf, SIZ, - "%04d/%02d/%02d %2d:%02d:%02d.%06ld %s%s%s", - tim.tm_year + 1900, tim.tm_mon + 1, - tim.tm_mday, tim.tm_hour, tim.tm_min, - tim.tm_sec, (long)tv.tv_usec, - LWP, SESS, format - ); - - vfprintf(stderr, formatbuf, arg_ptr); - fflush(stderr); - } -} - - - /* * Signal handler to shut down the server. */ @@ -180,12 +99,14 @@ volatile int restart_server = 0; volatile int running_as_daemon = 0; static RETSIGTYPE signal_cleanup(int signum) { + ThreadTSD *Cc; - if (CT) - CT->signal = signum; + Cc = CTP; + if (Cc && Cc->self) + Cc->self->signal = signum; else { - CtdlLogPrintf(CTDL_DEBUG, "Caught signal %d; shutting down.\n", signum); + syslog(LOG_DEBUG, "Caught signal %d; shutting down.\n", signum); exit_signal = signum; } } @@ -225,7 +146,7 @@ void init_sysdep(void) { * 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", + syslog(LOG_CRIT, "Can't create TSD key: %s\n", strerror(errno)); } @@ -235,22 +156,14 @@ void init_sysdep(void) { */ sigemptyset(&set); sigaddset(&set, SIGINT); // intr = shutdown - // sigaddset(&set, SIGQUIT); // quit = force quit 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(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 @@ -301,7 +214,7 @@ 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) ); - CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage); + syslog(LOG_ALERT, "%s\n", errormessage); return (-1); } } @@ -312,7 +225,7 @@ 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) ); - CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage); + syslog(LOG_ALERT, "%s\n", errormessage); return (-1); } } @@ -321,7 +234,7 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme snprintf(errormessage, SIZ, "Can't start: no port number specified." ); - CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage); + syslog(LOG_ALERT, "%s\n", errormessage); return (-1); } sin6.sin6_port = htons((u_short) port_number); @@ -334,7 +247,7 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme snprintf(errormessage, SIZ, "Can't create a listening socket: %s", strerror(errno) ); - CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage); + syslog(LOG_ALERT, "%s\n", errormessage); return (-1); } /* Set some socket options that make sense. */ @@ -352,7 +265,7 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme snprintf(errormessage, SIZ, "Can't bind: %s", strerror(errno) ); - CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage); + syslog(LOG_ALERT, "%s\n", errormessage); return (-1); } @@ -362,7 +275,7 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme snprintf(errormessage, SIZ, "Can't listen: %s", strerror(errno) ); - CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage); + syslog(LOG_ALERT, "%s\n", errormessage); return (-1); } return (s); @@ -393,7 +306,7 @@ int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage) snprintf(errormessage, SIZ, "citserver: can't unlink %s: %s", sockpath, strerror(errno) ); - CtdlLogPrintf(CTDL_EMERG, "%s\n", errormessage); + syslog(LOG_EMERG, "%s\n", errormessage); return(-1); } @@ -406,7 +319,7 @@ int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage) snprintf(errormessage, SIZ, "citserver: Can't create a socket: %s", strerror(errno)); - CtdlLogPrintf(CTDL_EMERG, "%s\n", errormessage); + syslog(LOG_EMERG, "%s\n", errormessage); return(-1); } @@ -414,7 +327,7 @@ int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage) snprintf(errormessage, SIZ, "citserver: Can't bind: %s", strerror(errno)); - CtdlLogPrintf(CTDL_EMERG, "%s\n", errormessage); + syslog(LOG_EMERG, "%s\n", errormessage); return(-1); } @@ -423,7 +336,7 @@ int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage) snprintf(errormessage, SIZ, "citserver: Can't set socket to non-blocking: %s", strerror(errno)); - CtdlLogPrintf(CTDL_EMERG, "%s\n", errormessage); + syslog(LOG_EMERG, "%s\n", errormessage); close(s); return(-1); } @@ -432,7 +345,7 @@ int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage) snprintf(errormessage, SIZ, "citserver: Can't listen: %s", strerror(errno)); - CtdlLogPrintf(CTDL_EMERG, "%s\n", errormessage); + syslog(LOG_EMERG, "%s\n", errormessage); return(-1); } @@ -495,11 +408,30 @@ 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; + int r; + + if (!CCC) return; + if (CCC->client_socket <= 0) return; + syslog(LOG_DEBUG, "Closing socket %d\n", CCC->client_socket); + r = close(CCC->client_socket); + if (!r) syslog(LOG_INFO, "close() failed: %s\n", strerror(errno)); + CCC->client_socket = -1 ; +} + + + + /* * client_write() ... Send binary data to the client. */ @@ -527,13 +459,14 @@ int client_write(const char *buf, int nbytes) snprintf(fn, SIZ, "/tmp/foolog_%s.%d", Ctx->ServiceName, Ctx->cs_pid); fd = fopen(fn, "a+"); - fprintf(fd, "Sending: BufSize: %d BufContent: [", - nbytes); - rv = fwrite(buf, nbytes, 1, fd); - fprintf(fd, "]\n"); - - - fclose(fd); + if (fd) + { + fprintf(fd, "Sending: BufSize: %d BufContent: [", + nbytes); + rv = fwrite(buf, nbytes, 1, fd); + fprintf(fd, "]\n"); + fclose(fd); + } } #endif // flush_client_inbuf(); @@ -560,36 +493,39 @@ 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); + syslog(LOG_DEBUG, "client_write(%d bytes) select() interrupted.\n", nbytes-bytes_written); if (CtdlThreadCheckStop()) { - CC->kill_me = 1; + 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, + syslog(LOG_ERR, "client_write(%d bytes) select failed: %s (%d)\n", nbytes - bytes_written, - strerror(errno), errno); + strerror(errno), errno + ); cit_backtrace(); - Ctx->kill_me = 1; + 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, + syslog(LOG_ERR, "client_write(%d bytes) failed: %s (%d)\n", nbytes - bytes_written, - strerror(errno), errno); + strerror(errno), errno + ); cit_backtrace(); - // CtdlLogPrintf(CTDL_DEBUG, "Tried to send: %s", &buf[bytes_written]); - Ctx->kill_me = 1; + client_close(); + // syslog(LOG_DEBUG, "Tried to send: %s", &buf[bytes_written]); + Ctx->kill_me = KILLME_WRITE_FAILED; return -1; } bytes_written = bytes_written + retval; @@ -657,7 +593,7 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout) #endif retval = client_read_sslblob(Target, bytes, timeout); if (retval < 0) { - CtdlLogPrintf(CTDL_CRIT, + syslog(LOG_CRIT, "%s failed\n", __FUNCTION__); } @@ -694,18 +630,16 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout) fclose(fd); #endif retval = StrBufReadBLOBBuffered(Target, - CCC->ReadBuf, - &CCC->Pos, + CCC->RecvBuf.Buf, + &CCC->RecvBuf.ReadWritePointer, &CCC->client_socket, 1, bytes, O_TERM, &Error); if (retval < 0) { - CtdlLogPrintf(CTDL_CRIT, - "%s failed: %s\n", - __FUNCTION__, - Error); + syslog(LOG_CRIT, "%s failed: %s\n", __FUNCTION__, Error); + client_close(); return retval; } #ifdef BIGBAD_IODBG @@ -716,8 +650,6 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout) StrLength(Target)); rv = fwrite(ChrPtr(Target), StrLength(Target), 1, fd); fprintf(fd, "]\n"); - - fclose(fd); #endif } @@ -731,8 +663,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) @@ -746,18 +679,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; + FlushStrBuf(CCC->RecvBuf.Buf); + CCC->RecvBuf.ReadWritePointer = NULL; #ifdef BIGBAD_IODBG { int rv = 0; @@ -809,10 +742,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; @@ -850,10 +783,10 @@ int CtdlClientGetLine(StrBuf *Target) 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; + pch = ChrPtr(CCC->RecvBuf.Buf); + len = StrLength(CCC->RecvBuf.Buf); + if (CCC->RecvBuf.ReadWritePointer != NULL) + rlen = CCC->RecvBuf.ReadWritePointer - pch; else rlen = 0; @@ -864,14 +797,14 @@ int CtdlClientGetLine(StrBuf *Target) len, rlen); #endif rc = client_readline_sslbuffer(Target, - CCC->ReadBuf, - &CCC->Pos, + CCC->RecvBuf.Buf, + &CCC->RecvBuf.ReadWritePointer, 1); #ifdef BIGBAD_IODBG - pch = ChrPtr(CCC->ReadBuf); - nlen = StrLength(CCC->ReadBuf); - if (CCC->Pos != NULL) - nrlen = CC->Pos - pch; + pch = ChrPtr(CCC->RecvBuf.Buf); + nlen = StrLength(CCC->RecvBuf.Buf); + if (CCC->RecvBuf.ReadWritePointer != NULL) + nrlen = CCC->RecvBuf.ReadWritePointer - pch; else nrlen = 0; /* @@ -886,7 +819,7 @@ int CtdlClientGetLine(StrBuf *Target) fclose(fd); if (rc < 0) - CtdlLogPrintf(CTDL_CRIT, + syslog(LOG_CRIT, "%s failed\n", __FUNCTION__); #endif @@ -904,10 +837,10 @@ int CtdlClientGetLine(StrBuf *Target) 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; + pch = ChrPtr(CCC->RecvBuf.Buf); + len = StrLength(CCC->RecvBuf.Buf); + if (CCC->RecvBuf.ReadWritePointer != NULL) + rlen = CCC->RecvBuf.ReadWritePointer - pch; else rlen = 0; @@ -918,18 +851,18 @@ int CtdlClientGetLine(StrBuf *Target) 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; + pch = ChrPtr(CCC->RecvBuf.Buf); + nlen = StrLength(CCC->RecvBuf.Buf); + if (CCC->RecvBuf.ReadWritePointer != NULL) + nrlen = CCC->RecvBuf.ReadWritePointer - pch; else nrlen = 0; /* @@ -944,7 +877,7 @@ int CtdlClientGetLine(StrBuf *Target) fclose(fd); if ((rc < 0) && (Error != NULL)) - CtdlLogPrintf(CTDL_CRIT, + syslog(LOG_CRIT, "%s failed: %s\n", __FUNCTION__, Error); @@ -1009,13 +942,13 @@ void close_masters (void) if (serviceptr->tcp_port > 0) { - CtdlLogPrintf(CTDL_INFO, "Closing listener on port %d\n", + syslog(LOG_INFO, "Closing listener on port %d\n", serviceptr->tcp_port); serviceptr->tcp_port = 0; } if (serviceptr->sockpath != NULL) - CtdlLogPrintf(CTDL_INFO, "Closing listener on '%s'\n", + syslog(LOG_INFO, "Closing listener on '%s'\n", serviceptr->sockpath); close(serviceptr->msock); @@ -1051,6 +984,7 @@ void sysdep_master_cleanup(void) { CtdlDestroySessionHooks(); CtdlDestroyServiceHook(); CtdlDestroyRoomHooks(); + CtdlDestroySearchHooks(); #ifdef HAVE_BACKTRACE /// eCrash_Uninit(); #endif @@ -1085,7 +1019,7 @@ void start_daemon(int unused) { * to be reused for other files. */ if (chdir(ctdl_run_dir) != 0) - CtdlLogPrintf(CTDL_EMERG, + syslog(LOG_EMERG, "unable to change into directory [%s]: %s", ctdl_run_dir, strerror(errno)); @@ -1103,7 +1037,7 @@ void start_daemon(int unused) { if ((freopen("/dev/null", "r", stdin) != stdin) || (freopen("/dev/null", "w", stdout) != stdout) || (freopen("/dev/null", "w", stderr) != stderr)) - CtdlLogPrintf(CTDL_EMERG, + syslog(LOG_EMERG, "unable to reopen stdin/out/err %s", strerror(errno)); @@ -1165,7 +1099,7 @@ void checkcrash(void) StrBuf *CrashMail; CrashMail = NewStrBuf(); - CtdlLogPrintf(CTDL_ALERT, "Posting crash message\n"); + syslog(LOG_ALERT, "Posting crash message\n"); StrBufPrintf(CrashMail, " \n" " The Citadel server process (citserver) terminated unexpectedly." @@ -1212,31 +1146,6 @@ int convert_login(char NameToConvert[]) { /* * 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) { int highest; CitContext *ptr; @@ -1262,16 +1171,17 @@ do_select: force_purge = 0; 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; @@ -1308,16 +1218,18 @@ do_select: force_purge = 0; */ if (retval < 0) { if (errno == EBADF) { - CtdlLogPrintf(CTDL_NOTICE, "select() failed: (%s)\n", + syslog(LOG_NOTICE, "select() failed: (%s)\n", strerror(errno)); goto do_select; } if (errno != EINTR) { - CtdlLogPrintf(CTDL_EMERG, "Exiting (%s)\n", strerror(errno)); + syslog(LOG_EMERG, "Exiting (%s)\n", strerror(errno)); CtdlThreadStopAll(); continue; } else { - CtdlLogPrintf(CTDL_DEBUG, "Interrupted CtdlThreadSelect.\n"); +#if 0 + syslog(LOG_DEBUG, "Interrupted CtdlThreadSelect.\n"); +#endif if (CtdlThreadCheckStop()) return(NULL); goto do_select; } @@ -1450,15 +1362,17 @@ void *select_on_master (void *arg) */ if (retval < 0) { if (errno == EBADF) { - CtdlLogPrintf(CTDL_NOTICE, "select() failed: (%s)\n", + syslog(LOG_NOTICE, "select() failed: (%s)\n", strerror(errno)); continue; } if (errno != EINTR) { - CtdlLogPrintf(CTDL_EMERG, "Exiting (%s)\n", strerror(errno)); + syslog(LOG_EMERG, "Exiting (%s)\n", strerror(errno)); CtdlThreadStopAll(); } else { - CtdlLogPrintf(CTDL_DEBUG, "Interrupted CtdlThreadSelect.\n"); +#if 0 + syslog(LOG_DEBUG, "Interrupted CtdlThreadSelect.\n"); +#endif if (CtdlThreadCheckStop()) return(NULL); continue; } @@ -1476,16 +1390,14 @@ void *select_on_master (void *arg) 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); + syslog(LOG_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, + syslog(LOG_EMERG, "citserver: Can't set socket to blocking: %s\n", strerror(errno)); } @@ -1497,26 +1409,20 @@ void *select_on_master (void *arg) /* 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_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; + 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)); - + setsockopt(ssock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)); con->state = CON_GREETING; - retval--; if (retval == 0) break; @@ -1567,115 +1473,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 */