* Began (but did not finish) applying GPL3+ declarations to each source file. This...

[citadel.git] / citadel / clientsocket.c

diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c
index 5b5bb90b276e501d060a94da4291e4dff96358d9..f63c4b11f6dfea7fb731c7fb6eb6628c60d9af87 100644 (file)
--- a/citadel/clientsocket.c
+++ b/citadel/clientsocket.c
@@ -6,6 +6,21 @@
  * 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-2009 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
+ *  (at your option) any later version.
+ *
+ *  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"
@@ -23,6 +38,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <stdarg.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
 #ifndef HAVE_SNPRINTF
@@ -31,7 +47,6 @@
 #include "sysdep_decls.h"
 #include "config.h"
 #include "clientsocket.h"
-#include "tools.h"
 
 #ifndef INADDR_NONE
 #define INADDR_NONE 0xffffffff
@@ -60,7 +75,7 @@ int sock_connect(char *host, char *service, char *protocol)
        if (pse) {
                sin.sin_port = pse->s_port;
        } else if ((sin.sin_port = htons((u_short) atoi(service))) == 0) {
-               lprintf(CTDL_CRIT, "Can't get %s service entry: %s\n",
+               CtdlLogPrintf(CTDL_CRIT, "Can't get %s service entry: %s\n",
                        service, strerror(errno));
                return(-1);
        }
@@ -68,12 +83,12 @@ int sock_connect(char *host, char *service, char *protocol)
        if (phe) {
                memcpy(&sin.sin_addr, phe->h_addr, phe->h_length);
        } else if ((sin.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE) {
-               lprintf(CTDL_ERR, "Can't get %s host entry: %s\n",
+               CtdlLogPrintf(CTDL_ERR, "Can't get %s host entry: %s\n",
                        host, strerror(errno));
                return(-1);
        }
        if ((ppe = getprotobyname(protocol)) == 0) {
-               lprintf(CTDL_CRIT, "Can't get %s protocol entry: %s\n",
+               CtdlLogPrintf(CTDL_CRIT, "Can't get %s protocol entry: %s\n",
                        protocol, strerror(errno));
                return(-1);
        }
@@ -85,7 +100,7 @@ int sock_connect(char *host, char *service, char *protocol)
 
        s = socket(PF_INET, type, ppe->p_proto);
        if (s < 0) {
-               lprintf(CTDL_CRIT, "Can't create socket: %s\n", strerror(errno));
+               CtdlLogPrintf(CTDL_CRIT, "Can't create socket: %s\n", strerror(errno));
                return(-1);
        }
 
@@ -106,7 +121,7 @@ int sock_connect(char *host, char *service, char *protocol)
 
        /* Now try to connect to the remote host. */
        if (connect(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
-               lprintf(CTDL_ERR, "Can't connect to %s:%s: %s\n",
+               CtdlLogPrintf(CTDL_ERR, "Can't connect to %s:%s: %s\n",
                        host, service, strerror(errno));
                close(s);
                return(-1);
@@ -139,13 +154,13 @@ int sock_read_to(int sock, char *buf, int bytes, int timeout, int keep_reading_u
                retval = select(sock+1, &rfds, NULL, NULL, &tv);
 
                if (FD_ISSET(sock, &rfds) == 0) {       /* timed out */
-                       lprintf(CTDL_ERR, "sock_read() timed out.\n");
+                       CtdlLogPrintf(CTDL_ERR, "sock_read() timed out.\n");
                        return(-1);
                }
 
                rlen = read(sock, &buf[len], bytes-len);
                if (rlen<1) {
-                       lprintf(CTDL_ERR, "sock_read() failed: %s\n",
+                       CtdlLogPrintf(CTDL_ERR, "sock_read() failed: %s\n",
                                strerror(errno));
                        return(-1);
                }