/*
- * 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.
+ * Copyright (c) 1987-2012 by the citadel.org team
*
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 3.
+ *
* 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
*/
/*
#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? */
/*
*/
RETSIGTYPE timeout(int signum)
{
- lprintf(1, "Connection timed out; unable to reach citserver\n");
+ syslog(LOG_WARNING, "Connection timed out; unable to reach citserver\n");
/* no exit here, since we need to server the connection unreachable thing. exit(3); */
}
s = socket(AF_UNIX, SOCK_STREAM, 0);
if (s < 0) {
- lprintf(1, "Can't create socket[%s]: %s\n", sockpath, strerror(errno));
+ syslog(LOG_WARNING, "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));
+ syslog(LOG_WARNING, "Can't connect [%s]: %s\n", sockpath, strerror(errno));
close(s);
return(-1);
}
-
return s;
}
if ((service == NULL) || IsEmptyStr(service))
return (-1);
- lprintf(9, "tcp_connectsock(%s,%s)\n", host, service);
+ syslog(LOG_DEBUG, "tcp_connectsock(%s,%s)\n", host, service);
memset(&hints, 0x00, sizeof(hints));
hints.ai_flags = AI_NUMERICSERV;
rc = getaddrinfo(host, service, &hints, &res);
if (rc != 0) {
- lprintf(1, "%s: %s\n", host, gai_strerror(rc));
+ syslog(LOG_DEBUG, "%s: %s\n", host, gai_strerror(rc));
+ freeaddrinfo(res);
return(-1);
}
*/
for (ai = res; ai != NULL; ai = ai->ai_next) {
- if (ai->ai_family == AF_INET) lprintf(9, "Trying IPv4\n");
- else if (ai->ai_family == AF_INET6) lprintf(9, "Trying IPv6\n");
- else lprintf(9, "This is going to fail.\n");
+ if (ai->ai_family == AF_INET) syslog(LOG_DEBUG, "Trying IPv4\n");
+ else if (ai->ai_family == AF_INET6) syslog(LOG_DEBUG, "Trying IPv6\n");
+ else syslog(LOG_WARNING, "This is going to fail.\n");
s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
if (s < 0) {
- lprintf(1, "socket() failed: %s\n", strerror(errno));
+ syslog(LOG_WARNING, "socket() failed: %s\n", strerror(errno));
+ freeaddrinfo(res);
return(-1);
}
rc = connect(s, ai->ai_addr, ai->ai_addrlen);
if (rc >= 0) {
+ int fdflags;
+ freeaddrinfo(res);
+
+ fdflags = fcntl(rc, F_GETFL);
+ if (fdflags < 0) {
+ syslog(LOG_ERR,
+ "unable to get socket %d flags! %s \n",
+ rc,
+ strerror(errno));
+ close(rc);
+ return -1;
+ }
+ fdflags = fdflags | O_NONBLOCK;
+ if (fcntl(rc, F_SETFL, fdflags) < 0) {
+ syslog(LOG_ERR,
+ "unable to set socket %d nonblocking flags! %s \n",
+ rc,
+ strerror(errno));
+ close(s);
+ return -1;
+ }
+
return(s);
}
else {
- lprintf(1, "connect() failed: %s\n", strerror(errno));
+ syslog(LOG_WARNING, "connect() failed: %s\n", strerror(errno));
close(s);
}
}
-
+ freeaddrinfo(res);
return(-1);
}
FlushStrBuf(WCC->MigrateReadLineBuf);
strbuf[len] = '\0';
#ifdef SERV_TRACE
- lprintf(9, "%3d<<<%s\n", WC->serv_sock, strbuf);
+ syslog(LOG_DEBUG, "%3d<<<%s\n", WCC->serv_sock, strbuf);
#endif
return len;
}
const char *ErrStr = NULL;
int rc;
+ if (!WCC->connected)
+ return -1;
+
FlushStrBuf(buf);
rc = StrBufTCP_read_buffered_line_fast(buf,
WCC->ReadBuf,
&ErrStr);
if (rc < 0)
{
- lprintf(1, "Server connection broken: %s\n",
+ syslog(LOG_INFO, "StrBuf_ServGetln(): Server connection broken: %s\n",
(ErrStr)?ErrStr:"");
- wc_backtrace();
+ wc_backtrace(LOG_INFO);
+ if (WCC->serv_sock > 0) close(WCC->serv_sock);
WCC->serv_sock = (-1);
WCC->connected = 0;
WCC->logged_in = 0;
long pos = 0;
if (WCC->ReadPos != NULL)
pos = WCC->ReadPos - ChrPtr(WCC->ReadBuf);
- lprintf(9, "%3d<<<[%ld]%s\n", WC->serv_sock, pos, ChrPtr(buf));
+ syslog(LOG_DEBUG, "%3d<<<[%ld]%s\n", WC->serv_sock, pos, ChrPtr(buf));
}
#endif
return rc;
&ErrStr);
if (rc < 0)
{
- lprintf(1, "Server connection broken: %s\n",
+ syslog(LOG_INFO, "StrBuf_ServGetBLOBBuffered(): Server connection broken: %s\n",
(ErrStr)?ErrStr:"");
- wc_backtrace();
+ wc_backtrace(LOG_INFO);
+ if (WCC->serv_sock > 0) close(WCC->serv_sock);
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));
+ syslog(LOG_DEBUG, "%3d<<<BLOB: %d bytes\n", WC->serv_sock, StrLength(buf));
#endif
return rc;
rc = StrBufReadBLOB(buf, &WCC->serv_sock, 1, BlobSize, &ErrStr);
if (rc < 0)
{
- lprintf(1, "Server connection broken: %s\n",
+ syslog(LOG_INFO, "StrBuf_ServGetBLOB(): Server connection broken: %s\n",
(ErrStr)?ErrStr:"");
- wc_backtrace();
+ wc_backtrace(LOG_INFO);
+ if (WCC->serv_sock > 0) close(WCC->serv_sock);
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));
+ syslog(LOG_DEBUG, "%3d<<<BLOB: %d bytes\n", WC->serv_sock, StrLength(buf));
#endif
return rc;
pche = pch + len;
if (WCC->ReadPos != pche)
{
- lprintf(1, "ERROR: somebody didn't eat his soup! Remaing Chars: %d [%s]\n",
- pche - WCC->ReadPos, pche);
- lprintf(1,
+ syslog(LOG_EMERG,
+ "ERROR: somebody didn't eat his soup! Remaing Chars: %ld [%s]\n",
+ (long)(pche - WCC->ReadPos),
+ pche
+ );
+ syslog(LOG_EMERG,
"--------------------------------------------------------------------------------\n"
"Whole buf: [%s]\n"
"--------------------------------------------------------------------------------\n",
* 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)
+int serv_write(const char *buf, int nbytes)
{
wcsession *WCC = WC;
int bytes_written = 0;
nbytes - bytes_written);
if (retval < 1) {
const char *ErrStr = strerror(errno);
- lprintf(1, "Server connection broken: %s\n",
+ syslog(LOG_INFO, "serv_write(): Server connection broken: %s\n",
(ErrStr)?ErrStr:"");
- close(WCC->serv_sock);
+ if (WCC->serv_sock > 0) close(WCC->serv_sock);
WCC->serv_sock = (-1);
WCC->connected = 0;
WCC->logged_in = 0;
- return;
+ return 0;
}
bytes_written = bytes_written + retval;
}
+ return 1;
}
* send line to server
* string the line to send to the citadel server
*/
-void serv_puts(const char *string)
+int serv_puts(const char *string)
{
#ifdef SERV_TRACE
- lprintf(9, "%3d>>>%s\n", WC->serv_sock, string);
+ syslog(LOG_DEBUG, "%3d>>>%s\n", WC->serv_sock, string);
#endif
FlushReadBuf();
- serv_write(string, strlen(string));
- serv_write("\n", 1);
+ if (!serv_write(string, strlen(string)))
+ return 0;
+ return serv_write("\n", 1);
}
/*
* send line to server
* string the line to send to the citadel server
*/
-void serv_putbuf(const StrBuf *string)
+int serv_putbuf(const StrBuf *string)
{
#ifdef SERV_TRACE
- lprintf(9, "%3d>>>%s\n", WC->serv_sock, ChrPtr(string));
+ syslog(LOG_DEBUG, "%3d>>>%s\n", WC->serv_sock, ChrPtr(string));
#endif
FlushReadBuf();
- serv_write(ChrPtr(string), StrLength(string));
- serv_write("\n", 1);
+ if (!serv_write(ChrPtr(string), StrLength(string)))
+ return 0;
+ return serv_write("\n", 1);
}
* format the formatstring
* ... the entities to insert into format
*/
-void serv_printf(const char *format,...)
+int serv_printf(const char *format,...)
{
va_list arg_ptr;
char buf[SIZ];
size_t len;
+ int rc;
FlushReadBuf();
len = strlen(buf);
buf[len++] = '\n';
buf[len] = '\0';
- serv_write(buf, len);
+ rc = serv_write(buf, len);
#ifdef SERV_TRACE
- lprintf(9, ">>>%s", buf);
+ syslog(LOG_DEBUG, ">>>%s", buf);
#endif
+ return rc;
}
-
-/**
- * Read binary data from server into memory using a series of
- * server READ commands.
- * \return the read content as StrBuf
+/*
+ * Read binary data from server into memory using a series of server READ commands.
+ * returns 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;
+ size_t bytes_read = 0;
+ size_t this_block = 0;
+ int rc = 6;
+ int ServerRc = 6;
- if (MaxRead == -1)
- {
- serv_printf("READ %d|"SIZE_T_FMT, 0, total_len);
- if (StrBuf_ServGetln(Buf) > 0)
+ if (Ret == NULL) {
+ return -1;
+ }
+
+ while ((bytes_read < total_len) && (ServerRc == 6)) {
+
+ if (WCC->serv_sock==-1) {
+ FlushStrBuf(Ret);
+ return -1;
+ }
+
+ serv_printf("READ "SIZE_T_FMT"|"SIZE_T_FMT, bytes_read, total_len-bytes_read);
+ if ( (rc = StrBuf_ServGetln(Buf) > 0) &&
+ (ServerRc = GetServerStatus(Buf, NULL), ServerRc == 6) )
{
- 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);
+ if (rc < 0)
+ return rc;
+ StrBufCutLeft(Buf, 4);
+ this_block = StrTol(Buf);
+ rc = StrBuf_ServGetBLOBBuffered(Ret, this_block);
+ if (rc < 0) {
+ syslog(LOG_INFO, "Server connection broken during download\n");
+ wc_backtrace(LOG_INFO);
+ if (WCC->serv_sock > 0) close(WCC->serv_sock);
+ WCC->serv_sock = (-1);
+ WCC->connected = 0;
+ WCC->logged_in = 0;
+ return rc;
}
+ bytes_read += rc;
}
- 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)
+
+ return StrLength(Ret);
+}
+
+
+int client_write(StrBuf *ThisBuf)
+{
+ wcsession *WCC = WC;
+ const char *ptr, *eptr;
+ long count;
+ ssize_t res = 0;
+ fd_set wset;
+ int fdflags;
+
+ ptr = ChrPtr(ThisBuf);
+ count = StrLength(ThisBuf);
+ eptr = ptr + count;
+
+ 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) {
+ syslog(LOG_INFO, "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)),
+ (res == -1)))
{
- 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;
- }
+ syslog(LOG_INFO, "client_write: Socket write failed (%s)\n", strerror(errno));
+ wc_backtrace(LOG_INFO);
+ return -1;
+ }
+ count -= res;
+ ptr += res;
+ }
+ return 0;
+}
+
+
+int
+read_serv_chunk(
+
+ StrBuf *Buf,
+ size_t total_len,
+ size_t *bytes_read
+ )
+{
+ int rc;
+ int ServerRc;
+ wcsession *WCC = WC;
+
+ serv_printf("READ "SIZE_T_FMT"|"SIZE_T_FMT, *bytes_read, total_len-(*bytes_read));
+ if ( (rc = StrBuf_ServGetln(Buf) > 0) &&
+ (ServerRc = GetServerStatus(Buf, NULL), ServerRc == 6) )
+ {
+ size_t this_block = 0;
+
+ if (rc < 0)
+ return rc;
+
+ StrBufCutLeft(Buf, 4);
+ this_block = StrTol(Buf);
+ rc = StrBuf_ServGetBLOBBuffered(WCC->WBuf, this_block);
+ if (rc < 0) {
+ syslog(LOG_INFO, "Server connection broken during download\n");
+ wc_backtrace(LOG_INFO);
+ if (WCC->serv_sock > 0) close(WCC->serv_sock);
+ WCC->serv_sock = (-1);
+ WCC->connected = 0;
+ WCC->logged_in = 0;
+ return rc;
}
+ *bytes_read += rc;
}
- return StrLength(Ret);
+ return 6;
}
+static inline int send_http(StrBuf *Buf)
+{
+#ifdef HAVE_OPENSSL
+ if (is_https)
+ return client_write_ssl(Buf);
+ else
+#endif
+ return client_write(Buf);
+}
+/*
+ * Read binary data from server into memory using a series of server READ commands.
+ * returns the read content as StrBuf
+ */
+void serv_read_binary_to_http(StrBuf *MimeType, size_t total_len, int is_static, int detect_mime)
+{
+ int ServerRc = 6;
+ wcsession *WCC = WC;
+ size_t bytes_read = 0;
+ int first = 1;
+ int client_con_state = 0;
+ int chunked = 0;
+ StrBuf *BufHeader = NULL;
+ StrBuf *Buf;
+
+ Buf = NewStrBuf();
+
+ if (WCC->Hdr->HaveRange)
+ {
+ WCC->Hdr->HaveRange++;
+ WCC->Hdr->TotalBytes = total_len;
+ /* open range? or beyound file border? correct the numbers. */
+ if ((WCC->Hdr->RangeTil == -1) || (WCC->Hdr->RangeTil>= total_len))
+ WCC->Hdr->RangeTil = total_len - 1;
+ bytes_read = WCC->Hdr->RangeStart;
+ total_len = WCC->Hdr->RangeTil;
+ }
+ else
+ chunked = total_len > SIZ * 10; /* TODO: disallow for HTTP / 1.0 */
+
+ if (chunked)
+ {
+ BufHeader=NewStrBuf();
+ }
+
+ if ((detect_mime != 0) && (bytes_read != 0))
+ {
+ /* need to read first chunk to detect mime, though the client doesn't care */
+ size_t bytes_read = 0;
+ const char *CT;
+
+ ServerRc = read_serv_chunk(
+ Buf,
+ total_len,
+ &bytes_read);
+
+ if (ServerRc != 6)
+ {
+ FreeStrBuf(&Buf);
+ return;
+ }
+ CT = GuessMimeType(SKEY(WCC->WBuf));
+ FlushStrBuf(WCC->WBuf);
+ StrBufPlain(MimeType, CT, -1);
+ detect_mime = 0;
+ FreeStrBuf(&Buf);
+ }
+
+ if (!detect_mime)
+ {
+ http_transmit_headers(ChrPtr(MimeType), is_static, chunked);
+
+ if (send_http(WCC->HBuf) < 0)
+ {
+ FreeStrBuf(&Buf);
+ return;
+ }
+ }
+
+ while ((bytes_read < total_len) &&
+ (ServerRc == 6) &&
+ (client_con_state == 0))
+ {
+
+ if (WCC->serv_sock==-1) {
+ FlushStrBuf(WCC->WBuf);
+ FreeStrBuf(&Buf);
+ return;
+ }
+
+ ServerRc = read_serv_chunk(
+ Buf,
+ total_len,
+ &bytes_read);
+ if (ServerRc != 6)
+ break;
+
+ if (detect_mime)
+ {
+ const char *CT;
+ detect_mime = 0;
+
+ CT = GuessMimeType(SKEY(WCC->WBuf));
+ StrBufPlain(MimeType, CT, -1);
+ http_transmit_headers(ChrPtr(MimeType), is_static, chunked);
+
+ client_con_state = send_http(WCC->HBuf);
+ }
+
+ if ((chunked) && (client_con_state == 0))
+ {
+ StrBufPrintf(BufHeader, "%s%x\r\n",
+ (first)?"":"\r\n",
+ StrLength (WCC->WBuf));
+ first = 0;
+ client_con_state = send_http(BufHeader);
+ }
+
+ if (client_con_state == 0)
+ client_con_state = send_http(WCC->WBuf);
+
+ FlushStrBuf(WCC->WBuf);
+ }
+
+ if ((chunked) && (client_con_state == 0))
+ {
+ StrBufPlain(BufHeader, HKEY("\r\n0\r\n\r\n"));
+ if (send_http(BufHeader) < 0)
+ {
+ FreeStrBuf(&Buf);
+ return;
+ }
+ }
+ FreeStrBuf(&Buf);
+}
int ClientGetLine(ParsedHttpHdrs *Hdr, StrBuf *Target)
{
if (is_https) {
int ntries = 0;
- if (StrLength(Hdr->ReadBuf) > 0) {
+ if (StrLength(Hdr->ReadBuf) > 0)
+ {
pchs = ChrPtr(Hdr->ReadBuf);
pch = strchr(pchs, '\n');
if (pch != NULL) {
retval = client_read_sslbuffer(Hdr->ReadBuf, SLEEPING);
pchs = ChrPtr(Hdr->ReadBuf);
pch = strchr(pchs, '\n');
+ if (pch == NULL)
+ retval = 0;
}
if (retval == 0) {
sleeeeeeeeeep(1);
* port_number port number to bind
* queue_len number of incoming connections to allow in the queue
*/
-int webcit_tcp_server(char *ip_addr, int port_number, int queue_len)
+int webcit_tcp_server(const char *ip_addr, int port_number, int queue_len)
{
+ const char *ipv4broadcast = "0.0.0.0";
+ int IsDefault = 0;
struct protoent *p;
struct sockaddr_in6 sin6;
struct sockaddr_in sin4;
int s, i, b;
int ip_version = 6;
+retry:
memset(&sin6, 0, sizeof(sin6));
memset(&sin4, 0, sizeof(sin4));
sin6.sin6_family = AF_INET6;
|| (IsEmptyStr(ip_addr))
|| (!strcmp(ip_addr, "*"))
) {
+ IsDefault = 1;
ip_version = 6;
sin6.sin6_addr = in6addr_any;
}
{
ip_version = 4;
if (inet_pton(AF_INET, ip_addr, &sin4.sin_addr) <= 0) {
- lprintf(1, "Error binding to [%s] : %s\n", ip_addr, strerror(errno));
+ syslog(LOG_WARNING, "Error binding to [%s] : %s\n", ip_addr, strerror(errno));
return (-WC_EXIT_BIND);
}
}
{
ip_version = 6;
if (inet_pton(AF_INET6, ip_addr, &sin6.sin6_addr) <= 0) {
- lprintf(1, "Error binding to [%s] : %s\n", ip_addr, strerror(errno));
+ syslog(LOG_WARNING, "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");
+ syslog(LOG_WARNING, "Cannot start: no port number specified.\n");
return (-WC_EXIT_BIND);
}
sin6.sin6_port = htons((u_short) port_number);
s = socket( ((ip_version == 6) ? PF_INET6 : PF_INET), SOCK_STREAM, (p->p_proto));
if (s < 0) {
- lprintf(1, "Can't create a listening socket: %s\n", strerror(errno));
+ if (IsDefault && (errno == EAFNOSUPPORT))
+ {
+ s = 0;
+ ip_addr = ipv4broadcast;
+ goto retry;
+ }
+ syslog(LOG_WARNING, "Can't create a listening socket: %s\n", strerror(errno));
return (-WC_EXIT_BIND);
}
/* Set some socket options that make sense. */
}
if (b < 0) {
- lprintf(1, "Can't bind: %s\n", strerror(errno));
+ syslog(LOG_EMERG, "Can't bind: %s\n", strerror(errno));
+ close(s);
return (-WC_EXIT_BIND);
}
if (listen(s, queue_len) < 0) {
- lprintf(1, "Can't listen: %s\n", strerror(errno));
+ syslog(LOG_EMERG, "Can't listen: %s\n", strerror(errno));
+ close(s);
return (-WC_EXIT_BIND);
}
return (s);
i = unlink(sockpath);
if ((i != 0) && (errno != ENOENT)) {
- lprintf(1, "webcit: can't unlink %s: %s\n",
+ syslog(LOG_WARNING, "webcit: can't unlink %s: %s\n",
sockpath, strerror(errno));
return (-WC_EXIT_BIND);
}
s = socket(AF_UNIX, SOCK_STREAM, 0);
if (s < 0) {
- lprintf(1, "webcit: Can't create a unix domain socket: %s\n", strerror(errno));
+ syslog(LOG_WARNING, "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));
+ syslog(LOG_WARNING, "webcit: Can't bind: %s\n", strerror(errno));
+ close(s);
return (-WC_EXIT_BIND);
}
if (listen(s, actual_queue_len) < 0) {
- lprintf(1, "webcit: Can't listen: %s\n",
- strerror(errno));
+ syslog(LOG_WARNING, "webcit: Can't listen: %s\n", strerror(errno));
+ close(s);
return (-WC_EXIT_BIND);
}
#ifdef HAVE_OPENSSL
if (is_https) {
- long bufremain;
+ long bufremain = 0;
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 (StrLength(Hdr->ReadBuf) > 0)
+ {
+ 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)
{
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");
+ syslog(LOG_INFO, "client_read_ssl() failed\n");
return -1;
}
}
O_TERM,
&Error);
if (retval < 0) {
- lprintf(2, "client_read() failed: %s\n",
+ syslog(LOG_INFO, "client_read() failed: %s\n",
Error);
- wc_backtrace();
+ wc_backtrace(LOG_DEBUG);
return retval;
}
-#ifdef HTTP_TRACING
- write(2, "\033[32m", 5);
- write(2, buf, bytes);
- write(2, "\033[30m", 5);
-#endif
return 1;
}
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();
+ syslog(LOG_ALERT, "Compression failed: %d [%s] sending uncompressed\n", errno, strerror(errno));
+ wc_backtrace(LOG_INFO);
}
}
}
#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);
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));
+ syslog(LOG_DEBUG, "client_write: Socket select failed (%s)\n", strerror(errno));
return -1;
}
}
(res = write(WCC->Hdr->http_sock,
ptr,
count)) == -1) {
- lprintf(2, "client_write: Socket write failed (%s)\n", strerror(errno));
- wc_backtrace();
+ syslog(LOG_DEBUG, "client_write: Socket write failed (%s)\n", strerror(errno));
+ wc_backtrace(LOG_INFO);
return res;
}
count -= res;
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));
+ syslog(LOG_INFO, "client_write: Socket select failed (%s)\n", strerror(errno));
return -1;
}
}
(res = write(WCC->Hdr->http_sock,
ptr,
count)) == -1) {
- lprintf(2, "client_write: Socket write failed (%s)\n", strerror(errno));
- wc_backtrace();
+ syslog(LOG_INFO, "client_write: Socket write failed (%s)\n", strerror(errno));
+ wc_backtrace(LOG_INFO);
return res;
}
count -= res;
/*
* lingering_close() a`la Apache. see
- * http://www.apache.org/docs/misc/fin_wait_2.html for rationale
+ * http://httpd.apache.org/docs/2.0/misc/fin_wait_2.html for rationale
*/
int lingering_close(int fd)
{
{
FreeStrBuf(&sess->CLineBuf);
FreeStrBuf(&sess->ReadBuf);
+ sess->connected = 0;
sess->ReadPos = NULL;
FreeStrBuf(&sess->MigrateReadLineBuf);
- if (sess->serv_sock > 0)
+ if (sess->serv_sock > 0) {
+ syslog(LOG_DEBUG, "Closing socket %d", sess->serv_sock);
close(sess->serv_sock);
+ }
+ sess->serv_sock = -1;
}
projects / citadel.git / blobdiff