Fixed BPB bug: GNET command cuts off at 1024 characters

[citadel.git] / citadel / clientsocket.c

diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c
index 4c8e201194a71e0058fa6ae3150829ead0f8e816..ed54c2f778d496d1119a49814a4e7981f50799c2 100644 (file)
--- a/citadel/clientsocket.c
+++ b/citadel/clientsocket.c
@@ -7,82 +7,22 @@
  * Copyright (c) 1987-2011 by the citadel.org team
  *
  * 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.
+ * modify it under the terms of the GNU General Public License, version 3.
  *
  * 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.
- *
- * 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
  */
 
-#include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
-#include <stdio.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <sys/un.h>
-#include <arpa/inet.h>
 #include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <syslog.h>
+#include <stdio.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-#include "sysdep_decls.h"
-#include "config.h"
-#include "clientsocket.h"
 #include "ctdl_module.h"
+#include "clientsocket.h"
 
-
-/*
- * Connect to a unix domain socket (normally called by sock_connect() passthru)
- */
-int uds_sock_connect(char *sockpath)
-{
-       struct sockaddr_un addr;
-       int s;
-
-       memset(&addr, 0, sizeof(addr));
-       addr.sun_family = AF_UNIX;
-       safestrncpy(addr.sun_path, sockpath, sizeof addr.sun_path);
-
-       s = socket(AF_UNIX, SOCK_STREAM, 0);
-       if (s < 0) {
-               syslog(LOG_ERR, "socket() failed: %s", strerror(errno));
-               return(-1);
-       }
-
-       if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
-               syslog(LOG_ERR, "connect() failed: %s", strerror(errno));
-               close(s);
-               return(-1);
-       }
-
-       return s;
-}
-
-
-/*
- * Connect to a service via a client socket.  This supports both IPv4 and IPv6.
- * If the first character of the host name/addr is "/" then we assume the caller
- * is actually trying to connect to a unix domain socket and we do that instead.
- */
 int sock_connect(char *host, char *service)
 {
        struct in6_addr serveraddr;
@@ -94,11 +34,6 @@ int sock_connect(char *host, char *service)
 
        if ((host == NULL) || IsEmptyStr(host))
                return (-1);
-
-       if (host[0] == '/') {
-               return uds_sock_connect(host);
-       }
-
        if ((service == NULL) || IsEmptyStr(service))
                return (-1);
 
@@ -169,18 +104,12 @@ int sock_connect(char *host, char *service)
  *      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 = MyContext();
        const char *Error;
        int retval = 0;
 
-
-       retval = StrBufReadBLOBBuffered(Target,
-                                       CCC->SBuf.Buf,
-                                       &CCC->SBuf.ReadWritePointer,
-                                       Socket, 1, bytes, O_TERM, &Error);
-       
+       retval = StrBufReadBLOBBuffered(Target, CC->SBuf.Buf, &CC->SBuf.ReadWritePointer, Socket, 1, bytes, O_TERM, &Error); 
        if (retval < 0) {
                syslog(LOG_CRIT, "socket_read_blob() failed: %s", Error);
        }
@@ -188,7 +117,7 @@ int socket_read_blob(int *Socket, StrBuf * Target, int bytes, int timeout)
 }
 
 
-int CtdlSockGetLine(int *sock, StrBuf * Target, int nSec)
+int CtdlSockGetLine(int *sock, StrBuf *Target, int nSec)
 {
        CitContext *CCC = MyContext();
        const char *Error;
@@ -199,16 +128,15 @@ int CtdlSockGetLine(int *sock, StrBuf * Target, int nSec)
                                               CCC->SBuf.Buf,
                                               &CCC->SBuf.ReadWritePointer,
                                               sock, nSec, 1, &Error);
-       if ((rc < 0) && (Error != NULL))
+       if ((rc < 0) && (Error != NULL)) {
                syslog(LOG_CRIT, "CtdlSockGetLine() failed: %s", Error);
+       }
        return rc;
 }
 
 
 /*
  * 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(int *sock, char *buf, int bufsize)
 {
@@ -300,11 +228,8 @@ int sock_write_timeout(int *sock, const char *buf, int nbytes, int timeout)
 }
 
 
-
 /*
  * 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)
 {
@@ -328,6 +253,7 @@ int sock_getln_err(int *sock, char *buf, int bufsize, int *rc, int nSec)
        return i;
 }
 
+
 /*
  * Multiline version of sock_gets() ... this is a convenience function for
  * client side protocol implementations.  It only returns the first line of