-/*
- * This module handles client-side sockets opened by the Citadel server (for
- * the client side of Internet protocols, etc.) It does _not_ handle client
- * sockets for the Citadel client; for that you must look in ipc_c_tcp.c
- * (which, uncoincidentally, bears a striking similarity to this file).
- *
- * Copyright (c) 1987-2011 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.
- */
+// This module handles client-side sockets opened by the Citadel server (for
+// the client side of Internet protocols, etc.) It does _not_ handle client
+// sockets for the Citadel client; for that you must look in ipc_c_tcp.c
+// (which, uncoincidentally, bears a striking similarity to this file).
+//
+// Copyright (c) 1987-2017 by the citadel.org team
+//
+// This program is open source software. Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
+// The program is distributed without any warranty, expressed or implied.
#include <stdlib.h>
#include <unistd.h>
for (ai = res; ai != NULL; ai = ai->ai_next) {
sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
if (sock < 0) {
- syslog(LOG_ERR, "socket() failed: %s", strerror(errno));
+ syslog(LOG_ERR, "%s: %m", host);
freeaddrinfo(res);
return(-1);
}
return(sock);
}
else {
- syslog(LOG_ERR, "connect() failed: %s", strerror(errno));
+ syslog(LOG_ERR, "%s: %m", host);
close(sock);
}
}
retval = StrBufReadBLOBBuffered(Target, CC->SBuf.Buf, &CC->SBuf.ReadWritePointer, Socket, 1, bytes, O_TERM, &Error);
if (retval < 0) {
- syslog(LOG_CRIT, "socket_read_blob() failed: %s", Error);
+ syslog(LOG_ERR, "clientsocket: socket_read_blob() failed: %s", Error);
}
return retval;
}
&CCC->SBuf.ReadWritePointer,
sock, nSec, 1, &Error);
if ((rc < 0) && (Error != NULL)) {
- syslog(LOG_CRIT, "CtdlSockGetLine() failed: %s", Error);
+ syslog(LOG_ERR, "clientsocket: CtdlSockGetLine() failed: %s", Error);
}
return rc;
}
FD_ZERO(&rfds);
FD_SET(*sock, &rfds);
if (select(*sock + 1, NULL, &rfds, NULL, &tv) == -1) {
-/// *Error = strerror(errno);
close (*sock);
*sock = -1;
return -1;
FD_ZERO(&rfds);
FD_SET(*sock, &rfds);
if (select(*sock + 1, NULL, &rfds, NULL, &tv) == -1) {
-/// *Error = strerror(errno);
close (*sock);
*sock = -1;
return -1;