/*
- * Copyright (c) 1987-2011 by the citadel.org team
+ * 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 as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
+ * 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"
*/
RETSIGTYPE timeout(int signum)
{
- syslog(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) {
- syslog(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) {
- syslog(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);
}
if ((service == NULL) || IsEmptyStr(service))
return (-1);
- syslog(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) {
- syslog(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) 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");
+ 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) {
- syslog(1, "socket() failed: %s\n", strerror(errno));
+ syslog(LOG_WARNING, "socket() failed: %s\n", strerror(errno));
freeaddrinfo(res);
return(-1);
}
return(s);
}
else {
- syslog(1, "connect() failed: %s\n", strerror(errno));
+ syslog(LOG_WARNING, "connect() failed: %s\n", strerror(errno));
close(s);
}
}
FlushStrBuf(WCC->MigrateReadLineBuf);
strbuf[len] = '\0';
#ifdef SERV_TRACE
- syslog(9, "%3d<<<%s\n", WC->serv_sock, strbuf);
+ syslog(LOG_DEBUG, "%3d<<<%s\n", WC->serv_sock, strbuf);
#endif
return len;
}
&ErrStr);
if (rc < 0)
{
- syslog(1, "StrBuf_ServGetln(): 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;
long pos = 0;
if (WCC->ReadPos != NULL)
pos = WCC->ReadPos - ChrPtr(WCC->ReadBuf);
- syslog(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)
{
- syslog(1, "StrBuf_ServGetBLOBBuffered(): 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;
}
#ifdef SERV_TRACE
else
- syslog(9, "%3d<<<BLOB: %d 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)
{
- syslog(1, "StrBuf_ServGetBLOB(): 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;
}
#ifdef SERV_TRACE
else
- syslog(9, "%3d<<<BLOB: %d 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)
{
- syslog(1,
+ syslog(LOG_EMERG,
"ERROR: somebody didn't eat his soup! Remaing Chars: %ld [%s]\n",
(long)(pche - WCC->ReadPos),
pche
);
- syslog(1,
+ syslog(LOG_EMERG,
"--------------------------------------------------------------------------------\n"
"Whole buf: [%s]\n"
"--------------------------------------------------------------------------------\n",
nbytes - bytes_written);
if (retval < 1) {
const char *ErrStr = strerror(errno);
- syslog(1, "serv_write(): Server connection broken: %s\n",
+ syslog(LOG_INFO, "serv_write(): Server connection broken: %s\n",
(ErrStr)?ErrStr:"");
if (WCC->serv_sock > 0) close(WCC->serv_sock);
WCC->serv_sock = (-1);
int serv_puts(const char *string)
{
#ifdef SERV_TRACE
- syslog(9, "%3d>>>%s\n", WC->serv_sock, string);
+ syslog(LOG_DEBUG, "%3d>>>%s\n", WC->serv_sock, string);
#endif
FlushReadBuf();
int serv_putbuf(const StrBuf *string)
{
#ifdef SERV_TRACE
- syslog(9, "%3d>>>%s\n", WC->serv_sock, ChrPtr(string));
+ syslog(LOG_DEBUG, "%3d>>>%s\n", WC->serv_sock, ChrPtr(string));
#endif
FlushReadBuf();
buf[len] = '\0';
rc = serv_write(buf, len);
#ifdef SERV_TRACE
- syslog(9, ">>>%s", buf);
+ syslog(LOG_DEBUG, ">>>%s", buf);
#endif
return rc;
}
wcsession *WCC = WC;
size_t bytes_read = 0;
size_t this_block = 0;
- int rc;
+ int rc = 6;
+ int ServerRc = 6;
if (Ret == NULL) {
return -1;
}
- while (bytes_read < total_len) {
+ while ((bytes_read < total_len) && (ServerRc == 6)) {
if (WCC->serv_sock==-1) {
FlushStrBuf(Ret);
}
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 ( (rc = StrBuf_ServGetln(Buf) > 0) &&
+ (ServerRc = GetServerStatus(Buf, NULL), ServerRc == 6) )
{
if (rc < 0)
return rc;
this_block = StrTol(Buf);
rc = StrBuf_ServGetBLOBBuffered(Ret, this_block);
if (rc < 0) {
- syslog(1, "Server connection broken during download\n");
- wc_backtrace();
+ 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;
{
ip_version = 4;
if (inet_pton(AF_INET, ip_addr, &sin4.sin_addr) <= 0) {
- syslog(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) {
- syslog(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) {
- syslog(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) {
- syslog(1, "Can't create a listening socket: %s\n", strerror(errno));
+ 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) {
- syslog(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) {
- syslog(1, "Can't listen: %s\n", strerror(errno));
+ syslog(LOG_EMERG, "Can't listen: %s\n", strerror(errno));
close(s);
return (-WC_EXIT_BIND);
}
i = unlink(sockpath);
if ((i != 0) && (errno != ENOENT)) {
- syslog(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) {
- syslog(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) {
- syslog(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) {
- syslog(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);
}
return 1;
}
else {
- syslog(2, "client_read_ssl() failed\n");
+ syslog(LOG_INFO, "client_read_ssl() failed\n");
return -1;
}
}
O_TERM,
&Error);
if (retval < 0) {
- syslog(2, "client_read() failed: %s\n",
+ syslog(LOG_INFO, "client_read() failed: %s\n",
Error);
- wc_backtrace();
+ wc_backtrace(LOG_DEBUG);
return retval;
}
hprintf("Content-encoding: gzip\r\n");
else {
syslog(LOG_ALERT, "Compression failed: %d [%s] sending uncompressed\n", errno, strerror(errno));
- wc_backtrace();
+ wc_backtrace(LOG_INFO);
}
}
FD_ZERO(&wset);
FD_SET(WCC->Hdr->http_sock, &wset);
if (select(WCC->Hdr->http_sock + 1, NULL, &wset, NULL, NULL) == -1) {
- syslog(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) {
- syslog(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;
FD_ZERO(&wset);
FD_SET(WCC->Hdr->http_sock, &wset);
if (select(WCC->Hdr->http_sock + 1, NULL, &wset, NULL, NULL) == -1) {
- syslog(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) {
- syslog(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;
projects / citadel.git / blobdiff