/*
* 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.
*
+ * Copyright (c) 1987-2015 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 <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <ctype.h>
+
+#include <errno.h>
#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
+#include <stdio.h>
#include <syslog.h>
#include <sys/syslog.h>
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-#include <limits.h>
-#include <sys/resource.h>
+#include <sys/un.h>
+#include <sys/types.h>
+#include <sys/socket.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <netinet/tcp.h>
#include <arpa/inet.h>
-#include <netdb.h>
-#include <sys/un.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <grp.h>
+
#define SHOW_ME_VAPPEND_PRINTF
#include <libcitadel.h>
-#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 <sys/select.h>
-#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;
- 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);
- }
-}
-
+#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.
*/
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;
- }
+ syslog(LOG_DEBUG, "Caught signal %d; shutting down.", signum);
+ exit_signal = signum;
+ server_shutting_down = 1;
}
static RETSIGTYPE signal_exit(int signum) {
* 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(&MyConKey, NULL) != 0) {
+ syslog(LOG_CRIT, "Can't create TSD key: %s", strerror(errno));
}
/*
- * 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
snprintf(errormessage, SIZ,
"Error binding to [%s] : %s", ip_addr, strerror(errno)
);
- CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage);
+ syslog(LOG_ALERT, "%s", errormessage);
return (-1);
}
}
snprintf(errormessage, SIZ,
"Error binding to [%s] : %s", ip_addr, strerror(errno)
);
- CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage);
+ syslog(LOG_ALERT, "%s", errormessage);
return (-1);
}
}
if (port_number == 0) {
- snprintf(errormessage, SIZ,
- "Can't start: no port number specified."
- );
- CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage);
+ snprintf(errormessage, SIZ, "Can't start: no port number specified.");
+ syslog(LOG_ALERT, "%s", errormessage);
return (-1);
}
sin6.sin6_port = htons((u_short) port_number);
snprintf(errormessage, SIZ,
"Can't create a listening socket: %s", strerror(errno)
);
- CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage);
+ syslog(LOG_ALERT, "%s", errormessage);
return (-1);
}
/* Set some socket options that make sense. */
snprintf(errormessage, SIZ,
"Can't bind: %s", strerror(errno)
);
- CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage);
+ syslog(LOG_ALERT, "%s", errormessage);
return (-1);
}
snprintf(errormessage, SIZ,
"Can't listen: %s", strerror(errno)
);
- CtdlLogPrintf(CTDL_ALERT, "%s\n", errormessage);
+ syslog(LOG_ALERT, "%s", errormessage);
return (-1);
}
return (s);
snprintf(errormessage, SIZ, "citserver: can't unlink %s: %s",
sockpath, strerror(errno)
);
- CtdlLogPrintf(CTDL_EMERG, "%s\n", errormessage);
+ syslog(LOG_EMERG, "%s", errormessage);
return(-1);
}
snprintf(errormessage, SIZ,
"citserver: Can't create a socket: %s",
strerror(errno));
- CtdlLogPrintf(CTDL_EMERG, "%s\n", errormessage);
+ syslog(LOG_EMERG, "%s", errormessage);
return(-1);
}
snprintf(errormessage, SIZ,
"citserver: Can't bind: %s",
strerror(errno));
- CtdlLogPrintf(CTDL_EMERG, "%s\n", errormessage);
+ syslog(LOG_EMERG, "%s", errormessage);
return(-1);
}
snprintf(errormessage, SIZ,
"citserver: Can't set socket to non-blocking: %s",
strerror(errno));
- CtdlLogPrintf(CTDL_EMERG, "%s\n", errormessage);
+ syslog(LOG_EMERG, "%s", errormessage);
close(s);
return(-1);
}
snprintf(errormessage, SIZ,
"citserver: Can't listen: %s",
strerror(errno));
- CtdlLogPrintf(CTDL_EMERG, "%s\n", errormessage);
+ syslog(LOG_EMERG, "%s", errormessage);
return(-1);
}
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, "Closing socket %d", CCC->client_socket);
+
+ close(CCC->client_socket);
+ CCC->client_socket = -1 ;
+}
+
+
+
+
/*
* client_write() ... Send binary data to the client.
*/
snprintf(fn, SIZ, "/tmp/foolog_%s.%d", Ctx->ServiceName, Ctx->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, "Sending: BufSize: %d BufContent: [",
nbytes);
rv = fwrite(buf, nbytes, 1, fd);
fprintf(fd, "]\n");
-
-
fclose(fd);
}
#endif
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, "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",
+ syslog(LOG_ERR,
+ "client_write(%d bytes) select failed: %s (%d)",
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,
- "client_write(%d bytes) failed: %s (%d)\n",
+ syslog(LOG_ERR,
+ "client_write(%d bytes) failed: %s (%d)",
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();
+ Ctx->kill_me = KILLME_WRITE_FAILED;
return -1;
}
bytes_written = bytes_written + retval;
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);
#endif
retval = client_read_sslblob(Target, bytes, timeout);
if (retval < 0) {
- CtdlLogPrintf(CTDL_CRIT,
- "%s failed\n",
- __FUNCTION__);
+ syslog(LOG_CRIT, "client_read_blob() failed");
}
#ifdef BIGBAD_IODBG
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);
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);
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, "client_read_blob() failed: %s", Error);
+ client_close();
return retval;
}
#ifdef BIGBAD_IODBG
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);
fprintf(fd, "]\n");
-
-
fclose(fd);
#endif
}
*/
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)
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;
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);
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;
*/
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)
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;
+ 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)
+ rlen = CCC->RecvBuf.ReadWritePointer - pch;
else
rlen = 0;
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;
/*
StrLength(Target), ChrPtr(Target));
fclose(fd);
- if (rc < 0)
- CtdlLogPrintf(CTDL_CRIT,
- "%s failed\n",
- __FUNCTION__);
+ if (rc < 0) {
+ syslog(LOG_CRIT, "CtdlClientGetLine() failed");
+ }
#endif
return rc;
}
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;
+ 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)
+ rlen = CCC->RecvBuf.ReadWritePointer - pch;
else
rlen = 0;
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;
/*
StrLength(Target), ChrPtr(Target));
fclose(fd);
- if ((rc < 0) && (Error != NULL))
- CtdlLogPrintf(CTDL_CRIT,
- "%s failed: %s\n",
- __FUNCTION__,
- Error);
+ if ((rc < 0) && (Error != NULL)) {
+ syslog(LOG_CRIT, "CtdlClientGetLine() failed: %s", Error);
+ }
#endif
return rc;
}
void close_masters (void)
{
struct ServiceFunctionHook *serviceptr;
-
+ const char *Text;
+
/*
* close all protocol master sockets
*/
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, "%s %d listener on port %d\n",
+ 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, "%s %d listener on '%s'\n",
+ 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);
CtdlDestroyCleanupHooks();
CtdlDestroyFixedOutputHooks();
CtdlDestroySessionHooks();
+ CtdlDestroyTDAPVetoHooks();
CtdlDestroyServiceHook();
CtdlDestroyRoomHooks();
+ CtdlDestroySearchHooks();
+ CtdlDestroyDebugTable();
#ifdef HAVE_BACKTRACE
/// eCrash_Uninit();
#endif
* 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));
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));
}
waitpid(current_child, &status, 0);
}
- do_restart = 0;
+
nFireUpsNonRestart = nFireUps;
/* Exit code 0 means the watcher should exit */
if (nFireUpsNonRestart != nFireUps)
{
StrBuf *CrashMail;
-
+ const char *msgs[1] = {"crash"};
+ const long lens[1] = {sizeof("crash") - 1};
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."
"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"
,
ctdl_run_dir, ForkedPid);
- CtdlAideMessage(ChrPtr(CrashMail), "Citadel server process terminated unexpectedly");
+ CtdlAideFPMessage(ChrPtr(CrashMail),
+ "Citadel server process terminated unexpectedly",
+ 1, msgs, lens,
+ 0, 0,
+ time(NULL));
FreeStrBuf(&CrashMail);
}
}
*/
int convert_login(char NameToConvert[]) {
struct passwd *pw;
- int a;
+ unsigned int a;
pw = getpwnam(NameToConvert);
if (pw == NULL) {
+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...
*/
-/*
- * 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;
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;
+
+ pthread_mutex_lock(&ThreadCountMutex);
+ ++num_workers;
+ pthread_mutex_unlock(&ThreadCountMutex);
+
+ pthread_setspecific(evConKey, WorkerLogStr);
- while (!CtdlThreadCheckStop()) {
+ while (!server_shutting_down) {
/* make doubly sure we're not holding any stale db handles
* which might cause a deadlock.
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;
* 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_EMERG, "select() failed: (%s)\n", strerror(errno));
+ HuntBadSession ();
goto do_select;
}
if (errno != EINTR) {
- CtdlLogPrintf(CTDL_EMERG, "Exiting (%s)\n", strerror(errno));
- CtdlThreadStopAll();
+ syslog(LOG_EMERG, "Exiting (%s)\n", strerror(errno));
+ server_shutting_down = 1;
continue;
} else {
- CtdlLogPrintf(CTDL_DEBUG, "Interrupted CtdlThreadSelect.\n");
- if (CtdlThreadCheckStop()) return(NULL);
+#if 0
+ syslog(LOG_DEBUG, "Interrupted select()\n");
+#endif
+ 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, "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));
+ }
+
+ /* 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;
+
+ /* 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;
+ }
+ }
}
/* It must be a client socket. Find a context that has data
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);
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);
}
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 */