* made *bstr things const

[citadel.git] / webcit / tcp_sockets.c

diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index 37d538c370865b367d9a595f35afaf8568755552..6c9b34f3564732ca1df7ebf8b97ab20942682c8a 100644 (file)
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -12,6 +12,7 @@
 #define SERV_TRACE 1
  */
 
+
 #include "webcit.h"
 #include "webserver.h"
 
@@ -123,20 +124,21 @@ int tcp_connectsock(char *host, char *service)
  * \param buf the buffer to get the input to
  * \param bytes the maximal number of bytes to read
  */
-void serv_read(char *buf, int bytes)
+inline void _serv_read(char *buf, int bytes, struct wcsession *WCC)
 {
        int len, rlen;
 
        len = 0;
        while (len < bytes) {
-               rlen = read(WC->serv_sock, &buf[len], bytes - len);
+               rlen = read(WCC->serv_sock, &buf[len], bytes - len);
                if (rlen < 1) {
                        lprintf(1, "Server connection broken: %s\n",
                                strerror(errno));
-                       close(WC->serv_sock);
-                       WC->serv_sock = (-1);
-                       WC->connected = 0;
-                       WC->logged_in = 0;
+                       wc_backtrace();
+                       close(WCC->serv_sock);
+                       WCC->serv_sock = (-1);
+                       WCC->connected = 0;
+                       WCC->logged_in = 0;
                        memset(buf, 0, bytes);
                        return;
                }
@@ -144,37 +146,79 @@ void serv_read(char *buf, int bytes)
        }
 }
 
+void serv_read(char *buf, int bytes)
+{
+       struct wcsession *WCC = WC;
+       _serv_read(buf, bytes, WCC);
+}
 
 /**
  * \brief input string from pipe
  */
-void serv_getln(char *strbuf, int bufsize)
+int serv_getln(char *strbuf, int bufsize)
 {
+       struct wcsession *WCC = WC;
        int ch, len;
        char buf[2];
 
        len = 0;
        strbuf[0] = 0;
        do {
-               serv_read(&buf[0], 1);
+               _serv_read(&buf[0], 1, WCC);
                ch = buf[0];
-               strbuf[len++] = ch;
+               if ((ch != 13) && (ch != 10)) {
+                       strbuf[len++] = ch;
+               }
        } while ((ch != 10) && (ch != 0) && (len < (bufsize-1)));
-       if (strbuf[len-1] == 10) strbuf[--len] = 0;
-       if (strbuf[len-1] == 13) strbuf[--len] = 0;
+       strbuf[len] = 0;
 #ifdef SERV_TRACE
        lprintf(9, "%3d>%s\n", WC->serv_sock, strbuf);
 #endif
+       return len;
 }
 
+int StrBuf_ServGetln(StrBuf *buf)
+{
+       const char *ErrStr;
+       int rc;
+
+       rc = StrBufTCP_read_line(buf, &WC->serv_sock, 0, &ErrStr);
+       if (rc < 0)
+       {
+               lprintf(1, "Server connection broken: %s\n",
+                       ErrStr);
+               wc_backtrace();
+               WC->serv_sock = (-1);
+               WC->connected = 0;
+               WC->logged_in = 0;
+       }
+       return rc;
+}
 
+int StrBuf_ServGetBLOB(StrBuf *buf, long BlobSize)
+{
+       const char *Err;
+       int rc;
+       
+       rc = StrBufReadBLOB(buf, &WC->serv_sock, 1, BlobSize, &Err);
+       if (rc < 0)
+       {
+               lprintf(1, "Server connection broken: %s\n",
+                       Err);
+               wc_backtrace();
+               WC->serv_sock = (-1);
+               WC->connected = 0;
+               WC->logged_in = 0;
+       }
+       return rc;
+}
 
 /**
  * \brief send binary to server
  * \param buf the buffer to write to citadel server
  * \param nbytes how many bytes to send to citadel server
  */
-void serv_write(char *buf, int nbytes)
+void serv_write(const char *buf, int nbytes)
 {
        int bytes_written = 0;
        int retval;
@@ -199,15 +243,26 @@ void serv_write(char *buf, int nbytes)
  * \brief send line to server
  * \param string the line to send to the citadel server
  */
-void serv_puts(char *string)
+void serv_puts(const char *string)
 {
-       char buf[SIZ];
-
 #ifdef SERV_TRACE
        lprintf(9, "%3d<%s\n", WC->serv_sock, string);
 #endif
-       sprintf(buf, "%s\n", string);
-       serv_write(buf, strlen(buf));
+       serv_write(string, strlen(string));
+       serv_write("\n", 1);
+}
+
+/**
+ * \brief send line to server
+ * \param string the line to send to the citadel server
+ */
+void serv_putbuf(const StrBuf *string)
+{
+#ifdef SERV_TRACE
+       lprintf(9, "%3d<%s\n", WC->serv_sock, ChrPtr(string));
+#endif
+       serv_write(ChrPtr(string), StrLength(string));
+       serv_write("\n", 1);
 }
 
 
@@ -220,13 +275,16 @@ void serv_printf(const char *format,...)
 {
        va_list arg_ptr;
        char buf[SIZ];
+       size_t len;
 
        va_start(arg_ptr, format);
        vsnprintf(buf, sizeof buf, format, arg_ptr);
        va_end(arg_ptr);
 
-       strcat(buf, "\n");
-       serv_write(buf, strlen(buf));
+       len = strlen(buf);
+       buf[len++] = '\n';
+       buf[len] = '\0';
+       serv_write(buf, len);
 #ifdef SERV_TRACE
        lprintf(9, "<%s", buf);
 #endif