* serv_getln now is a wrapper around existing functionality. a new temporary var...

[citadel.git] / webcit / tcp_sockets.c

diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index 2352ca72643d4afc00e629c2add293eed79f137f..89a30a38b390e6a059184ca23c60e445c1154fba 100644 (file)
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -38,13 +38,15 @@ int uds_connectsock(char *sockpath)
 
        s = socket(AF_UNIX, SOCK_STREAM, 0);
        if (s < 0) {
-               lprintf(1, "Can't create socket: %s\n",
+               lprintf(1, "Can't create socket[%s]: %s\n",
+                       sockpath,
                        strerror(errno));
                return(-1);
        }
 
        if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
-               lprintf(1, "Can't connect: %s\n",
+               lprintf(1, "Can't connect [%s]: %s\n",
+                       sockpath,
                        strerror(errno));
                close(s);
                return(-1);
@@ -61,6 +63,7 @@ int uds_connectsock(char *sockpath)
  */
 int tcp_connectsock(char *host, char *service)
 {
+        int fdflags;
        struct hostent *phe;
        struct servent *pse;
        struct protoent *ppe;
@@ -108,82 +111,49 @@ int tcp_connectsock(char *host, char *service)
        alarm(0);
        signal(SIGALRM, SIG_IGN);
 
+       fdflags = fcntl(s, F_GETFL);
+       fdflags = fdflags | O_NONBLOCK;
+       fcntl(s, F_SETFD, fdflags);
        return (s);
 }
 
 
 
-
-/*
- *  Input binary data from socket
- *  buf the buffer to get the input to
- *  bytes the maximal number of bytes to read
- */
-inline void _serv_read(char *buf, int bytes, wcsession *WCC)
-{
-       int len, rlen;
-
-       len = 0;
-       while ((len < bytes) && (WCC->serv_sock != -1)){
-               rlen = read(WCC->serv_sock, &buf[len], bytes - len);
-               if (rlen < 1) {
-                       lprintf(1, "Server connection broken: %s\n",
-                               strerror(errno));
-                       wc_backtrace();
-                       close(WCC->serv_sock);
-                       WCC->serv_sock = (-1);
-                       WCC->connected = 0;
-                       WCC->logged_in = 0;
-                       memset(buf, 0, bytes);
-                       return;
-               }
-               len = len + rlen;
-       }
-}
-
-void serv_read(char *buf, int bytes)
-{
-       wcsession *WCC = WC;
-
-       WCC->ReadPos = NULL;
-
-       _serv_read(buf, bytes, WCC);
-}
-
 /*
  *  input string from pipe
  */
 int serv_getln(char *strbuf, int bufsize)
 {
        wcsession *WCC = WC;
-       int ch, len;
-       char buf[2];
-
-       WCC->ReadPos = NULL;
-       len = 0;
-       strbuf[0] = 0;
-       do {
-               _serv_read(&buf[0], 1, WCC);
-               ch = buf[0];
-               if ((ch != 13) && (ch != 10)) {
-                       strbuf[len++] = ch;
-               }
-       } while ((ch != 10) && (ch != 0) && (len < (bufsize-1)) && (WCC->serv_sock != -1));
-       strbuf[len] = 0;
+       int len;
+
+       *strbuf = '\0';
+       StrBuf_ServGetln(WCC->MigrateReadLineBuf);
+       len = StrLength(WCC->MigrateReadLineBuf);
+       if (len > bufsize)
+               len = bufsize - 1;
+       memcpy(strbuf, ChrPtr(WCC->MigrateReadLineBuf), len);
+       FlushStrBuf(WCC->MigrateReadLineBuf);
+       strbuf[len] = '\0';
 #ifdef SERV_TRACE
        lprintf(9, "%3d>%s\n", WC->serv_sock, strbuf);
 #endif
        return len;
 }
 
+
 int StrBuf_ServGetln(StrBuf *buf)
 {
        wcsession *WCC = WC;
        const char *ErrStr;
        int rc;
 
-       WCC->ReadPos = NULL;
-       rc = StrBufTCP_read_line(buf, &WCC->serv_sock, 0, &ErrStr);
+       rc = StrBufTCP_read_buffered_line_fast(buf, 
+                                              WCC->ReadBuf, 
+                                              &WCC->ReadPos, 
+                                              &WCC->serv_sock, 
+                                              5, 1, 
+                                              &ErrStr);
        if (rc < 0)
        {
                lprintf(1, "Server connection broken: %s\n",
@@ -196,22 +166,24 @@ int StrBuf_ServGetln(StrBuf *buf)
        return rc;
 }
 
-int StrBuf_ServGetlnBuffered(StrBuf *buf)
+int StrBuf_ServGetBLOBBuffered(StrBuf *buf, long BlobSize)
 {
        wcsession *WCC = WC;
-       const char *ErrStr;
+       const char *Err;
        int rc;
-
-       rc = StrBufTCP_read_buffered_line_fast(buf, 
-                                              WCC->ReadBuf, 
-                                              &WCC->ReadPos, 
-                                              &WCC->serv_sock, 
-                                              5, 1, 
-                                              &ErrStr);
+       
+       rc = StrBufReadBLOBBuffered(buf, 
+                                   WCC->ReadBuf, 
+                                   &WCC->ReadPos,
+                                   &WCC->serv_sock, 
+                                   1, 
+                                   BlobSize, 
+                                   NNN_TERM,
+                                   &Err);
        if (rc < 0)
        {
                lprintf(1, "Server connection broken: %s\n",
-                       ErrStr);
+                       Err);
                wc_backtrace();
                WCC->serv_sock = (-1);
                WCC->connected = 0;