#include <limits.h>
#include <sys/resource.h>
#include <netinet/in.h>
+#include <netinet/tcp.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <sys/un.h>
* Note: the variable "buf" below needs to be large enough to handle any
* log data sent through this function. BE CAREFUL!
*/
+extern int running_as_daemon;
+static int enable_syslog = 1;
void lprintf(enum LogLevel loglevel, const char *format, ...) {
va_list arg_ptr;
- char buf[SIZ];
+ if (enable_syslog) {
+ va_start(arg_ptr, format);
+ vsyslog(loglevel, format, arg_ptr);
+ va_end(arg_ptr);
+ }
+
+ if (enable_syslog && LogHookTable == 0) return;
+
+ /* legacy output code; hooks get processed first */
+ char buf[SIZ];
va_start(arg_ptr, format);
- vsnprintf(buf, sizeof(buf), format, arg_ptr);
+ vsnprintf(buf, sizeof(buf), format, arg_ptr);
va_end(arg_ptr);
+ PerformLogHooks(loglevel, buf);
- if (syslog_facility >= 0) {
- if (loglevel <= verbosity) {
- /* Hackery -IO */
- if (CC->cs_pid != 0) {
- memmove(&buf[6], buf, sizeof(buf) - 6);
- snprintf(buf, 6, "[%3d]", CC->cs_pid);
- buf[5] = ' ';
- }
- syslog(loglevel, "%s", buf);
- }
- }
- else if (loglevel <= verbosity) {
+ if (enable_syslog || running_as_daemon) 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;
}
fflush(stderr);
}
-
- PerformLogHooks(loglevel, buf);
}
/*
- * We used to use master_cleanup() as a signal handler to shut down the server.
- * however, master_cleanup() and the functions it calls do some things that
- * aren't such a good idea to do from a signal handler: acquiring mutexes,
- * playing with signal masks on BSDI systems, etc. so instead we install the
- * following signal handler to set a global variable to inform the main loop
- * that it's time to call master_cleanup() and exit.
+ * Signal handler to shut down the server.
*/
volatile int time_to_die = 0;
static RETSIGTYPE signal_cleanup(int signum) {
+ lprintf(CTDL_DEBUG, "Caught signal %d; shutting down.\n", signum);
time_to_die = 1;
+ master_cleanup(signum);
}
signal(SIGQUIT, signal_cleanup);
signal(SIGHUP, signal_cleanup);
signal(SIGTERM, signal_cleanup);
+ signal(SIGSEGV, signal_cleanup);
/*
* Do not shut down the server on broken pipe signals, otherwise the
if (ContextList == NULL) {
ContextList = me;
me->cs_pid = 1;
+ me->prev = NULL;
me->next = NULL;
}
else if (ContextList->cs_pid > 1) {
+ me->prev = NULL;
me->next = ContextList;
ContextList = me;
me->cs_pid = 1;
if (ptr->next == NULL) {
ptr->next = me;
me->cs_pid = ptr->cs_pid + 1;
+ me->prev = ptr;
me->next = NULL;
goto DONE;
}
else if (ptr->next->cs_pid > (ptr->cs_pid+1)) {
+ me->prev = ptr;
me->next = ptr->next;
+ ptr->next->prev = me;
ptr->next = me;
me->cs_pid = ptr->cs_pid + 1;
goto DONE;
/*
- * buffer_output() ... tell client_write to buffer all output until
- * instructed to dump it all out later
+ * The following functions implement output buffering. If the kernel supplies
+ * native TCP buffering (Linux & *BSD), use that; otherwise, emulate it with
+ * user-space buffering.
*/
+#ifdef TCP_CORK
+# define HAVE_TCP_BUFFERING
+#else
+# ifdef TCP_NOPUSH
+# define HAVE_TCP_BUFFERING
+# define TCP_CORK TCP_NOPUSH
+# endif
+#endif
+
+
+#ifdef HAVE_TCP_BUFFERING
+static unsigned on = 1, off = 0;
+void buffer_output(void) {
+ struct CitContext *ctx = MyContext();
+ setsockopt(ctx->client_socket, IPPROTO_TCP, TCP_CORK, &on, 4);
+ ctx->buffering = 1;
+}
+
+void unbuffer_output(void) {
+ struct CitContext *ctx = MyContext();
+ setsockopt(ctx->client_socket, IPPROTO_TCP, TCP_CORK, &off, 4);
+ ctx->buffering = 0;
+}
+
+void flush_output(void) {
+ struct CitContext *ctx = MyContext();
+ setsockopt(ctx->client_socket, IPPROTO_TCP, TCP_CORK, &off, 4);
+ setsockopt(ctx->client_socket, IPPROTO_TCP, TCP_CORK, &on, 4);
+}
+#else
void buffer_output(void) {
if (CC->buffering == 0) {
CC->buffering = 1;
}
}
-/*
- * flush_output() ... dump out all that output we've been buffering.
- */
void flush_output(void) {
if (CC->buffering == 1) {
client_write(CC->output_buffer, CC->buffer_len);
}
}
-/*
- * unbuffer_output() ... stop buffering output.
- */
void unbuffer_output(void) {
if (CC->buffering == 1) {
CC->buffering = 0;
CC->output_buffer = NULL;
}
}
+#endif
int bytes_written = 0;
int retval;
int sock;
+#ifndef HAVE_TCP_BUFFERING
int old_buffer_len = 0;
+#endif
if (CC->redirect_fp != NULL) {
fwrite(buf, (size_t)nbytes, (size_t)1, CC->redirect_fp);
sock = CC->client_socket;
}
+#ifndef HAVE_TCP_BUFFERING
/* If we're buffering for later, do that now. */
if (CC->buffering) {
old_buffer_len = CC->buffer_len;
memcpy(&CC->output_buffer[old_buffer_len], buf, nbytes);
return;
}
+#endif
/* Ok, at this point we're not buffering. Go ahead and write. */
/*
- * client_gets() ... Get a LF-terminated line of text from the client.
+ * client_getln() ... Get a LF-terminated line of text from the client.
* (This is implemented in terms of client_read() and could be
* justifiably moved out of sysdep.c)
*/
-int client_gets(char *buf)
+int client_getln(char *buf, int bufsize)
{
int i, retval;
*/
for (i = 0;;i++) {
retval = client_read(&buf[i], 1);
- if (retval != 1 || buf[i] == '\n' || i == (SIZ-1))
+ if (retval != 1 || buf[i] == '\n' || i == (bufsize-1))
break;
}
/* If we got a long line, discard characters until the newline.
*/
- if (i == (SIZ-1))
+ if (i == (bufsize-1))
while (buf[i] != '\n' && retval == 1)
retval = client_read(&buf[i], 1);
/*
- * Start running as a daemon. Only close stdio if do_close_stdio is set.
+ * Start running as a daemon.
*/
-void start_daemon(int do_close_stdio) {
- if (do_close_stdio) {
- /* close(0); */
- close(1);
- close(2);
- }
+void start_daemon(int unused) {
+ close(0); close(1); close(2);
+ if (fork()) exit(0);
+ setsid();
signal(SIGHUP,SIG_IGN);
signal(SIGINT,SIG_IGN);
signal(SIGQUIT,SIG_IGN);
- if (fork()!=0) exit(0);
}
if(!strcasecmp(name, facTbl[i].name))
return facTbl[i].facility;
}
- return -1;
+ enable_syslog = 0;
+ return LOG_DAEMON;
}
projects / citadel.git / blobdiff