#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);
#endif
+int verbosity = 9; /* Logging level */
int msock; /* master listening socket */
+int is_https = 0; /* Nonzero if I am an HTTPS service */
extern void *context_loop(int);
extern void *housekeeping_loop(void);
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;
+char *ctdlhost = DEFAULT_HOST;
+char *ctdlport = DEFAULT_PORT;
/*
* 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) {
- fprintf(stderr,
- "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);
s = socket(PF_INET, SOCK_STREAM, (getprotobyname("tcp")->p_proto));
if (s < 0) {
- fprintf(stderr, "webcit: Can't create a socket: %s\n",
+ lprintf(1, "Can't create a socket: %s\n",
strerror(errno));
exit(errno);
}
setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i));
if (bind(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
- fprintf(stderr, "webcit: Can't bind: %s\n", strerror(errno));
+ lprintf(1, "Can't bind: %s\n", strerror(errno));
exit(errno);
}
if (listen(s, queue_len) < 0) {
- fprintf(stderr, "webcit: Can't listen: %s\n", strerror(errno));
+ lprintf(1, "Can't listen: %s\n", strerror(errno));
exit(errno);
}
return (s);
struct timeval tv;
int retval;
+
+#ifdef HAVE_OPENSSL
+ if (is_https) {
+ return(client_read_ssl(buf, bytes, timeout));
+ }
+#endif
+
len = 0;
while (len < bytes) {
FD_ZERO(&rfds);
if (FD_ISSET(sock, &rfds) == 0) {
return (0);
}
+
rlen = read(sock, &buf[len], bytes - len);
+
if (rlen < 1) {
- fprintf(stderr, "client_read() failed: %s\n",
+ lprintf(2, "client_read() failed: %s\n",
strerror(errno));
return(-1);
}
return (1);
}
+
+ssize_t client_write(const void *buf, size_t count) {
+#ifdef HAVE_OPENSSL
+ if (is_https) {
+ client_write_ssl((char *)buf, count);
+ return(count);
+ }
+#endif
+ return(write(WC->http_sock, buf, count));
+}
+
+
/*
* Read data from the client socket with default timeout.
* (This is implemented in terms of client_read_to() and could be
pthread_t SessThread; /* Thread descriptor */
pthread_attr_t attr; /* Thread attributes */
- fprintf(stderr, "Creating a new thread\n");
+ lprintf(3, "Creating a new thread\n");
/* set attributes for the new thread */
pthread_attr_init(&attr);
if (pthread_create(&SessThread, &attr,
(void *(*)(void *)) worker_entry, NULL)
!= 0) {
- fprintf(stderr, "webcit: can't create thread: %s\n",
+ lprintf(1, "Can't create thread: %s\n",
strerror(errno));
}
}
pthread_attr_t attr; /* Thread attributes */
int a, i; /* General-purpose variables */
int port = PORT_NUM; /* Port to listen on */
+ int https_port = (-1);
char tracefile[PATH_MAX];
/* Parse command line */
- while ((a = getopt(argc, argv, "hp:t:")) != EOF)
+#ifdef HAVE_OPENSSL
+ while ((a = getopt(argc, argv, "hp:t:cs:")) != EOF)
+#else
+ while ((a = getopt(argc, argv, "hp:t:c")) != EOF)
+#endif
switch (a) {
case 'p':
port = atoi(optarg);
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;
+ case 's':
+ https_port = atoi(optarg);
+ break;
default:
- fprintf(stderr, "usage: webserver [-p localport] "
- "[-t tracefile] "
+ fprintf(stderr, "usage: webserver [-p http_port] "
+ "[-t tracefile] [-c] "
+#ifdef HAVE_OPENSSL
+ "[-s https_port] "
+#endif
"[remotehost [remoteport]]\n");
return 1;
}
if (optind < argc) {
- defaulthost = argv[optind];
+ ctdlhost = argv[optind];
if (++optind < argc)
- defaultport = argv[optind];
+ ctdlport = argv[optind];
}
/* Tell 'em who's in da house */
- fprintf(stderr, SERVER "\n"
- "Copyright (C) 1996-1999. All rights reserved.\n\n");
+ lprintf(1, SERVER "\n"
+"Copyright (C) 1996-2004 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");
+ /*
+ * If an HTTPS port was specified, fork an HTTPS server.
+ */
+ if (https_port > 0) {
+ if (fork() == 0) {
+ is_https = 1;
+ port = https_port;
+ }
+ }
+
/*
* 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) {
- fprintf(stderr, "Can't create TSD key: %s\n", strerror(errno));
+ lprintf(1, "Can't create TSD key: %s\n", strerror(errno));
}
+ /*
+ * Set up a place to put thread-specific SSL data.
+ * We don't stick this in the wcsession struct because SSL starts
+ * up before the session is bound, and it gets torn down between
+ * transactions.
+ */
+#ifdef HAVE_OPENSSL
+ if (pthread_key_create(&ThreadSSL, NULL) != 0) {
+ lprintf(1, "Can't create TSD key: %s\n", strerror(errno));
+ }
+#endif
+
/*
* 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.
*/
- fprintf(stderr, "Attempting to bind to port %d...\n", port);
+ lprintf(2, "Attempting to bind to port %d...\n", port);
msock = ig_tcp_server(port, LISTEN_QUEUE_LENGTH);
- fprintf(stderr, "Listening on socket %d\n", msock);
+ lprintf(2, "Listening on socket %d\n", msock);
signal(SIGPIPE, SIG_IGN);
pthread_mutex_init(&SessionListMutex, NULL);
- pthread_mutex_init(&AcceptQueue, NULL);
/*
* Start up the housekeeping thread
(void *(*)(void *)) housekeeping_loop, NULL);
+ /*
+ * If this is an HTTPS server, fire up SSL
+ */
+#ifdef HAVE_OPENSSL
+ if (is_https) {
+ init_ssl();
+ }
+#endif
+
/* Start a few initial worker threads */
- for (i=0; i<(INITIAL_WORKER_THREADS-1); ++i) {
+ for (i=0; i<(MIN_WORKER_THREADS); ++i) {
spawn_another_worker_thread();
}
-
- /* now the original thread becomes an ordinary worker thread */
+ /* now the original thread becomes another worker */
worker_entry();
return 0;
}
*/
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;
+ int fail_this_transaction = 0;
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();
- }
-
+ fail_this_transaction = 0;
+ ssock = accept(msock, NULL, 0);
if (ssock < 0) {
- fprintf(stderr, "webcit: accept() failed: %s\n",
- strerror(errno));
+ 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));
- context_loop(ssock);
+
+ /* If we are an HTTPS server, go crypto now. */
+#ifdef HAVE_OPENSSL
+ if (is_https) {
+ if (starttls(ssock) != 0) {
+ fail_this_transaction = 1;
+ close(ssock);
+ }
+ }
+#endif
+
+ if (fail_this_transaction == 0) {
+ /* 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((time_t *)&(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,
+ (long)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,
+ (long)pthread_self(),
+ buf);
+ }
+ fflush(stderr);
+ }
+ return 1;
+}
projects / citadel.git / blobdiff