X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fclientsocket.c;h=a4b521864087357dff41622fd57e027be94bae25;hb=348e6d05bebe8459f1f4999eb66d822023f67095;hp=67976f19fb6ddd8b453af9410fffceab821ef5af;hpb=eff49d47e7e6bb5811409f79be338a7036e3ad46;p=citadel.git diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c index 67976f19f..a4b521864 100644 --- a/citadel/clientsocket.c +++ b/citadel/clientsocket.c @@ -1,16 +1,14 @@ /* - * $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-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 - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or + * 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. * * This program is distributed in the hope that it will be useful, @@ -20,7 +18,7 @@ * * 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 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "sysdep.h" @@ -38,6 +36,7 @@ #include #include #include +#include #include #include "citadel.h" #include "server.h" @@ -87,7 +86,7 @@ int sock_connect(char *host, char *service) rc = getaddrinfo(host, service, &hints, &res); if (rc != 0) { - CtdlLogPrintf(CTDL_ERR, "%s: %s\n", host, gai_strerror(rc)); + syslog(LOG_ERR, "%s: %s", host, gai_strerror(rc)); return(-1); } @@ -97,19 +96,21 @@ int sock_connect(char *host, char *service) for (ai = res; ai != NULL; ai = ai->ai_next) { sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); if (sock < 0) { - CtdlLogPrintf(CTDL_ERR, "socket() failed: %s\n", strerror(errno)); + syslog(LOG_ERR, "socket() failed: %s", strerror(errno)); + freeaddrinfo(res); return(-1); } - rc = connect(sock, res->ai_addr, res->ai_addrlen); + rc = connect(sock, ai->ai_addr, ai->ai_addrlen); if (rc >= 0) { + freeaddrinfo(res); return(sock); } else { - CtdlLogPrintf(CTDL_ERR, "connect() failed: %s\n", strerror(errno)); + syslog(LOG_ERR, "connect() failed: %s", strerror(errno)); close(sock); } } - + freeaddrinfo(res); return(-1); } @@ -136,40 +137,18 @@ int socket_read_blob(int *Socket, StrBuf * Target, int bytes, int timeout) retval = StrBufReadBLOBBuffered(Target, - CCC->sReadBuf, - &CCC->sPos, + 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 = MyContext(); - int rc; - - FlushStrBuf(CCC->MigrateBuf); - 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 = MyContext(); const char *Error; @@ -177,12 +156,11 @@ int CtdlSockGetLine(int *sock, StrBuf * Target) FlushStrBuf(Target); rc = StrBufTCP_read_buffered_line_fast(Target, - CCC->sReadBuf, - &CCC->sPos, - sock, 5, 1, &Error); + 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; } @@ -199,21 +177,12 @@ int sock_getln(int *sock, char *buf, int bufsize) const char *pCh; FlushStrBuf(CCC->sMigrateBuf); - retval = CtdlSockGetLine(sock, 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) { @@ -224,28 +193,47 @@ int sock_getln(int *sock, char *buf, int bufsize) } -/* - * 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); -} - - /* * 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) { @@ -254,29 +242,75 @@ int sock_write(int *sock, const char *buf, int nbytes) 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); + 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); + g = sock_getln_err(sock, bigbuf, SIZ, &rc, nSec); + if (rc < 0) + return rc; if (g < 0) return (g); } while ((g >= 4) && (bigbuf[3] == '-'));