* 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
+ * Copyright (c) 1987-2017 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.
+ * 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
*/
-#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
-#include <stdio.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <sys/un.h>
-#include <arpa/inet.h>
#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <syslog.h>
+#include <stdio.h>
#include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-#include "sysdep_decls.h"
-#include "config.h"
-#include "clientsocket.h"
#include "ctdl_module.h"
+#include "clientsocket.h"
-
-/*
- * Connect to a unix domain socket (normally called by sock_connect() passthru)
- */
-int uds_sock_connect(char *sockpath)
-{
- struct sockaddr_un addr;
- int s;
-
- 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) {
- syslog(LOG_ERR, "socket() failed: %s", strerror(errno));
- return(-1);
- }
-
- if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- syslog(LOG_ERR, "connect() failed: %s", strerror(errno));
- close(s);
- return(-1);
- }
-
- return s;
-}
-
-
-/*
- * Connect to a service via a client socket. This supports both IPv4 and IPv6.
- * If the first character of the host name/addr is "/" then we assume the caller
- * is actually trying to connect to a unix domain socket and we do that instead.
- */
int sock_connect(char *host, char *service)
{
struct in6_addr serveraddr;
if ((host == NULL) || IsEmptyStr(host))
return (-1);
-
- if (host[0] == '/') {
- return uds_sock_connect(host);
- }
-
if ((service == NULL) || IsEmptyStr(service))
return (-1);
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);
}
}
* 0 Request timed out.
* -1 Connection is broken, or other error.
*/
-int socket_read_blob(int *Socket, StrBuf * Target, int bytes, int timeout)
+int socket_read_blob(int *Socket, StrBuf *Target, int bytes, int timeout)
{
- CitContext *CCC = MyContext();
const char *Error;
int retval = 0;
-
- retval = StrBufReadBLOBBuffered(Target,
- CCC->SBuf.Buf,
- &CCC->SBuf.ReadWritePointer,
- Socket, 1, bytes, O_TERM, &Error);
-
+ 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;
}
-int CtdlSockGetLine(int *sock, StrBuf * Target, int nSec)
+int CtdlSockGetLine(int *sock, StrBuf *Target, int nSec)
{
CitContext *CCC = MyContext();
const char *Error;
CCC->SBuf.Buf,
&CCC->SBuf.ReadWritePointer,
sock, nSec, 1, &Error);
- if ((rc < 0) && (Error != NULL))
- syslog(LOG_CRIT, "CtdlSockGetLine() failed: %s", Error);
+ if ((rc < 0) && (Error != NULL)) {
+ syslog(LOG_ERR, "clientsocket: CtdlSockGetLine() failed: %s", Error);
+ }
return rc;
}
/*
* client_getln() ... Get a LF-terminated line of text from the client.
- * (This is implemented in terms of client_read() and could be
- * justifiably moved out of sysdep.c)
*/
int sock_getln(int *sock, char *buf, int bufsize)
{
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;
}
-
/*
* client_getln() ... Get a LF-terminated line of text from the client.
- * (This is implemented in terms of client_read() and could be
- * justifiably moved out of sysdep.c)
*/
int sock_getln_err(int *sock, char *buf, int bufsize, int *rc, int nSec)
{
return i;
}
+
/*
* Multiline version of sock_gets() ... this is a convenience function for
* client side protocol implementations. It only returns the first line of
projects / citadel.git / blobdiff