have flexible timouts while reading lines in our client mode connections

[citadel.git] / citadel / clientsocket.c

diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c
index 5e232c98da542b729a0407a17dd0fdad7519ff4e..d8a3e6b017de5a3d919d6303b4c0957542afd3d0 100644 (file)
--- a/citadel/clientsocket.c
+++ b/citadel/clientsocket.c
@@ -1,6 +1,4 @@
 /*
- * $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
@@ -169,7 +167,7 @@ int sock_read_to(int *sock, char *buf, int bytes, int timeout,
 }
 
 
-int CtdlSockGetLine(int *sock, StrBuf * Target)
+int CtdlSockGetLine(int *sock, StrBuf * Target, int nSec)
 {
        CitContext *CCC = MyContext();
        const char *Error;
@@ -179,7 +177,7 @@ int CtdlSockGetLine(int *sock, StrBuf * Target)
        rc = StrBufTCP_read_buffered_line_fast(Target,
                                               CCC->sReadBuf,
                                               &CCC->sPos,
-                                              sock, 5, 1, &Error);
+                                              sock, nSec, 1, &Error);
        if ((rc < 0) && (Error != NULL))
                CtdlLogPrintf(CTDL_CRIT,
                              "%s failed: %s\n", __FUNCTION__, Error);
@@ -199,21 +197,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) {
@@ -242,10 +231,40 @@ INLINE int sock_read(int *sock, char *buf, int bytes,
  */
 int sock_write(int *sock, const char *buf, int nbytes)
 {
+       int nSuccessLess = 0;
        int bytes_written = 0;
        int retval;
-
-       while ((*sock != -1) && (bytes_written < nbytes)) {
+       fd_set rfds;
+        int fdflags;
+       int IsNonBlock;
+       int timeout = 50;
+       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 +273,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] == '-'));