Integrated the DKIM signer into serv_smtpclient, but disabled it
[citadel.git] / webcit / tcp_sockets.c
diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
deleted file mode 100644 (file)
index 71d89a9..0000000
+++ /dev/null
@@ -1,957 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (c) 1987-2010 by the citadel.org team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-/*
- * Uncomment this to log all communications with the Citadel server
-#define SERV_TRACE 1
- */
-
-
-#include "webcit.h"
-#include "webserver.h"
-
-extern int DisableGzip;
-long MaxRead = -1; /* should we do READ scattered or all at once? */
-
-/*
- * register the timeout
- */
-RETSIGTYPE timeout(int signum)
-{
-       lprintf(1, "Connection timed out; unable to reach citserver\n");
-       /* no exit here, since we need to server the connection unreachable thing. exit(3); */
-}
-
-
-/*
- * Client side - connect to a unix domain socket
- */
-int uds_connectsock(char *sockpath)
-{
-       struct sockaddr_un addr;
-       int s;
-
-       memset(&addr, 0, sizeof(addr));
-       addr.sun_family = AF_UNIX;
-       strncpy(addr.sun_path, sockpath, sizeof addr.sun_path);
-
-       s = socket(AF_UNIX, SOCK_STREAM, 0);
-       if (s < 0) {
-               lprintf(1, "Can't create socket[%s]: %s\n", sockpath, strerror(errno));
-               return(-1);
-       }
-
-       if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
-               lprintf(1, "Can't connect [%s]: %s\n", sockpath, strerror(errno));
-               close(s);
-               return(-1);
-       }
-
-       return s;
-}
-
-
-/*
- * TCP client - connect to a host/port
- */
-int tcp_connectsock(char *host, int port)
-{
-       struct sockaddr_in stSockAddr;
-       int rv;
-       int sock;
-
-       sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
-       if (sock < 0) {
-               lprintf(1, "Can't create socket: %s\n", strerror(errno));
-               return (-1);
-       }
-
-       memset(&stSockAddr, 0, sizeof(struct sockaddr_in));
-       stSockAddr.sin_family = AF_INET;
-       stSockAddr.sin_port = htons(port);
-       rv = inet_pton(AF_INET, host, &stSockAddr.sin_addr);
-
-       if (rv <= 0) {
-               lprintf(1, "Can't grok %s: %s\n", host, strerror(errno));
-               return (-1);
-       }
-
-       if (connect(sock, (const struct sockaddr *)&stSockAddr, sizeof(struct sockaddr_in)) != 0) {
-               lprintf(1, "Can't connect to %s.%d: %s\n", host, port, strerror(errno));
-               close(sock);
-               return (-1);
-       }
-
-       return (sock);
-}
-
-
-
-/*
- *  input string from pipe
- */
-int serv_getln(char *strbuf, int bufsize)
-{
-       wcsession *WCC = WC;
-       int len;
-
-       *strbuf = '\0';
-       StrBuf_ServGetln(WCC->MigrateReadLineBuf);
-       len = StrLength(WCC->MigrateReadLineBuf);
-       if (len > bufsize)
-               len = bufsize - 1;
-       memcpy(strbuf, ChrPtr(WCC->MigrateReadLineBuf), len);
-       FlushStrBuf(WCC->MigrateReadLineBuf);
-       strbuf[len] = '\0';
-#ifdef SERV_TRACE
-       lprintf(9, "%3d<<<%s\n", WC->serv_sock, strbuf);
-#endif
-       return len;
-}
-
-
-int StrBuf_ServGetln(StrBuf *buf)
-{
-       wcsession *WCC = WC;
-       const char *ErrStr = NULL;
-       int rc;
-       
-       FlushStrBuf(buf);
-       rc = StrBufTCP_read_buffered_line_fast(buf, 
-                                              WCC->ReadBuf, 
-                                              &WCC->ReadPos, 
-                                              &WCC->serv_sock, 
-                                              5, 1, 
-                                              &ErrStr);
-       if (rc < 0)
-       {
-               lprintf(1, "Server connection broken: %s\n",
-                       (ErrStr)?ErrStr:"");
-               wc_backtrace();
-               WCC->serv_sock = (-1);
-               WCC->connected = 0;
-               WCC->logged_in = 0;
-       }
-#ifdef SERV_TRACE
-       else 
-       {
-               long pos=0;
-               if (WCC->ReadPos != NULL)
-                       pos = WCC->ReadPos - ChrPtr(buf);
-               lprintf(9, "%3d<<<[%ld]%s\n", WC->serv_sock, pos, ChrPtr(buf));
-       }
-#endif
-       return rc;
-}
-
-int StrBuf_ServGetBLOBBuffered(StrBuf *buf, long BlobSize)
-{
-       wcsession *WCC = WC;
-       const char *ErrStr;
-       int rc;
-       
-       rc = StrBufReadBLOBBuffered(buf, 
-                                   WCC->ReadBuf, 
-                                   &WCC->ReadPos,
-                                   &WCC->serv_sock, 
-                                   1, 
-                                   BlobSize, 
-                                   NNN_TERM,
-                                   &ErrStr);
-       if (rc < 0)
-       {
-               lprintf(1, "Server connection broken: %s\n",
-                       (ErrStr)?ErrStr:"");
-               wc_backtrace();
-               WCC->serv_sock = (-1);
-               WCC->connected = 0;
-               WCC->logged_in = 0;
-       }
-#ifdef SERV_TRACE
-        else
-                lprintf(9, "%3d<<<BLOB: %ld bytes\n", WC->serv_sock, StrLength(buf));
-#endif
-
-       return rc;
-}
-
-int StrBuf_ServGetBLOB(StrBuf *buf, long BlobSize)
-{
-       wcsession *WCC = WC;
-       const char *ErrStr;
-       int rc;
-       
-       WCC->ReadPos = NULL;
-       rc = StrBufReadBLOB(buf, &WCC->serv_sock, 1, BlobSize, &ErrStr);
-       if (rc < 0)
-       {
-               lprintf(1, "Server connection broken: %s\n",
-                       (ErrStr)?ErrStr:"");
-               wc_backtrace();
-               WCC->serv_sock = (-1);
-               WCC->connected = 0;
-               WCC->logged_in = 0;
-       }
-#ifdef SERV_TRACE
-        else
-                lprintf(9, "%3d<<<BLOB: %ld bytes\n", WC->serv_sock, StrLength(buf));
-#endif
-
-       return rc;
-}
-
-/*
- *  send binary to server
- *  buf the buffer to write to citadel server
- *  nbytes how many bytes to send to citadel server
- */
-void serv_write(const char *buf, int nbytes)
-{
-       wcsession *WCC = WC;
-       int bytes_written = 0;
-       int retval;
-
-       FlushStrBuf(WCC->ReadBuf);
-       WCC->ReadPos = NULL;
-       while (bytes_written < nbytes) {
-               retval = write(WCC->serv_sock, &buf[bytes_written],
-                              nbytes - bytes_written);
-               if (retval < 1) {
-                       const char *ErrStr = strerror(errno);
-                       lprintf(1, "Server connection broken: %s\n",
-                               (ErrStr)?ErrStr:"");
-                       close(WCC->serv_sock);
-                       WCC->serv_sock = (-1);
-                       WCC->connected = 0;
-                       WCC->logged_in = 0;
-                       return;
-               }
-               bytes_written = bytes_written + retval;
-       }
-}
-
-
-/*
- *  send line to server
- *  string the line to send to the citadel server
- */
-void serv_puts(const char *string)
-{
-       wcsession *WCC = WC;
-#ifdef SERV_TRACE
-       lprintf(9, "%3d>>>%s\n", WC->serv_sock, string);
-#endif
-       FlushStrBuf(WCC->ReadBuf);
-       WCC->ReadPos = NULL;
-
-       serv_write(string, strlen(string));
-       serv_write("\n", 1);
-}
-
-/*
- *  send line to server
- *  string the line to send to the citadel server
- */
-void serv_putbuf(const StrBuf *string)
-{
-       wcsession *WCC = WC;
-#ifdef SERV_TRACE
-       lprintf(9, "%3d>>>%s\n", WC->serv_sock, ChrPtr(string));
-#endif
-       FlushStrBuf(WCC->ReadBuf);
-       WCC->ReadPos = NULL;
-
-       serv_write(ChrPtr(string), StrLength(string));
-       serv_write("\n", 1);
-}
-
-
-/*
- *  convenience function to send stuff to the server
- *  format the formatstring
- *  ... the entities to insert into format 
- */
-void serv_printf(const char *format,...)
-{
-       wcsession *WCC = WC;
-       va_list arg_ptr;
-       char buf[SIZ];
-       size_t len;
-
-       FlushStrBuf(WCC->ReadBuf);
-       WCC->ReadPos = NULL;
-
-       va_start(arg_ptr, format);
-       vsnprintf(buf, sizeof buf, format, arg_ptr);
-       va_end(arg_ptr);
-
-       len = strlen(buf);
-       buf[len++] = '\n';
-       buf[len] = '\0';
-       serv_write(buf, len);
-#ifdef SERV_TRACE
-       lprintf(9, ">>>%s", buf);
-#endif
-}
-
-
-
-/**
- * Read binary data from server into memory using a series of
- * server READ commands.
- * \return the read content as StrBuf
- */
-int serv_read_binary(StrBuf *Ret, size_t total_len, StrBuf *Buf) 
-{
-       wcsession *WCC = WC;
-       size_t bytes = 0;
-       size_t thisblock = 0;
-       
-       if (Ret == NULL)
-           return -1;
-
-       if (MaxRead == -1)
-       {
-               serv_printf("READ %d|"SIZE_T_FMT, 0, total_len);
-               if (StrBuf_ServGetln(Buf) > 0)
-               {
-                       long YetRead;
-                       const char *ErrStr;
-                       const char *pch;
-                       int rc;
-
-                       if (GetServerStatus(Buf, NULL) == 6)
-                       {
-                           StrBufCutLeft(Buf, 4);
-                           thisblock = StrTol(Buf);
-                           if (WCC->serv_sock==-1) {
-                                   FlushStrBuf(Ret); 
-                                   return -1; 
-                           }
-
-                           if (WCC->ReadPos != NULL) {
-                                   pch = ChrPtr(WCC->ReadBuf);
-
-                                   YetRead = WCC->ReadPos - pch;
-                                   if (YetRead > 0)
-                                   {
-                                           long StillThere;
-                                           
-                                           StillThere = StrLength(WCC->ReadBuf) - 
-                                                   YetRead;
-                                           
-                                           StrBufPlain(Ret, 
-                                                       WCC->ReadPos,
-                                                       StillThere);
-                                           total_len -= StillThere;
-                                   }
-                                   FlushStrBuf(WCC->ReadBuf);
-                                   WCC->ReadPos = NULL;
-                           } 
-                           if (total_len > 0)
-                           {
-                                   rc = StrBufReadBLOB(Ret, 
-                                                       &WCC->serv_sock, 
-                                                       1, 
-                                                       total_len,
-                                                       &ErrStr);
-                                   if (rc < 0)
-                                   {
-                                           lprintf(1, "Server connection broken: %s\n",
-                                                   (ErrStr)?ErrStr:"");
-                                           wc_backtrace();
-                                           WCC->serv_sock = (-1);
-                                           WCC->connected = 0;
-                                           WCC->logged_in = 0;
-                                           return rc;
-                                   }
-                                   else
-                                           return StrLength(Ret);
-                           }
-                           else 
-                                   return StrLength(Ret);
-                       }
-               }
-               else
-                       return -1;
-       }
-       else while ((WCC->serv_sock!=-1) &&
-              (bytes < total_len)) {
-               thisblock = MaxRead;
-               if ((total_len - bytes) < thisblock) {
-                       thisblock = total_len - bytes;
-                       if (thisblock == 0) {
-                               FlushStrBuf(Ret); 
-                               return -1; 
-                       }
-               }
-               serv_printf("READ %d|%d", (int)bytes, (int)thisblock);
-               if (StrBuf_ServGetln(Buf) > 0)
-               {
-                       if (GetServerStatus(Buf, NULL) == 6)
-                       {
-                           StrBufCutLeft(Buf, 4);
-                           thisblock = StrTol(Buf);
-                           if (WCC->serv_sock==-1) {
-                                   FlushStrBuf(Ret); 
-                                   return -1; 
-                           }
-                           StrBuf_ServGetBLOBBuffered(Ret, thisblock);
-                           bytes += thisblock;
-                   }
-                   else {
-                           lprintf(3, "Error: %s\n", ChrPtr(Buf) + 4);
-                           return -1;
-                   }
-               }
-       }
-       return StrLength(Ret);
-}
-
-
-int ClientGetLine(ParsedHttpHdrs *Hdr, StrBuf *Target)
-{
-       const char *Error;
-#ifdef HAVE_OPENSSL
-       const char *pch, *pchs;
-       int rlen, len, retval = 0;
-
-       if (is_https) {
-               int ntries = 0;
-               if (StrLength(Hdr->ReadBuf) > 0) {
-                       pchs = ChrPtr(Hdr->ReadBuf);
-                       pch = strchr(pchs, '\n');
-                       if (pch != NULL) {
-                               rlen = 0;
-                               len = pch - pchs;
-                               if (len > 0 && (*(pch - 1) == '\r') )
-                                       rlen ++;
-                               StrBufSub(Target, Hdr->ReadBuf, 0, len - rlen);
-                               StrBufCutLeft(Hdr->ReadBuf, len + 1);
-                               return len - rlen;
-                       }
-               }
-
-               while (retval == 0) { 
-                               pch = NULL;
-                               pchs = ChrPtr(Hdr->ReadBuf);
-                               if (*pchs != '\0')
-                                       pch = strchr(pchs, '\n');
-                               if (pch == NULL) {
-                                       retval = client_read_sslbuffer(Hdr->ReadBuf, SLEEPING);
-                                       pchs = ChrPtr(Hdr->ReadBuf);
-                                       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, Hdr->ReadBuf, 0, len - rlen);
-                       StrBufCutLeft(Hdr->ReadBuf, len + 1);
-                       return len - rlen;
-
-               }
-               else 
-                       return -1;
-       }
-       else 
-#endif
-               return StrBufTCP_read_buffered_line_fast(Target, 
-                                                        Hdr->ReadBuf,
-                                                        &Hdr->Pos,
-                                                        &Hdr->http_sock,
-                                                        5,
-                                                        1,
-                                                        &Error);
-}
-
-/* 
- * This is a generic function to set up a master socket for listening on
- * a TCP port.  The server shuts down if the bind fails.  (IPv4/IPv6 version)
- *
- * ip_addr     IP address to bind
- * port_number port number to bind
- * queue_len   number of incoming connections to allow in the queue
- */
-int ig_tcp_server(char *ip_addr, int port_number, int queue_len)
-{
-       struct protoent *p;
-       struct sockaddr_in6 sin;
-       int s, i;
-
-       memset(&sin, 0, sizeof(sin));
-       sin.sin6_family = AF_INET6;
-
-       if ((ip_addr == NULL) || (IsEmptyStr(ip_addr)) || (!strcmp(ip_addr, "0.0.0.0"))) {
-               sin.sin6_addr = in6addr_any;
-       } else {
-               char bind_to[256];
-               if ((strchr(ip_addr, '.')) && (!strchr(ip_addr, ':'))) {
-                       snprintf(bind_to, sizeof bind_to, "::ffff:%s", ip_addr);
-               }
-               else {
-                       safestrncpy(bind_to, ip_addr, sizeof bind_to);
-               }
-               if (inet_pton(AF_INET6, bind_to, &sin.sin6_addr) <= 0) {
-                       lprintf(1, "Error binding to [%s] : %s\n", ip_addr, strerror(errno));
-                       return (-WC_EXIT_BIND);
-               }
-       }
-
-       if (port_number == 0) {
-               lprintf(1, "Cannot start: no port number specified.\n");
-               return (-WC_EXIT_BIND);
-       }
-       sin.sin6_port = htons((u_short) port_number);
-
-       p = getprotobyname("tcp");
-
-       s = socket(PF_INET6, SOCK_STREAM, (p->p_proto));
-       if (s < 0) {
-               lprintf(1, "Can't create an IPv6 socket: %s\n", strerror(errno));
-               return (-WC_EXIT_BIND);
-       }
-       /* Set some socket options that make sense. */
-       i = 1;
-       setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i));
-
-       #ifndef __APPLE__
-       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 */
-       #endif
-       
-       if (bind(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
-               lprintf(1, "Can't bind: %s\n", strerror(errno));
-               return (-WC_EXIT_BIND);
-       }
-       if (listen(s, queue_len) < 0) {
-               lprintf(1, "Can't listen: %s\n", strerror(errno));
-               return (-WC_EXIT_BIND);
-       }
-       return (s);
-}
-
-#if 0
-/* 
- * This is a generic function to set up a master socket for listening on
- * a TCP port.  The server shuts down if the bind fails.  (Old IPv4-only version)
- *
- * ip_addr     IP address to bind
- * port_number port number to bind
- * queue_len   number of incoming connections to allow in the queue
- */
-int ig_tcp_server(char *ip_addr, int port_number, int queue_len)
-{
-       struct protoent *p;
-       struct sockaddr_in sin;
-       int s, i;
-
-       memset(&sin, 0, sizeof(sin));
-       sin.sin_family = AF_INET;
-       if (ip_addr == NULL) {
-               sin.sin_addr.s_addr = INADDR_ANY;
-       } else {
-               sin.sin_addr.s_addr = inet_addr(ip_addr);
-       }
-
-       if (sin.sin_addr.s_addr == INADDR_NONE) {
-               sin.sin_addr.s_addr = INADDR_ANY;
-       }
-
-       if (port_number == 0) {
-               lprintf(1, "Cannot start: no port number specified.\n");
-               return (-WC_EXIT_BIND);
-       }
-       sin.sin_port = htons((u_short) port_number);
-
-       p = getprotobyname("tcp");
-
-       s = socket(PF_INET, SOCK_STREAM, (p->p_proto));
-       if (s < 0) {
-               lprintf(1, "Can't create an IPv4 socket: %s\n", strerror(errno));
-               return (-WC_EXIT_BIND);
-       }
-       /* 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) {
-               lprintf(1, "Can't bind: %s\n", strerror(errno));
-               return (-WC_EXIT_BIND);
-       }
-       if (listen(s, queue_len) < 0) {
-               lprintf(1, "Can't listen: %s\n", strerror(errno));
-               return (-WC_EXIT_BIND);
-       }
-       return (s);
-}
-#endif
-
-
-/*
- * 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)
-{
-       struct sockaddr_un addr;
-       int s;
-       int i;
-       int actual_queue_len;
-
-       actual_queue_len = queue_len;
-       if (actual_queue_len < 5) actual_queue_len = 5;
-
-       i = unlink(sockpath);
-       if ((i != 0) && (errno != ENOENT)) {
-               lprintf(1, "webcit: can't unlink %s: %s\n",
-                       sockpath, strerror(errno));
-               return (-WC_EXIT_BIND);
-       }
-
-       memset(&addr, 0, sizeof(addr));
-       addr.sun_family = AF_UNIX;
-       safestrncpy(addr.sun_path, sockpath, sizeof addr.sun_path);
-
-       s = socket(AF_UNIX, SOCK_STREAM, 0);
-       if (s < 0) {
-               lprintf(1, "webcit: Can't create a unix domain socket: %s\n", strerror(errno));
-               return (-WC_EXIT_BIND);
-       }
-
-       if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
-               lprintf(1, "webcit: Can't bind: %s\n",
-                       strerror(errno));
-               return (-WC_EXIT_BIND);
-       }
-
-       if (listen(s, actual_queue_len) < 0) {
-               lprintf(1, "webcit: Can't listen: %s\n",
-                       strerror(errno));
-               return (-WC_EXIT_BIND);
-       }
-
-       chmod(sockpath, 0777);
-       return(s);
-}
-
-
-
-
-/*
- * 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(ParsedHttpHdrs *Hdr, StrBuf *Target, int bytes, int timeout)
-{
-       const char *Error;
-       int retval = 0;
-
-#ifdef HAVE_OPENSSL
-       if (is_https) {
-               long bufremain;
-               long baselen;
-
-               baselen = StrLength(Target);
-
-               if (Hdr->Pos == NULL)
-                       Hdr->Pos = ChrPtr(Hdr->ReadBuf);
-               bufremain = StrLength(Hdr->ReadBuf) - (Hdr->Pos - ChrPtr(Hdr->ReadBuf));
-
-               if (bytes < bufremain)
-                       bufremain = bytes;
-               StrBufAppendBufPlain(Target, Hdr->Pos, bufremain, 0);
-               StrBufCutLeft(Hdr->ReadBuf, bufremain);
-
-               if (bytes > bufremain) 
-               {
-                       while ((StrLength(Hdr->ReadBuf) + StrLength(Target) < bytes + baselen) &&
-                              (retval >= 0))
-                               retval = client_read_sslbuffer(Hdr->ReadBuf, timeout);
-                       if (retval >= 0) {
-                               StrBufAppendBuf(Target, Hdr->ReadBuf, 0); /* todo: Buf > bytes? */
-#ifdef HTTP_TRACING
-                               write(2, "\033[32m", 5);
-                               write(2, buf, bytes);
-                               write(2, "\033[30m", 5);
-#endif
-                               return 1;
-                       }
-                       else {
-                               lprintf(2, "client_read_ssl() failed\n");
-                               return -1;
-                       }
-               }
-               else 
-                       return 1;
-       }
-#endif
-
-       retval = StrBufReadBLOBBuffered(Target, 
-                                       Hdr->ReadBuf, 
-                                       &Hdr->Pos, 
-                                       &Hdr->http_sock, 
-                                       1, 
-                                       bytes,
-                                       O_TERM,
-                                       &Error);
-       if (retval < 0) {
-               lprintf(2, "client_read() failed: %s\n",
-                       Error);
-               wc_backtrace();
-               return retval;
-       }
-
-#ifdef HTTP_TRACING
-       write(2, "\033[32m", 5);
-       write(2, buf, bytes);
-       write(2, "\033[30m", 5);
-#endif
-       return 1;
-}
-
-
-/*
- * Begin buffering HTTP output so we can transmit it all in one write operation later.
- */
-void begin_burst(void)
-{
-       if (WC->WBuf == NULL) {
-               WC->WBuf = NewStrBufPlain(NULL, 32768);
-       }
-}
-
-
-/*
- * Finish buffering HTTP output.  [Compress using zlib and] output with a Content-Length: header.
- */
-long end_burst(void)
-{
-       wcsession *WCC = WC;
-        const char *ptr, *eptr;
-        long count;
-       ssize_t res = 0;
-        fd_set wset;
-        int fdflags;
-
-       if (!DisableGzip && (WCC->Hdr->HR.gzip_ok))
-       {
-               if (CompressBuffer(WCC->WBuf) > 0)
-                       hprintf("Content-encoding: gzip\r\n");
-               else {
-                       lprintf(CTDL_ALERT, "Compression failed: %d [%s] sending uncompressed\n", errno, strerror(errno));
-                       wc_backtrace();
-               }
-       }
-
-       if (WCC->WFBuf != NULL) {
-               WildFireSerializePayload(WCC->WFBuf, WCC->HBuf, &WCC->Hdr->nWildfireHeaders, NULL);
-               FreeStrBuf(&WCC->WFBuf);
-       }
-
-       if (WCC->Hdr->HR.prohibit_caching)
-               hprintf("Pragma: no-cache\r\nCache-Control: no-store\r\nExpires:-1\r\n");
-       hprintf("Content-length: %d\r\n\r\n", StrLength(WCC->WBuf));
-
-       ptr = ChrPtr(WCC->HBuf);
-       count = StrLength(WCC->HBuf);
-       eptr = ptr + count;
-
-#ifdef HAVE_OPENSSL
-       if (is_https) {
-               client_write_ssl(WCC->HBuf);
-               client_write_ssl(WCC->WBuf);
-               return (count);
-       }
-#endif
-
-       
-#ifdef HTTP_TRACING
-       
-       write(2, "\033[34m", 5);
-       write(2, ptr, StrLength(WCC->WBuf));
-       write(2, "\033[30m", 5);
-#endif
-       if (WCC->Hdr->http_sock == -1)
-               return -1;
-       fdflags = fcntl(WC->Hdr->http_sock, F_GETFL);
-
-       while ((ptr < eptr) && (WCC->Hdr->http_sock != -1)){
-                if ((fdflags & O_NONBLOCK) == O_NONBLOCK) {
-                        FD_ZERO(&wset);
-                        FD_SET(WCC->Hdr->http_sock, &wset);
-                        if (select(WCC->Hdr->http_sock + 1, NULL, &wset, NULL, NULL) == -1) {
-                                lprintf(2, "client_write: Socket select failed (%s)\n", strerror(errno));
-                                return -1;
-                        }
-                }
-
-                if ((WCC->Hdr->http_sock == -1) || 
-                   (res = write(WCC->Hdr->http_sock, 
-                                ptr,
-                                count)) == -1) {
-                        lprintf(2, "client_write: Socket write failed (%s)\n", strerror(errno));
-                       wc_backtrace();
-                        return res;
-                }
-                count -= res;
-               ptr += res;
-        }
-
-       ptr = ChrPtr(WCC->WBuf);
-       count = StrLength(WCC->WBuf);
-       eptr = ptr + count;
-
-#ifdef HTTP_TRACING
-       
-       write(2, "\033[34m", 5);
-       write(2, ptr, StrLength(WCC->WBuf));
-       write(2, "\033[30m", 5);
-#endif
-
-        while ((ptr < eptr) && (WCC->Hdr->http_sock != -1)) {
-                if ((fdflags & O_NONBLOCK) == O_NONBLOCK) {
-                        FD_ZERO(&wset);
-                        FD_SET(WCC->Hdr->http_sock, &wset);
-                        if (select(WCC->Hdr->http_sock + 1, NULL, &wset, NULL, NULL) == -1) {
-                                lprintf(2, "client_write: Socket select failed (%s)\n", strerror(errno));
-                                return -1;
-                        }
-                }
-
-                if ((WCC->Hdr->http_sock == -1) || 
-                   (res = write(WCC->Hdr->http_sock, 
-                                ptr,
-                                count)) == -1) {
-                        lprintf(2, "client_write: Socket write failed (%s)\n", strerror(errno));
-                       wc_backtrace();
-                        return res;
-                }
-                count -= res;
-               ptr += res;
-        }
-
-       return StrLength(WCC->WBuf);
-}
-
-
-/*
- * lingering_close() a`la Apache. see
- * http://www.apache.org/docs/misc/fin_wait_2.html for rationale
- */
-int lingering_close(int fd)
-{
-       char buf[SIZ];
-       int i;
-       fd_set set;
-       struct timeval tv, start;
-
-       gettimeofday(&start, NULL);
-       if (fd == -1)
-               return -1;
-       shutdown(fd, 1);
-       do {
-               do {
-                       gettimeofday(&tv, NULL);
-                       tv.tv_sec = SLEEPING - (tv.tv_sec - start.tv_sec);
-                       tv.tv_usec = start.tv_usec - tv.tv_usec;
-                       if (tv.tv_usec < 0) {
-                               tv.tv_sec--;
-                               tv.tv_usec += 1000000;
-                       }
-                       FD_ZERO(&set);
-                       FD_SET(fd, &set);
-                       i = select(fd + 1, &set, NULL, NULL, &tv);
-               } while (i == -1 && errno == EINTR);
-
-               if (i <= 0)
-                       break;
-
-               i = read(fd, buf, sizeof buf);
-       } while (i != 0 && (i != -1 || errno == EINTR));
-
-       return close(fd);
-}
-
-void
-HttpNewModule_TCPSOCKETS
-(ParsedHttpHdrs *httpreq)
-{
-
-       httpreq->ReadBuf = NewStrBufPlain(NULL, SIZ * 4);
-}
-
-void
-HttpDetachModule_TCPSOCKETS
-(ParsedHttpHdrs *httpreq)
-{
-
-       FlushStrBuf(httpreq->ReadBuf);
-       ReAdjustEmptyBuf(httpreq->ReadBuf, 4 * SIZ, SIZ);
-}
-
-void
-HttpDestroyModule_TCPSOCKETS
-(ParsedHttpHdrs *httpreq)
-{
-
-       FreeStrBuf(&httpreq->ReadBuf);
-}
-
-
-void
-SessionNewModule_TCPSOCKETS
-(wcsession *sess)
-{
-       sess->CLineBuf = NewStrBuf();
-       sess->MigrateReadLineBuf = NewStrBuf();
-}
-
-void 
-SessionDestroyModule_TCPSOCKETS
-(wcsession *sess)
-{
-       FreeStrBuf(&sess->CLineBuf);
-       FreeStrBuf(&sess->ReadBuf);
-       sess->ReadPos = NULL;
-       FreeStrBuf(&sess->MigrateReadLineBuf);
-       if (sess->serv_sock > 0)
-               close(sess->serv_sock);
-}