* waiting on the specified port for incoming HTTP connections. When a
* connection is established, it calls context_loop() from context_loop.c.
*
+ * Copyright (c) 1996-2008 by the citadel.org developers.
+ * This program is released under the terms of the GNU General Public License v3.
+ *
*/
#include "webcit.h"
* 0 Request timed out.
* -1 Connection is broken, or other error.
*/
-int client_read_to(int *sock, char *buf, int bytes, int timeout)
+int client_read_to(int *sock, StrBuf *Target, StrBuf *Buf, int bytes, int timeout)
{
- int len, rlen;
- fd_set rfds;
- struct timeval tv;
- int retval;
-
+ const char *Error;
+ int retval = 0;
#ifdef HAVE_OPENSSL
if (is_https) {
- return (client_read_ssl(buf, bytes, timeout));
- }
+ while ((StrLength(Buf) + StrLength(Target) < bytes) &&
+ (retval >= 0))
+ retval = client_read_sslbuffer(Buf, timeout);
+ if (retval >= 0) {
+ StrBufAppendBuf(Target, Buf, 0); /// todo: Buf > bytes?
+#ifdef HTTP_TRACING
+ write(2, "\033[32m", 5);
+ write(2, buf, bytes);
+ write(2, "\033[30m", 5);
#endif
-
- len = 0;
- while ((len < bytes) && (*sock > 0)) {
- FD_ZERO(&rfds);
- FD_SET(*sock, &rfds);
- tv.tv_sec = timeout;
- tv.tv_usec = 0;
-
- retval = select((*sock) + 1, &rfds, NULL, NULL, &tv);
- if (FD_ISSET(*sock, &rfds) == 0) {
- return (0);
+ return 1;
}
-
- rlen = read(*sock, &buf[len], bytes - len);
-
- if (rlen < 1) {
- lprintf(2, "client_read() failed: %s\n",
- strerror(errno));
- if (*sock > 0)
- close(*sock);
- *sock = -1;
- return (-1);
+ else {
+ lprintf(2, "client_read_ssl() failed\n");
+ return -1;
}
- len = len + rlen;
+ }
+#endif
+
+ if (StrLength(Buf) > 0) {//// todo: what if Buf > bytes?
+ StrBufAppendBuf(Target, Buf, 0);
+ }
+ retval = StrBufReadBLOB(Target,
+ sock,
+ (StrLength(Target) > 0),
+ bytes - StrLength(Target),
+ &Error);
+ if (retval < 0) {
+ lprintf(2, "client_read() failed: %s\n",
+ Error);
+ return retval;
}
#ifdef HTTP_TRACING
write(2, buf, bytes);
write(2, "\033[30m", 5);
#endif
- return (1);
+ return 1;
}
+
/*
- * \brief Begin buffering HTTP output so we can transmit it all in one write operation later.
+ * Begin buffering HTTP output so we can transmit it all in one write operation later.
*/
void begin_burst(void)
{
/*
- * \brief Finish buffering HTTP output. [Compress using zlib and] output with a Content-Length: header.
+ * Finish buffering HTTP output. [Compress using zlib and] output with a Content-Length: header.
*/
long end_burst(void)
{
ptr,
count)) == -1) {
lprintf(2, "client_write: Socket write failed (%s)\n", strerror(errno));
+ wc_backtrace();
return res;
}
count -= res;
ptr,
count)) == -1) {
lprintf(2, "client_write: Socket write failed (%s)\n", strerror(errno));
+ wc_backtrace();
return res;
}
count -= res;
/*
- * \brief Read data from the client socket with default timeout.
+ * Read data from the client socket with default timeout.
* (This is implemented in terms of client_read_to() and could be
* justifiably moved out of sysdep.c)
- * \param sock the socket fd to read from
- * \param buf the buffer to write to
- * \param bytes Number of bytes to read
+ *
+ * sock the socket fd to read from
+ * buf the buffer to write to
+ * bytes Number of bytes to read
*/
-int client_read(int *sock, char *buf, int bytes)
+int client_read(int *sock, StrBuf *Target, StrBuf *buf, int bytes)
{
- return (client_read_to(sock, buf, bytes, SLEEPING));
+ return (client_read_to(sock, Target, buf, bytes, SLEEPING));
}
/*
- * \brief Get a LF-terminated line of text from the client.
+ * 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)
- * \param sock socket fd to get client line from
- * \param buf buffer to write read data to
- * \param bufsiz how many bytes to read
- * \return number of bytes read???
+ *
+ * sock socket fd to get client line from
+ * buf buffer to write read data to
+ * bufsiz how many bytes to read
+ *
+ * returns the number of bytes read
*/
-int client_getln(int *sock, char *buf, int bufsiz)
-{
- int i, retval;
-
- /* Read one character at a time.*/
- for (i = 0; *sock > 0; i++) {
- retval = client_read(sock, &buf[i], 1);
- if (retval < 0)
- return retval;
- if (retval != 1 || buf[i] == '\n' || i == (bufsiz-1))
- break;
- if ( (!isspace(buf[i])) && (!isprint(buf[i])) ) {
- /* Non printable character recieved from client */
- return(-1);
- }
- }
-
- /* If we got a long line, discard characters until the newline. */
- if (i == (bufsiz-1))
- while (buf[i] != '\n' && retval == 1)
- retval = client_read(sock, &buf[i], 1);
-
- /*
- * Strip any trailing non-printable characters.
- */
- buf[i] = 0;
- while ((i > 0) && (!isprint(buf[i - 1]))) {
- buf[--i] = 0;
- }
- return (retval);
-}
+/////int client_getln(int *sock, char *buf, int bufsiz)
+/////{
+///// int i, retval;
+/////
+///// /* Read one character at a time.*/
+///// for (i = 0; *sock > 0; i++) {
+///// retval = client_read(sock, &buf[i], 1);
+///// if (retval < 0)
+///// return retval;
+///// if (retval != 1 || buf[i] == '\n' || i == (bufsiz-1))
+///// break;
+///// if ( (!isspace(buf[i])) && (!isprint(buf[i])) ) {
+///// /* Non printable character recieved from client */
+///// return(-1);
+///// }
+///// }
+/////
+///// /* If we got a long line, discard characters until the newline. */
+///// if (i == (bufsiz-1))
+///// while (buf[i] != '\n' && retval == 1)
+///// retval = client_read(sock, &buf[i], 1);
+/////
+///// /*
+///// * Strip any trailing non-printable characters.
+///// */
+///// buf[i] = 0;
+///// while ((i > 0) && (!isprint(buf[i - 1]))) {
+///// buf[--i] = 0;
+///// }
+///// return (retval);
+/////}
/*
- * \brief Shut us down the regular way.
- * \param signum the signal we want to forward
+ * Shut us down the regular way.
+ * signum is the signal we want to forward
*/
pid_t current_child;
void graceful_shutdown_watcher(int signum) {
exit(0);
}
+
+int ClientGetLine(int *sock, StrBuf *Target, StrBuf *CLineBuf)
+{
+ const char *Error, *pch, *pchs;
+ int rlen, len, retval = 0;
+
+ if (is_https) {
+ int ntries = 0;
+ if (StrLength(CLineBuf) > 0) {
+ pchs = ChrPtr(CLineBuf);
+ pch = strchr(pchs, '\n');
+ if (pch != NULL) {
+ rlen = 0;
+ len = pch - pchs;
+ if (len > 0 && (*(pch - 1) == '\r') )
+ rlen ++;
+ StrBufSub(Target, CLineBuf, 0, len - rlen);
+ StrBufCutLeft(CLineBuf, len + 1);
+ return len - rlen;
+ }
+ }
+
+ while (retval == 0) {
+ pch = NULL;
+ pchs = ChrPtr(CLineBuf);
+ if (*pchs != '\0')
+ pch = strchr(pchs, '\n');
+ if (pch == NULL) {
+ retval = client_read_sslbuffer(CLineBuf, SLEEPING);
+ pchs = ChrPtr(CLineBuf);
+ pch = strchr(pchs, '\n');
+ }
+ if (retval == 0) {
+ sleeeeeeeeeep(1);
+ ntries ++;
+ }
+ if (ntries > 10)
+ return 0;
+ }
+ if ((retval > 0) && (pch != NULL)) {
+ rlen = 0;
+ len = pch - pchs;
+ if (len > 0 && (*(pch - 1) == '\r') )
+ rlen ++;
+ StrBufSub(Target, CLineBuf, 0, len - rlen);
+ StrBufCutLeft(CLineBuf, len + 1);
+ return len - rlen;
+
+ }
+ else
+ return -1;
+ }
+ else
+ return StrBufTCP_read_buffered_line(Target,
+ CLineBuf,
+ sock,
+ 5,
+ 1,
+ &Error);
+}
+
+
+
/*
- * \brief shut us down the regular way.
- * \param signum the signal we want to forward
+ * Shut us down the regular way.
+ * signum is the signal we want to forward
*/
pid_t current_child;
void graceful_shutdown(int signum) {
}
-/*
- * \brief Start running as a daemon.
- *
- * param do_close_stdio Only close stdio if set.
- */
-
/*
* Start running as a daemon.
*/
}
/*
- * \brief Spawn an additional worker thread into the pool.
+ * Spawn an additional worker thread into the pool.
*/
void spawn_another_worker_thread()
{
- pthread_t SessThread; /*< Thread descriptor */
- pthread_attr_t attr; /*< Thread attributes */
+ pthread_t SessThread; /* Thread descriptor */
+ pthread_attr_t attr; /* Thread attributes */
int ret;
lprintf(3, "Creating a new thread\n");
const char *nix(void *vptr) {snprintf(foobuf, 32, "%0x", (long) vptr); return foobuf;}
#endif
void InitTemplateCache(void);
-
+extern int LoadTemplates;
extern void LoadZoneFiles(void);
+
/*
- * \brief Here's where it all begins.
- * \param argc number of commandline args
- * \param argv the commandline arguments
+ * Here's where it all begins.
*/
int main(int argc, char **argv)
{
- pthread_t SessThread; /*< Thread descriptor */
- pthread_attr_t attr; /*< Thread attributes */
- int a, i; /*< General-purpose variables */
+ pthread_t SessThread; /* Thread descriptor */
+ pthread_attr_t attr; /* Thread attributes */
+ int a, i; /* General-purpose variables */
char tracefile[PATH_MAX];
char ip_addr[256]="0.0.0.0";
char dirbuffer[PATH_MAX]="";
char *locale = NULL;
char *mo = NULL;
#endif /* ENABLE_NLS */
- char uds_listen_path[PATH_MAX]; /*< listen on a unix domain socket? */
+ char uds_listen_path[PATH_MAX]; /* listen on a unix domain socket? */
HandlerHash = NewHash(1, NULL);
PreferenceHooks = NewHash(1, NULL);
/* Parse command line */
#ifdef HAVE_OPENSSL
- while ((a = getopt(argc, argv, "h:i:p:t:x:dD:cfs")) != EOF)
+ while ((a = getopt(argc, argv, "h:i:p:t:T:x:dD:cfs")) != EOF)
#else
- while ((a = getopt(argc, argv, "h:i:p:t:x:dD:cf")) != EOF)
+ while ((a = getopt(argc, argv, "h:i:p:t:T:x:dD:cf")) != EOF)
#endif
switch (a) {
case 'h':
freopen(tracefile, "w", stderr);
freopen(tracefile, "r", stdin);
break;
+ case 'T':
+ LoadTemplates = atoi(optarg);
+ break;
case 'x':
verbosity = atoi(optarg);
break;
fprintf(stderr, "usage: webcit "
"[-i ip_addr] [-p http_port] "
"[-t tracefile] [-c] [-f] "
+ "[-T Templatedebuglevel] "
"[-d] "
#ifdef HAVE_OPENSSL
"[-s] "
initialize_viewdefs();
initialize_axdefs();
+ /* Tell libical to return an error instead of aborting if it sees badly formed iCalendar data. */
+ icalerror_errors_are_fatal = 0;
+
/*
* Set up a place to put thread-specific data.
* We only need a single pointer per thread - it points to the
#ifdef ENABLE_NLS
ShutdownLocale();
#endif
+#ifdef HAVE_OPENSSL
+ if (is_https) {
+ shutdown_ssl();
+ }
+#endif
}
/*
}
/*
- * \brief print log messages
+ * 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
- * \param ... the strings to put into format
+ *
+ * loglevel level of the message
+ * format the printf like format string
+ * ... the strings to put into format
*/
int lprintf(int loglevel, const char *format, ...)
{
/*
- * \brief print the actual stack frame.
+ * print the actual stack frame.
*/
void wc_backtrace(void)
{
#endif
}
-/*@}*/
projects / citadel.git / blobdiff