#include <pthread.h>
#include <signal.h>
#include "webcit.h"
+#include "webserver.h"
#ifndef HAVE_SNPRINTF
-int vsnprintf (char *buf, size_t max, const char *fmt, va_list argp);
+int vsnprintf(char *buf, size_t max, const char *fmt, va_list argp);
#endif
-int msock; /* master listening socket */
+int verbosity = 9; /* Logging level */
+int msock; /* master listening socket */
extern void *context_loop(int);
extern void *housekeeping_loop(void);
-extern pthread_mutex_t MasterCritter;
+extern pthread_mutex_t SessionListMutex;
+extern pthread_key_t MyConKey;
+
+
+char *server_cookie = NULL;
+
+
+char *defaulthost = DEFAULT_HOST;
+char *defaultport = DEFAULT_PORT;
+
+pthread_mutex_t AcceptQueue;
/*
* This is a generic function to set up a master socket for listening on
sin.sin_addr.s_addr = INADDR_ANY;
if (port_number == 0) {
- printf("webcit: Cannot start: no port number specified.\n");
+ lprintf(1, "Cannot start: no port number specified.\n");
exit(1);
- }
-
- sin.sin_port = htons((u_short)port_number);
+ }
+ sin.sin_port = htons((u_short) port_number);
s = socket(PF_INET, SOCK_STREAM, (getprotobyname("tcp")->p_proto));
if (s < 0) {
- printf("webcit: Can't create a socket: %s\n",
- strerror(errno));
+ lprintf(1, "Can't create a socket: %s\n",
+ strerror(errno));
exit(errno);
- }
-
+ }
/* Set some socket options that make sense. */
i = 1;
setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i));
- if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
- printf("webcit: Can't bind: %s\n", strerror(errno));
+ if (bind(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
+ lprintf(1, "Can't bind: %s\n", strerror(errno));
exit(errno);
- }
-
+ }
if (listen(s, queue_len) < 0) {
- printf("webcit: Can't listen: %s\n", strerror(errno));
+ lprintf(1, "Can't listen: %s\n", strerror(errno));
exit(errno);
- }
-
- return(s);
- }
-
-
-/*
- * client_write() ... Send binary data to the client.
- */
-void client_write(int sock, char *buf, int nbytes)
-{
- int bytes_written = 0;
- int retval;
- while (bytes_written < nbytes) {
- retval = write(sock, &buf[bytes_written],
- nbytes - bytes_written);
- if (retval < 1) {
- printf("client_write() failed: %s\n",
- strerror(errno));
- pthread_exit(NULL);
- }
- bytes_written = bytes_written + retval;
- }
}
-
-
-/*
- * cprintf() ... Send formatted printable data to the client. It is
- * implemented in terms of client_write() but remains in
- * sysdep.c in case we port to somewhere without va_args...
- */
-void cprintf(int sock, const char *format, ...) {
- va_list arg_ptr;
- char buf[256];
-
- va_start(arg_ptr, format);
- if (vsnprintf(buf, sizeof buf, format, arg_ptr) == -1)
- buf[sizeof buf - 2] = '\n';
- client_write(sock, buf, strlen(buf));
- va_end(arg_ptr);
- }
+ return (s);
+}
/*
* Read data from the client socket.
* Return values are:
- * 1 Requested number of bytes has been read.
- * 0 Request timed out.
- * If the socket breaks, the session is immediately terminated.
+ * 1 Requested number of bytes has been read.
+ * 0 Request timed out.
+ * -1 Connection is broken, or other error.
*/
int client_read_to(int sock, char *buf, int bytes, int timeout)
{
- int len,rlen;
+ int len, rlen;
fd_set rfds;
struct timeval tv;
int retval;
len = 0;
- while(len<bytes) {
+ while (len < bytes) {
FD_ZERO(&rfds);
FD_SET(sock, &rfds);
tv.tv_sec = timeout;
tv.tv_usec = 0;
- retval = select( (sock)+1,
- &rfds, NULL, NULL, &tv);
+ retval = select((sock) + 1,
+ &rfds, NULL, NULL, &tv);
if (FD_ISSET(sock, &rfds) == 0) {
- return(0);
- }
-
- rlen = read(sock, &buf[len], bytes-len);
- if (rlen<1) {
- printf("client_read() failed: %s\n",
- strerror(errno));
- pthread_exit(NULL);
- }
- len = len + rlen;
+ return (0);
+ }
+ rlen = read(sock, &buf[len], bytes - len);
+ if (rlen < 1) {
+ lprintf(2, "client_read() failed: %s\n",
+ strerror(errno));
+ return(-1);
}
- return(1);
+ len = len + rlen;
}
+ return (1);
+}
/*
* Read data from the client socket with default timeout.
*/
int client_read(int sock, char *buf, int bytes)
{
- return(client_read_to(sock, buf, bytes, SLEEPING));
- }
+ return (client_read_to(sock, buf, bytes, SLEEPING));
+}
/*
/* Read one character at a time.
*/
- for (i = 0;;i++) {
+ for (i = 0;; i++) {
retval = client_read(sock, &buf[i], 1);
if (retval != 1 || buf[i] == '\n' || i == 255)
break;
- }
+ }
/* If we got a long line, discard characters until the newline.
*/
retval = client_read(sock, &buf[i], 1);
/*
- * Strip any trailing not-printable characters.
+ * Strip any trailing non-printable characters.
*/
buf[i] = 0;
- while ((strlen(buf)>0)&&(!isprint(buf[strlen(buf)-1]))) {
- buf[strlen(buf)-1] = 0;
- }
- return(retval);
+ while ((strlen(buf) > 0) && (!isprint(buf[strlen(buf) - 1]))) {
+ buf[strlen(buf) - 1] = 0;
}
+ return (retval);
+}
/*
* Start running as a daemon. Only close stdio if do_close_stdio is set.
*/
-void start_daemon(int do_close_stdio) {
+void start_daemon(int do_close_stdio)
+{
if (do_close_stdio) {
/* close(0); */
close(1);
close(2);
- }
- signal(SIGHUP,SIG_IGN);
- signal(SIGINT,SIG_IGN);
- signal(SIGQUIT,SIG_IGN);
- if (fork()!=0) exit(0);
}
-
-/*
- * Issue an HTTP Redirect header
- * url must be a complete url (with http://)
- */
-void redirect(char *url) {
- printf("Location: %s\n\n", url);
+ signal(SIGHUP, SIG_IGN);
+ signal(SIGINT, SIG_IGN);
+ signal(SIGQUIT, SIG_IGN);
+ if (fork() != 0)
+ exit(0);
}
-const char *defaulthost = DEFAULT_HOST;
-const char *defaultport = DEFAULT_PORT;
+void spawn_another_worker_thread() {
+ pthread_t SessThread; /* Thread descriptor */
+ pthread_attr_t attr; /* Thread attributes */
+
+ lprintf(3, "Creating a new thread\n");
+
+ /* set attributes for the new thread */
+ pthread_attr_init(&attr);
+ pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+
+ /* now create the thread */
+ if (pthread_create(&SessThread, &attr,
+ (void *(*)(void *)) worker_entry, NULL)
+ != 0) {
+ lprintf(1, "Can't create thread: %s\n",
+ strerror(errno));
+ }
+}
/*
* Here's where it all begins.
*/
int main(int argc, char **argv)
{
- struct sockaddr_in fsin; /* Data for master socket */
- int alen; /* Data for master socket */
- int ssock; /* Descriptor for master socket */
- pthread_t SessThread; /* Thread descriptor */
- pthread_attr_t attr; /* Thread attributes */
- int a, i; /* General-purpose variables */
- int port = PORT_NUM; /* Port to listen on */
+ pthread_t SessThread; /* Thread descriptor */
+ pthread_attr_t attr; /* Thread attributes */
+ int a, i; /* General-purpose variables */
+ int port = PORT_NUM; /* Port to listen on */
+ char tracefile[PATH_MAX];
/* Parse command line */
- while ((a = getopt(argc, argv, "hp:")) != EOF)
+ while ((a = getopt(argc, argv, "hp:t:c")) != EOF)
switch (a) {
- case 'p':
+ case 'p':
port = atoi(optarg);
break;
- default:
+ case 't':
+ strcpy(tracefile, optarg);
+ freopen(tracefile, "w", stdout);
+ freopen(tracefile, "w", stderr);
+ freopen(tracefile, "r", stdin);
+ break;
+ case 'x':
+ verbosity = atoi(optarg);
+ break;
+ case 'c':
+ server_cookie = malloc(SIZ);
+ if (server_cookie != NULL) {
+ strcpy(server_cookie, "Set-cookie: wcserver=");
+ if (gethostname(
+ &server_cookie[strlen(server_cookie)],
+ 200) != 0) {
+ lprintf(2, "gethostname: %s\n",
+ strerror(errno));
+ free(server_cookie);
+ }
+ }
+ break;
+ default:
fprintf(stderr, "usage: webserver [-p localport] "
+ "[-t tracefile] [-c] "
"[remotehost [remoteport]]\n");
return 1;
- }
+ }
if (optind < argc) {
defaulthost = argv[optind];
if (++optind < argc)
defaultport = argv[optind];
- }
-
+ }
/* Tell 'em who's in da house */
- printf("WebCit v2 experimental\n");
- printf("Copyright (C) 1996-1998 by Art Cancro. ");
- printf("All rights reserved.\n\n");
+ lprintf(1, SERVER "\n"
+"Copyright (C) 1996-2001 by the Citadel/UX development team.\n"
+"This software is distributed under the terms of the GNU General Public\n"
+"License. If you paid for this software, someone is ripping you off.\n\n");
+
+ if (chdir(WEBCITDIR) != 0)
+ perror("chdir");
+
+ /*
+ * Set up a place to put thread-specific data.
+ * We only need a single pointer per thread - it points to the
+ * wcsession struct to which the thread is currently bound.
+ */
+ if (pthread_key_create(&MyConKey, NULL) != 0) {
+ lprintf(1, "Can't create TSD key: %s\n", strerror(errno));
+ }
/*
- * Bind the server to our favourite port.
+ * Bind the server to our favorite port.
* There is no need to check for errors, because ig_tcp_server()
* exits if it doesn't succeed.
*/
- printf("Attempting to bind to port %d...\n", port);
- msock = ig_tcp_server(port, 5);
- printf("Listening on socket %d\n", msock);
+ lprintf(2, "Attempting to bind to port %d...\n", port);
+ msock = ig_tcp_server(port, LISTEN_QUEUE_LENGTH);
+ lprintf(2, "Listening on socket %d\n", msock);
signal(SIGPIPE, SIG_IGN);
- pthread_mutex_init(&MasterCritter, NULL);
-
-
+ pthread_mutex_init(&SessionListMutex, NULL);
+ pthread_mutex_init(&AcceptQueue, NULL);
/*
* Start up the housekeeping thread
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
pthread_create(&SessThread, &attr,
- (void* (*)(void*)) housekeeping_loop, NULL);
+ (void *(*)(void *)) housekeeping_loop, NULL);
+
+
+ /* Start a few initial worker threads */
+ for (i=0; i<(INITIAL_WORKER_THREADS); ++i) {
+ spawn_another_worker_thread();
+ }
+ /* now the original thread can go away. */
+ pthread_exit(NULL);
+ return 0;
+}
- /*
- * Endless loop. Listen on the master socket. When a connection
- * comes in, create a socket, a context, and a thread.
- */
- while (1) {
- ssock = accept(msock, (struct sockaddr *)&fsin, &alen);
- printf("New connection on socket %d\n", ssock);
+/*
+ * Entry point for worker threads
+ */
+void worker_entry(void) {
+ int ssock;
+ struct sockaddr_in fsin;
+ int alen;
+ int i = 0;
+ int time_to_die = 0;
+ time_t start_time, stop_time;
+
+ do {
+ /* Only one thread can accept at a time */
+ start_time = time(NULL);
+ pthread_mutex_lock(&AcceptQueue);
+ ssock = accept(msock, (struct sockaddr *) &fsin, &alen);
+ pthread_mutex_unlock(&AcceptQueue);
+ stop_time = time(NULL);
+
+ /* Augment the thread pool if we're not blocking at all */
+ if ( (stop_time - start_time) == 0L) {
+ spawn_another_worker_thread();
+ }
+
if (ssock < 0) {
- printf("webcit: accept() failed: %s\n",
- strerror(errno));
- }
- else {
+ lprintf(2, "accept() failed: %s\n", strerror(errno));
+ } else {
/* Set the SO_REUSEADDR socket option */
i = 1;
setsockopt(ssock, SOL_SOCKET, SO_REUSEADDR,
- &i, sizeof(i));
-
- /* set attributes for the new thread */
- pthread_attr_init(&attr);
- pthread_attr_setdetachstate(&attr,
- PTHREAD_CREATE_DETACHED);
-
- /* now create the thread */
- if (pthread_create(&SessThread, &attr,
- (void* (*)(void*)) context_loop,
- (void*) ssock)
- != 0) {
- printf("webcit: can't create thread: %s\n",
- strerror(errno));
- }
+ &i, sizeof(i));
- }
+ /* Perform an HTTP transaction... */
+ context_loop(ssock);
+
+ /* ...and close the socket. */
+ lingering_close(ssock);
}
- }
+ } while (!time_to_die);
+
+ pthread_exit(NULL);
+}
+
+
+int lprintf(int loglevel, const char *format, ...)
+{
+ va_list ap;
+ char buf[4096];
+
+ va_start(ap, format);
+ vsprintf(buf, format, ap);
+ va_end(ap);
+
+ if (loglevel <= verbosity) {
+ struct timeval tv;
+ struct tm *tim;
+
+ gettimeofday(&tv, NULL);
+ tim = localtime(&(tv.tv_sec));
+
+ if (WC && WC->wc_session) {
+ fprintf(stderr,
+ "%04d/%02d/%02d %2d:%02d:%02d.%03ld [%ld:%d] %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 / 1000,
+ pthread_self(), WC->wc_session, buf);
+ } else {
+ fprintf(stderr,
+ "%04d/%02d/%02d %2d:%02d:%02d.%03ld [%ld] %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 / 1000,
+ pthread_self(), buf);
+ }
+ fflush(stderr);
+ }
+ return 1;
+}
projects / citadel.git / blobdiff