/*
- * Copyright (c) 1987-2010 by the citadel.org team
+ * Copyright (c) 1987-2011 by the citadel.org team
*
- * This program is free software; you can redistribute it and/or modify
+ * This program is open source 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.
*/
RETSIGTYPE timeout(int signum)
{
- lprintf(1, "Connection timed out; unable to reach citserver\n");
+ syslog(1, "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(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));
+ syslog(1, "Can't connect [%s]: %s\n", sockpath, strerror(errno));
close(s);
return(-1);
}
if ((service == NULL) || IsEmptyStr(service))
return (-1);
- lprintf(9, "tcp_connectsock(%s,%s)\n", host, service);
+ syslog(9, "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(1, "%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(9, "Trying IPv4\n");
+ else if (ai->ai_family == AF_INET6) syslog(9, "Trying IPv6\n");
+ else syslog(9, "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(1, "socket() failed: %s\n", strerror(errno));
freeaddrinfo(res);
return(-1);
}
return(s);
}
else {
- lprintf(1, "connect() failed: %s\n", strerror(errno));
+ syslog(1, "connect() failed: %s\n", strerror(errno));
close(s);
}
}
FlushStrBuf(WCC->MigrateReadLineBuf);
strbuf[len] = '\0';
#ifdef SERV_TRACE
- lprintf(9, "%3d<<<%s\n", WC->serv_sock, strbuf);
+ syslog(9, "%3d<<<%s\n", WC->serv_sock, strbuf);
#endif
return len;
}
&ErrStr);
if (rc < 0)
{
- lprintf(1, "Server connection broken: %s\n",
+ syslog(1, "StrBuf_ServGetln(): Server connection broken: %s\n",
(ErrStr)?ErrStr:"");
wc_backtrace();
+ 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(9, "%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(1, "StrBuf_ServGetBLOBBuffered(): Server connection broken: %s\n",
(ErrStr)?ErrStr:"");
wc_backtrace();
+ 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(9, "%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(1, "StrBuf_ServGetBLOB(): Server connection broken: %s\n",
(ErrStr)?ErrStr:"");
wc_backtrace();
+ 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(9, "%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(1,
+ "ERROR: somebody didn't eat his soup! Remaing Chars: %ld [%s]\n",
+ (long)(pche - WCC->ReadPos),
+ pche
+ );
+ syslog(1,
"--------------------------------------------------------------------------------\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(1, "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(9, "%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(9, "%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(9, ">>>%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;
- 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;
+ if (Ret == NULL) {
+ 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;
- }
+
+ while (bytes_read < total_len) {
+
+ if (WCC->serv_sock==-1) {
+ FlushStrBuf(Ret);
+ return -1;
}
- serv_printf("READ %d|%d", (int)bytes, (int)thisblock);
- if (StrBuf_ServGetln(Buf) > 0)
+
+ serv_printf("READ "SIZE_T_FMT"|"SIZE_T_FMT, bytes_read, total_len-bytes_read);
+ if ( (rc = StrBuf_ServGetln(Buf) > 0) && (GetServerStatus(Buf, NULL) == 6) )
{
- 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;
- }
+ if (rc < 0)
+ return rc;
+ StrBufCutLeft(Buf, 4);
+ this_block = StrTol(Buf);
+ rc = StrBuf_ServGetBLOBBuffered(Ret, this_block);
+ if (rc < 0) {
+ syslog(1, "Server connection broken during download\n");
+ wc_backtrace();
+ 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);
}
{
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(1, "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(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");
+ syslog(1, "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));
+ syslog(1, "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(1, "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(1, "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(1, "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(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));
+ syslog(1, "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(1, "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)
{
return 1;
}
else {
- lprintf(2, "client_read_ssl() failed\n");
+ syslog(2, "client_read_ssl() failed\n");
return -1;
}
}
O_TERM,
&Error);
if (retval < 0) {
- lprintf(2, "client_read() failed: %s\n",
+ syslog(2, "client_read() failed: %s\n",
Error);
wc_backtrace();
return retval;
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));
+ syslog(LOG_ALERT, "Compression failed: %d [%s] sending uncompressed\n", errno, strerror(errno));
wc_backtrace();
}
}
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(2, "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));
+ syslog(2, "client_write: Socket write failed (%s)\n", strerror(errno));
wc_backtrace();
return res;
}
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(2, "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));
+ syslog(2, "client_write: Socket write failed (%s)\n", strerror(errno));
wc_backtrace();
return res;
}
FreeStrBuf(&sess->ReadBuf);
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);
+ }
}