/*
- * $Id$
- *
* 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-2009 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-2011 by the citadel.org team
*
- * 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 program is open source software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License, version 3.
*
- * 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
+ * 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.
*/
#include "sysdep.h"
#include <pwd.h>
#include <errno.h>
#include <stdarg.h>
+#include <syslog.h>
#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
#include "sysdep_decls.h"
#include "config.h"
#include "clientsocket.h"
-
#include "ctdl_module.h"
-#ifndef INADDR_NONE
-#define INADDR_NONE 0xffffffff
-#endif
-
-int sock_connect(char *host, char *service, char *protocol)
+int sock_connect(char *host, char *service)
{
- struct hostent *phe;
- struct servent *pse;
- struct protoent *ppe;
- struct sockaddr_in sin;
- struct sockaddr_in egress_sin;
- int s, type;
-
- if ((host == NULL) || IsEmptyStr(host))
- return(-1);
- if ((service == NULL) || IsEmptyStr(service))
- return(-1);
- if ((protocol == NULL) || IsEmptyStr(protocol))
- return(-1);
-
- memset(&sin, 0, sizeof(sin));
- sin.sin_family = AF_INET;
-
- pse = getservbyname(service, protocol);
- if (pse) {
- sin.sin_port = pse->s_port;
- } else if ((sin.sin_port = htons((u_short) atoi(service))) == 0) {
- CtdlLogPrintf(CTDL_CRIT, "Can't get %s service entry: %s\n",
- service, strerror(errno));
- return(-1);
- }
- phe = gethostbyname(host);
- if (phe) {
- memcpy(&sin.sin_addr, phe->h_addr, phe->h_length);
- } else if ((sin.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE) {
- CtdlLogPrintf(CTDL_ERR, "Can't get %s host entry: %s\n",
- host, strerror(errno));
- return(-1);
- }
- if ((ppe = getprotobyname(protocol)) == 0) {
- CtdlLogPrintf(CTDL_CRIT, "Can't get %s protocol entry: %s\n",
- protocol, strerror(errno));
- return(-1);
- }
- if (!strcmp(protocol, "udp")) {
- type = SOCK_DGRAM;
+ struct in6_addr serveraddr;
+ struct addrinfo hints;
+ struct addrinfo *res = NULL;
+ struct addrinfo *ai = NULL;
+ int rc = (-1);
+ int sock = (-1);
+
+ if ((host == NULL) || IsEmptyStr(host))
+ return (-1);
+ if ((service == NULL) || IsEmptyStr(service))
+ return (-1);
+
+ memset(&hints, 0x00, sizeof(hints));
+ hints.ai_flags = AI_NUMERICSERV;
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+
+ /*
+ * Handle numeric IPv4 and IPv6 addresses
+ */
+ rc = inet_pton(AF_INET, host, &serveraddr);
+ if (rc == 1) { /* dotted quad */
+ hints.ai_family = AF_INET;
+ hints.ai_flags |= AI_NUMERICHOST;
} else {
- type = SOCK_STREAM;
+ rc = inet_pton(AF_INET6, host, &serveraddr);
+ if (rc == 1) { /* IPv6 address */
+ hints.ai_family = AF_INET6;
+ hints.ai_flags |= AI_NUMERICHOST;
+ }
}
- s = socket(PF_INET, type, ppe->p_proto);
- if (s < 0) {
- CtdlLogPrintf(CTDL_CRIT, "Can't create socket: %s\n", strerror(errno));
+ /* Begin the connection process */
+
+ rc = getaddrinfo(host, service, &hints, &res);
+ if (rc != 0) {
+ syslog(LOG_ERR, "%s: %s", host, gai_strerror(rc));
return(-1);
}
- /* If citserver is bound to a specific IP address on the host, make
- * sure we use that address for outbound connections.
+ /*
+ * Try all available addresses until we connect to one or until we run out.
*/
- memset(&egress_sin, 0, sizeof(egress_sin));
- egress_sin.sin_family = AF_INET;
- if (!IsEmptyStr(config.c_ip_addr)) {
- egress_sin.sin_addr.s_addr = inet_addr(config.c_ip_addr);
- if (egress_sin.sin_addr.s_addr == !INADDR_ANY) {
- egress_sin.sin_addr.s_addr = INADDR_ANY;
+ 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));
+ freeaddrinfo(res);
+ return(-1);
+ }
+ rc = connect(sock, ai->ai_addr, ai->ai_addrlen);
+ if (rc >= 0) {
+ freeaddrinfo(res);
+ return(sock);
+ }
+ else {
+ syslog(LOG_ERR, "connect() failed: %s", strerror(errno));
+ close(sock);
}
-
- /* If this bind fails, no problem; we can still use INADDR_ANY */
- bind(s, (struct sockaddr *)&egress_sin, sizeof(egress_sin));
- }
-
- /* Now try to connect to the remote host. */
- if (connect(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
- CtdlLogPrintf(CTDL_ERR, "Can't connect to %s:%s: %s\n",
- host, service, strerror(errno));
- close(s);
- return(-1);
}
-
- return (s);
+ freeaddrinfo(res);
+ return(-1);
}
* 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=CC;
+ CitContext *CCC = MyContext();
const char *Error;
int retval = 0;
- retval = StrBufReadBLOBBuffered(Target,
- CCC->sReadBuf,
- &CCC->sPos,
- Socket,
- 1,
- bytes,
- O_TERM,
- &Error);
+ retval = StrBufReadBLOBBuffered(Target,
+ CCC->SBuf.Buf,
+ &CCC->SBuf.ReadWritePointer,
+ Socket, 1, bytes, O_TERM, &Error);
+
if (retval < 0) {
- CtdlLogPrintf(CTDL_CRIT,
- "%s failed: %s\n",
- __FUNCTION__,
- Error);
+ syslog(LOG_CRIT, "socket_read_blob() failed: %s", Error);
}
return retval;
}
-int sock_read_to(int *sock, char *buf, int bytes, int timeout, int keep_reading_until_full)
-{
- CitContext *CCC=CC;
- int rc;
-
- rc = socket_read_blob(sock,
- CCC->sMigrateBuf,
- bytes,
- timeout);
- if (rc < 0)
- {
- *buf = '\0';
- return rc;
- }
- else
- {
- if (StrLength(CCC->MigrateBuf) < bytes)
- bytes = StrLength(CCC->MigrateBuf);
- memcpy(buf,
- ChrPtr(CCC->MigrateBuf),
- bytes);
-
- FlushStrBuf(CCC->MigrateBuf);
- return rc;
- }
-}
-
-
-int CtdlSockGetLine(int *sock, StrBuf *Target)
+int CtdlSockGetLine(int *sock, StrBuf * Target, int nSec)
{
- CitContext *CCC=CC;
+ CitContext *CCC = MyContext();
const char *Error;
int rc;
- rc = StrBufTCP_read_buffered_line_fast(Target,
- CCC->sReadBuf,
- &CCC->sPos,
- sock,
- 5,
- 1,
- &Error);
+ FlushStrBuf(Target);
+ rc = StrBufTCP_read_buffered_line_fast(Target,
+ CCC->SBuf.Buf,
+ &CCC->SBuf.ReadWritePointer,
+ sock, nSec, 1, &Error);
if ((rc < 0) && (Error != NULL))
- CtdlLogPrintf(CTDL_CRIT,
- "%s failed: %s\n",
- __FUNCTION__,
- Error);
+ syslog(LOG_CRIT, "CtdlSockGetLine() failed: %s", Error);
return rc;
}
int sock_getln(int *sock, char *buf, int bufsize)
{
int i, retval;
- CitContext *CCC=CC;
+ CitContext *CCC = MyContext();
const char *pCh;
- retval = CtdlSockGetLine(sock, CCC->sMigrateBuf);
+ FlushStrBuf(CCC->sMigrateBuf);
+ retval = CtdlSockGetLine(sock, CCC->sMigrateBuf, 5);
i = StrLength(CCC->sMigrateBuf);
pCh = ChrPtr(CCC->sMigrateBuf);
- /* Strip the trailing LF, and the trailing CR if present.
- */
- if (bufsize <= i)
- i = bufsize - 1;
- while ( (i > 0)
- && ( (pCh[i - 1]==13)
- || ( pCh[i - 1]==10)) ) {
- i--;
- }
- memcpy(buf, pCh, i);
- buf[i] = 0;
+
+ memcpy(buf, pCh, i + 1);
FlushStrBuf(CCC->sMigrateBuf);
if (retval < 0) {
safestrncpy(&buf[i], "000", bufsize - i);
+ i += 3;
}
- return(retval >= 0);
-}
-
-
-/*
- * sock_read() - input binary data from socket.
- * Returns the number of bytes read, or -1 for error.
- */
-INLINE int sock_read(int *sock, char *buf, int bytes, int keep_reading_until_full)
-{
- return sock_read_to(sock, buf, bytes, CLIENT_TIMEOUT, keep_reading_until_full);
+ return i;
}
* sock_write() - send binary to server.
* Returns the number of bytes written, or -1 for error.
*/
-int sock_write(int *sock, const char *buf, int nbytes)
+int sock_write(int *sock, const char *buf, int nbytes)
+{ return sock_write_timeout(sock, buf, nbytes, 50); }
+int sock_write_timeout(int *sock, const char *buf, int nbytes, int timeout)
{
+ int nSuccessLess = 0;
int bytes_written = 0;
int retval;
-
- while ((*sock != -1) &&
- (bytes_written < nbytes))
+ fd_set rfds;
+ int fdflags;
+ int IsNonBlock;
+ struct timeval tv;
+ int selectresolution = 100;
+
+ fdflags = fcntl(*sock, F_GETFL);
+ IsNonBlock = (fdflags & O_NONBLOCK) == O_NONBLOCK;
+
+ while ((nSuccessLess < timeout) &&
+ (*sock != -1) &&
+ (bytes_written < nbytes))
{
+ if (IsNonBlock){
+ tv.tv_sec = selectresolution;
+ tv.tv_usec = 0;
+
+ 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;
+ }
+ }
+ if (IsNonBlock && ! FD_ISSET(*sock, &rfds)) {
+ nSuccessLess ++;
+ continue;
+ }
retval = write(*sock, &buf[bytes_written],
nbytes - bytes_written);
if (retval < 1) {
return (-1);
}
bytes_written = bytes_written + retval;
+ if (IsNonBlock && (bytes_written == nbytes)){
+ tv.tv_sec = selectresolution;
+ tv.tv_usec = 0;
+
+ 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;
+ }
+ }
}
return (bytes_written);
}
+
+/*
+ * 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)
+{
+ int i, retval;
+ CitContext *CCC = MyContext();
+ const char *pCh;
+
+ FlushStrBuf(CCC->sMigrateBuf);
+ *rc = retval = CtdlSockGetLine(sock, CCC->sMigrateBuf, nSec);
+
+ i = StrLength(CCC->sMigrateBuf);
+ pCh = ChrPtr(CCC->sMigrateBuf);
+
+ memcpy(buf, pCh, i + 1);
+
+ FlushStrBuf(CCC->sMigrateBuf);
+ if (retval < 0) {
+ safestrncpy(&buf[i], "000", bufsize - i);
+ i += 3;
+ }
+ return i;
+}
+
/*
* Multiline version of sock_gets() ... this is a convenience function for
* client side protocol implementations. It only returns the first line of
* a multiline response, discarding the rest.
*/
-int ml_sock_gets(int *sock, char *buf) {
+int ml_sock_gets(int *sock, char *buf, int nSec)
+{
+ int rc = 0;
char bigbuf[1024];
int g;
- g = sock_getln(sock, buf, SIZ);
- if (g < 4) return(g);
- if (buf[3] != '-') return(g);
+ g = sock_getln_err(sock, buf, SIZ, &rc, nSec);
+ if (rc < 0)
+ return rc;
+ if (g < 4)
+ return (g);
+ if (buf[3] != '-')
+ return (g);
do {
- g = sock_getln(sock, bigbuf, SIZ);
- if (g < 0) return(g);
- } while ( (g >= 4) && (bigbuf[3] == '-') );
-
- return(strlen(buf));
+ g = sock_getln_err(sock, bigbuf, SIZ, &rc, nSec);
+ if (rc < 0)
+ return rc;
+ if (g < 0)
+ return (g);
+ } while ((g >= 4) && (bigbuf[3] == '-'));
+
+ return (strlen(buf));
}
int i, j;
i = sock_write(sock, buf, strlen(buf));
- if (i<0) return(i);
+ if (i < 0)
+ return (i);
j = sock_write(sock, "\n", 1);
- if (j<0) return(j);
- return(i+j);
+ if (j < 0)
+ return (j);
+ return (i + j);
}
projects / citadel.git / blobdiff