#if HAVE_BACKTRACE
#include <execinfo.h>
#endif
-
+#include "modules_init.h"
#ifndef HAVE_SNPRINTF
int vsnprintf(char *buf, size_t max, const char *fmt, va_list argp);
#endif
static const char editor_absolut_dir[PATH_MAX]=EDITORDIR; /* nailed to what configure gives us. */
static char static_dir[PATH_MAX]; /* calculated on startup */
static char static_local_dir[PATH_MAX]; /* calculated on startup */
+static char static_icon_dir[PATH_MAX]; /* where should we find our mime icons? */
char *static_dirs[]={ /* needs same sort order as the web mapping */
(char*)static_dir, /* our templates on disk */
(char*)static_local_dir, /* user provided templates disk */
- (char*)editor_absolut_dir /* the editor on disk */
+ (char*)editor_absolut_dir, /* the editor on disk */
+ (char*)static_icon_dir /* our icons... */
};
/*
* (If you add more, remember to increment 'ndirs' below)
*/
char *static_content_dirs[] = {
- "static", /** static templates */
- "static.local", /** site local static templates */
- "tiny_mce" /** rich text editor */
+ "static", /* static templates */
+ "static.local", /* site local static templates */
+ "tiny_mce" /* rich text editor */
};
int ndirs=3;
i = 1;
setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i));
- fcntl(s, F_SETFL, O_NONBLOCK);/// TODO
+ fcntl(s, F_SETFL, O_NONBLOCK); /* maide: this statement is incorrect
+ there should be a preceding F_GETFL
+ and a bitwise OR with the previous
+ fd flags */
if (bind(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
lprintf(1, "Can't bind: %s\n", strerror(errno));
/*
- * \brief Create a Unix domain socket and listen on it
- * \param sockpath file name of the unix domain socket
- * \param queue_len Number of incoming connections to allow in the queue
+ * Create a Unix domain socket and listen on it
+ * sockpath - file name of the unix domain socket
+ * queue_len - Number of incoming connections to allow in the queue
*/
int ig_uds_server(char *sockpath, int queue_len)
{
i = unlink(sockpath);
if (i != 0) if (errno != ENOENT) {
- lprintf(1, "webserver: can't unlink %s: %s\n",
+ lprintf(1, "webcit: can't unlink %s: %s\n",
sockpath, strerror(errno));
exit(WC_EXIT_BIND);
}
s = socket(AF_UNIX, SOCK_STREAM, 0);
if (s < 0) {
- lprintf(1, "webserver: Can't create a socket: %s\n",
+ lprintf(1, "webcit: Can't create a socket: %s\n",
strerror(errno));
exit(WC_EXIT_BIND);
}
if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
- lprintf(1, "webserver: Can't bind: %s\n",
+ lprintf(1, "webcit: Can't bind: %s\n",
strerror(errno));
exit(WC_EXIT_BIND);
}
if (listen(s, actual_queue_len) < 0) {
- lprintf(1, "webserver: Can't listen: %s\n",
+ lprintf(1, "webcit: Can't listen: %s\n",
strerror(errno));
exit(WC_EXIT_BIND);
}
/*
- * \brief Read data from the client socket.
- * \param sock socket fd to read from
- * \param buf buffer to read into
- * \param bytes number of bytes to read
- * \param timeout Number of seconds to wait before timing out
- * \return values are\
- * 1 Requested number of bytes has been read.\
- * 0 Request timed out.\
- * -1 Connection is broken, or other error.
+ * Read data from the client socket.
+ *
+ * sock socket fd to read from
+ * buf buffer to read into
+ * bytes number of bytes to read
+ * timeout Number of seconds to wait before timing out
+ *
+ * Possible return values:
+ * 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)
{
return (1);
}
-/*
- * \brief write data to the client
- * \param buf data to write to the client
- * \param count size of buffer
- */
-ssize_t client_write(const void *buf, size_t count)
-{
- char *newptr;
- size_t newalloc;
-
- if (WC->burst != NULL) {
- if ((WC->burst_len + count) >= WC->burst_alloc) {
- newalloc = (WC->burst_alloc * 2);
- if ((WC->burst_len + count) >= newalloc) {
- newalloc += count;
- }
- newptr = realloc(WC->burst, newalloc);
- if (newptr != NULL) {
- WC->burst = newptr;
- WC->burst_alloc = newalloc;
- }
- }
- if ((WC->burst_len + count) < WC->burst_alloc) {
- memcpy(&WC->burst[WC->burst_len], buf, count);
- WC->burst_len += count;
- return (count);
- }
- else {
- return(-1);
- }
- }
-#ifdef HAVE_OPENSSL
- if (is_https) {
- client_write_ssl((char *) buf, count);
- return (count);
- }
-#endif
-#ifdef HTTP_TRACING
- write(2, "\033[34m", 5);
- write(2, buf, count);
- write(2, "\033[30m", 5);
-#endif
- return (write(WC->http_sock, buf, count));
-}
-
/*
* \brief Begin buffering HTTP output so we can transmit it all in one write operation later.
*/
void begin_burst(void)
{
- if (WC->burst != NULL) {
- free(WC->burst);
- WC->burst = NULL;
- }
- WC->burst_len = 0;
- WC->burst_alloc = 32768;
- WC->burst = malloc(WC->burst_alloc);
+ if (WC->WBuf == NULL)
+ WC->WBuf = NewStrBufPlain(NULL, 32768);
}
/*
- * \brief uses the same calling syntax as compress2(), but it
- * creates a stream compatible with HTTP "Content-encoding: gzip"
+ * \brief Finish buffering HTTP output. [Compress using zlib and] output with a Content-Length: header.
*/
-#ifdef HAVE_ZLIB
-#define DEF_MEM_LEVEL 8 /*< memlevel??? */
-#define OS_CODE 0x03 /*< unix */
-int ZEXPORT compress_gzip(Bytef * dest, /*< compressed buffer*/
- size_t * destLen, /*< length of the compresed data */
- const Bytef * source, /*< source to encode */
- uLong sourceLen, /*< length of source to encode */
- int level) /*< compression level */
+long end_burst(void)
{
- const int gz_magic[2] = { 0x1f, 0x8b }; /* gzip magic header */
-
- /* write gzip header */
- snprintf((char *) dest, *destLen,
- "%c%c%c%c%c%c%c%c%c%c",
- gz_magic[0], gz_magic[1], Z_DEFLATED,
- 0 /*flags */ , 0, 0, 0, 0 /*time */ , 0 /* xflags */ ,
- OS_CODE);
-
- /* normal deflate */
- z_stream stream;
- int err;
- stream.next_in = (Bytef *) source;
- stream.avail_in = (uInt) sourceLen;
- stream.next_out = dest + 10L; // after header
- stream.avail_out = (uInt) * destLen;
- if ((uLong) stream.avail_out != *destLen)
- return Z_BUF_ERROR;
-
- stream.zalloc = (alloc_func) 0;
- stream.zfree = (free_func) 0;
- stream.opaque = (voidpf) 0;
-
- err = deflateInit2(&stream, level, Z_DEFLATED, -MAX_WBITS,
- DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY);
- if (err != Z_OK)
- return err;
-
- err = deflate(&stream, Z_FINISH);
- if (err != Z_STREAM_END) {
- deflateEnd(&stream);
- return err == Z_OK ? Z_BUF_ERROR : err;
- }
- *destLen = stream.total_out + 10L;
-
- /* write CRC and Length */
- uLong crc = crc32(0L, source, sourceLen);
- int n;
- for (n = 0; n < 4; ++n, ++*destLen) {
- dest[*destLen] = (int) (crc & 0xff);
- crc >>= 8;
- }
- uLong len = stream.total_in;
- for (n = 0; n < 4; ++n, ++*destLen) {
- dest[*destLen] = (int) (len & 0xff);
- len >>= 8;
+ struct wcsession *WCC = WC;
+ const char *ptr, *eptr;
+ long count;
+ ssize_t res;
+ fd_set wset;
+ int fdflags;
+
+#ifdef HAVE_ZLIB
+ /* Perform gzip compression, if enabled and supported by client */
+ if ((WCC->gzip_ok) && CompressBuffer(WCC->WBuf))
+ {
+ hprintf("Content-encoding: gzip\r\n");
}
- err = deflateEnd(&stream);
- return err;
-}
-#endif
+#endif /* HAVE_ZLIB */
-/*
- * \brief Finish buffering HTTP output. [Compress using zlib and] output with a Content-Length: header.
- */
-void end_burst(void)
-{
- size_t the_len;
- char *the_data;
+ hprintf("Content-length: %d\r\n\r\n", StrLength(WCC->WBuf));
- if (WC->burst == NULL)
- return;
+ ptr = ChrPtr(WCC->HBuf);
+ count = StrLength(WCC->HBuf);
+ eptr = ptr + count;
- the_len = WC->burst_len;
- the_data = WC->burst;
+#ifdef HAVE_OPENSSL
+ if (is_https) {
+ client_write_ssl(ptr, StrLength(WCC->HBuf));
+ return (count);
+ }
+#endif
- WC->burst_len = 0;
- WC->burst_alloc = 0;
- WC->burst = NULL;
+
+#ifdef HTTP_TRACING
+
+ write(2, "\033[34m", 5);
+ write(2, ptr, StrLength(WCC->WBuf));
+ write(2, "\033[30m", 5);
+#endif
+ fdflags = fcntl(WC->http_sock, F_GETFL);
+
+ while (ptr < eptr) {
+ if ((fdflags & O_NONBLOCK) == O_NONBLOCK) {
+ FD_ZERO(&wset);
+ FD_SET(WCC->http_sock, &wset);
+ if (select(WCC->http_sock + 1, NULL, &wset, NULL, NULL) == -1) {
+ lprintf(2, "client_write: Socket select failed (%s)\n", strerror(errno));
+ return -1;
+ }
+ }
+
+ if ((res = write(WCC->http_sock,
+ ptr,
+ count)) == -1) {
+ lprintf(2, "client_write: Socket write failed (%s)\n", strerror(errno));
+ return res;
+ }
+ count -= res;
+ ptr += res;
+ }
+
+ ptr = ChrPtr(WCC->WBuf);
+ count = StrLength(WCC->WBuf);
+ eptr = ptr + count;
-#ifdef HAVE_ZLIB
- /* Perform gzip compression, if enabled and supported by client */
- if (WC->gzip_ok) {
- char *compressed_data = NULL;
- size_t compressed_len;
-
- compressed_len = ((the_len * 101) / 100) + 100;
- compressed_data = malloc(compressed_len);
-
- if (compress_gzip((Bytef *) compressed_data,
- &compressed_len,
- (Bytef *) the_data,
- (uLongf) the_len, Z_BEST_SPEED) == Z_OK) {
- wprintf("Content-encoding: gzip\r\n");
- free(the_data);
- the_data = compressed_data;
- the_len = compressed_len;
- } else {
- free(compressed_data);
- }
+#ifdef HAVE_OPENSSL
+ if (is_https) {
+ client_write_ssl(ptr, StrLength(WCC->HBuf));
+ return (count);
}
-#endif /* HAVE_ZLIB */
+#endif
+
+#ifdef HTTP_TRACING
+
+ write(2, "\033[34m", 5);
+ write(2, ptr, StrLength(WCC->WBuf));
+ write(2, "\033[30m", 5);
+#endif
- wprintf("Content-length: %d\r\n\r\n", the_len);
- client_write(the_data, the_len);
- free(the_data);
- return;
+ while (ptr < eptr) {
+ if ((fdflags & O_NONBLOCK) == O_NONBLOCK) {
+ FD_ZERO(&wset);
+ FD_SET(WCC->http_sock, &wset);
+ if (select(WCC->http_sock + 1, NULL, &wset, NULL, NULL) == -1) {
+ lprintf(2, "client_write: Socket select failed (%s)\n", strerror(errno));
+ return -1;
+ }
+ }
+
+ if ((res = write(WCC->http_sock,
+ ptr,
+ count)) == -1) {
+ lprintf(2, "client_write: Socket write failed (%s)\n", strerror(errno));
+ return res;
+ }
+ count -= res;
+ ptr += res;
+ }
+
+ return StrLength(WCC->WBuf);
}
}
/*
- * \brief shut us down the regular way.
- * param signum the signal we want to forward
+ * \brief Shut us down the regular way.
+ * \param signum the signal we want to forward
*/
pid_t current_child;
void graceful_shutdown_watcher(int signum) {
/*
* \brief shut us down the regular way.
- * param signum the signal we want to forward
+ * \param signum the signal we want to forward
*/
pid_t current_child;
void graceful_shutdown(int signum) {
if (current_child < 0) {
perror("fork");
+ ShutDownLibCitadel ();
exit(errno);
}
if (pid_file) {
unlink(pid_file);
}
+ ShutDownLibCitadel ();
exit(WEXITSTATUS(status));
}
pthread_attr_destroy(&attr);
}
+//#define DBG_PRINNT_HOOKS_AT_START
+#ifdef DBG_PRINNT_HOOKS_AT_START
+const char foobuf[32];
+const char *nix(void *vptr) {snprintf(foobuf, 32, "%0x", (long) vptr); return foobuf;}
+#endif
+void InitTemplateCache(void);
+
/*
* \brief Here's where it all begins.
* \param argc number of commandline args
#endif /* ENABLE_NLS */
char uds_listen_path[PATH_MAX]; /*< listen on a unix domain socket? */
+ HandlerHash = NewHash(1, NULL);
+ PreferenceHooks = NewHash(1, NULL);
+ WirelessTemplateCache = NewHash(1, NULL);
+ WirelessLocalTemplateCache = NewHash(1, NULL);
+ LocalTemplateCache = NewHash(1, NULL);
+ TemplateCache = NewHash(1, NULL);
+ GlobalNS = NewHash(1, NULL);
+ Iterators = NewHash(1, NULL);
+
+
+#ifdef DBG_PRINNT_HOOKS_AT_START
+ dbg_PrintHash(HandlerHash, nix, NULL);
+#endif
+
/* Ensure that we are linked to the correct version of libcitadel */
if (libcitadel_version_number() < LIBCITADEL_VERSION_NUMBER) {
fprintf(stderr, " You are running libcitadel version %d.%02d\n",
strcpy(uds_listen_path, "");
- if (getenv("TZ") == NULL)
- putenv("TZ=UTC");
-
/* Parse command line */
#ifdef HAVE_OPENSSL
while ((a = getopt(argc, argv, "h:i:p:t:x:dD:cfs")) != EOF)
is_https = 1;
break;
default:
- fprintf(stderr, "usage: webserver "
+ fprintf(stderr, "usage: webcit "
"[-i ip_addr] [-p http_port] "
"[-t tracefile] [-c] [-f] "
"[-d] "
/* initialize the International Bright Young Thing */
#ifdef ENABLE_NLS
initialize_locales();
+
locale = setlocale(LC_ALL, "");
+
mo = malloc(strlen(webcitdir) + 20);
lprintf(9, "Message catalog directory: %s\n", bindtextdomain("webcit", LOCALEDIR"/locale"));
free(mo);
lprintf(9, "Text domain: %s\n", textdomain("webcit"));
lprintf(9, "Text domain Charset: %s\n", bind_textdomain_codeset("webcit","UTF8"));
+ preset_locale();
#endif
COMPUTE_DIRECTORY(socket_dir);
basedir=WWWDIR "/static";
COMPUTE_DIRECTORY(static_dir);
+ basedir=WWWDIR "/static/icons";
+ COMPUTE_DIRECTORY(static_icon_dir);
basedir=WWWDIR "/static.local";
COMPUTE_DIRECTORY(static_local_dir);
lprintf(9, "Changing directory to %s\n", socket_dir);
if (chdir(webcitdir) != 0) {
perror("chdir");
- }
+ }
+ LoadIconDir(static_icon_dir);
+ InitTemplateCache();
+
+ initialise_modules();
initialize_viewdefs();
initialize_axdefs();
/* now the original thread becomes another worker */
worker_entry();
+ ShutDownLibCitadel ();
+ DeleteHash(&HandlerHash);
+ DeleteHash(&PreferenceHooks);
return 0;
}
sleeeeeeeeeep(1); // wait so some others might finish...
lprintf(2, "master shutdown: cleaning up sessions\n");
do_housekeeping();
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
lprintf(2, "master shutdown: cleaning up libical\n");
free_zone_directory ();
icaltimezone_release_zone_tab ();
icalmemory_free_ring ();
+ ShutDownLibCitadel ();
+ DeleteHash(&HandlerHash);
+ DeleteHash(&PreferenceHooks);
+ DeleteHash(&GlobalNS);
+ DeleteHash(&WirelessTemplateCache);
+ DeleteHash(&WirelessLocalTemplateCache);
+ DeleteHash(&TemplateCache);
+ DeleteHash(&LocalTemplateCache);
+ DeleteHash(&Iterators);
+#ifdef ENABLE_NLS
+ void ShutdownLocale(void);
#endif
lprintf(2, "master shutdown exiting!.\n");
exit(0);
}
/*
- * \brief logprintf. log messages
+ * \brief print log messages
* logs to stderr if loglevel is lower than the verbosity set at startup
* \param loglevel level of the message
* \param format the printf like format string
projects / citadel.git / blobdiff