X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fclientsocket.c;h=f63c4b11f6dfea7fb731c7fb6eb6628c60d9af87;hb=4eb74b26380dfde31c86c685f0589e0c653aebf0;hp=1fffa2bdc940c69d06ea046523eea78ec1023007;hpb=2ea2a7d64e158dfccb3e90a6b6d45647eed7323e;p=citadel.git

diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c
index 1fffa2bdc..f63c4b11f 100644
--- 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,9 +38,9 @@
 #include <pwd.h>
 #include <errno.h>
 #include <stdarg.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
-#include "serv_extensions.h"
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"
 #endif
@@ -43,26 +58,24 @@ int sock_connect(char *host, char *service, char *protocol)
 	struct servent *pse;
 	struct protoent *ppe;
 	struct sockaddr_in sin;
+	struct sockaddr_in egress_sin;
 	int s, type;
 
-	if (host == NULL) return(-1);
-	if (strlen(host) == 0) return(-1);
-	if (service == NULL) return(-1);
-	if (strlen(service) == 0) return(-1);
-	if (protocol == NULL) return(-1);
-	if (strlen(protocol) == 0) return(-1);
+	if ((host == NULL) || IsEmptyStr(host)) 
+		return(-1);
+	if ((service == NULL) || IsEmptyStr(service)) 
+		return(-1);
+	if ((protocol == NULL) || IsEmptyStr(protocol)) 
+		return(-1);
 
 	memset(&sin, 0, sizeof(sin));
 	sin.sin_family = AF_INET;
-	if (strlen(config.c_ip_addr) > 0) {
-		sin.sin_addr.s_addr = inet_addr(config.c_ip_addr);
-	}
 
 	pse = getservbyname(service, 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);
 	}
@@ -70,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);
 	}
@@ -87,12 +100,28 @@ 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);
 	}
 
+	/* If citserver is bound to a specific IP address on the host, make
+	 * sure we use that address for outbound connections.
+	 */
+	memset(&egress_sin, 0, sizeof(egress_sin));
+	egress_sin.sin_family = AF_INET;
+	if (!IsEmptyStr(config.c_ip_addr)) {
+		egress_sin.sin_addr.s_addr = inet_addr(config.c_ip_addr);
+        	if (egress_sin.sin_addr.s_addr == !INADDR_ANY) {
+                	egress_sin.sin_addr.s_addr = INADDR_ANY;
+		}
+
+		/* If this bind fails, no problem; we can still use INADDR_ANY */
+		bind(s, (struct sockaddr *)&egress_sin, sizeof(egress_sin));
+        }
+
+	/* 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);
@@ -106,8 +135,9 @@ int sock_connect(char *host, char *service, char *protocol)
 /*
  * sock_read_to() - input binary data from socket, with a settable timeout.
  * Returns the number of bytes read, or -1 for error.
+ * If keep_reading_until_full is nonzero, we keep reading until we get the number of requested bytes
  */
-int sock_read_to(int sock, char *buf, int bytes, int timeout)
+int sock_read_to(int sock, char *buf, int bytes, int timeout, int keep_reading_until_full)
 {
 	int len,rlen;
 	fd_set rfds;
@@ -115,7 +145,7 @@ int sock_read_to(int sock, char *buf, int bytes, int timeout)
 	int retval;
 
 	len = 0;
-	while(len<bytes) {
+	while (len<bytes) {
 		FD_ZERO(&rfds);
 		FD_SET(sock, &rfds);
 		tv.tv_sec = timeout;
@@ -124,17 +154,18 @@ int sock_read_to(int sock, char *buf, int bytes, int timeout)
 		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);
 		}
 		len = len + rlen;
+		if (!keep_reading_until_full) return(len);
 	}
 	return(bytes);
 }
@@ -144,9 +175,9 @@ int sock_read_to(int sock, char *buf, int bytes, int timeout)
  * sock_read() - input binary data from socket.
  * Returns the number of bytes read, or -1 for error.
  */
-INLINE int sock_read(int sock, char *buf, int bytes)
+INLINE int sock_read(int sock, char *buf, int bytes, int keep_reading_until_full)
 {
-	return sock_read_to(sock, buf, bytes, CLIENT_TIMEOUT);
+	return sock_read_to(sock, buf, bytes, CLIENT_TIMEOUT, keep_reading_until_full);
 }
 
 
@@ -175,33 +206,34 @@ int sock_write(int sock, char *buf, int nbytes)
  * Input string from socket - implemented in terms of sock_read()
  * 
  */
-int sock_gets(int sock, char *buf)
+int sock_getln(int sock, char *buf, int bufsize)
 {
 	int i;
 
 	/* Read one character at a time.
 	 */
 	for (i = 0;; i++) {
-		if (sock_read(sock, &buf[i], 1) < 0) return(-1);
-		if (buf[i] == '\n' || i == (SIZ-1))
+		if (sock_read(sock, &buf[i], 1, 1) < 0) return(-1);
+		if (buf[i] == '\n' || i == (bufsize-1))
 			break;
 	}
 
 	/* If we got a long line, discard characters until the newline.
 	 */
-	if (i == (SIZ-1))
+	if (i == (bufsize-1))
 		while (buf[i] != '\n')
-			if (sock_read(sock, &buf[i], 1) < 0) return(-1);
+			if (sock_read(sock, &buf[i], 1, 1) < 0) return(-1);
 
 	/* Strip any trailing CR and LF characters.
 	 */
 	buf[i] = 0;
-	while ( (strlen(buf)>0)
-	      && ((buf[strlen(buf)-1]==13)
-	      || (buf[strlen(buf)-1]==10)) ) {
-		buf[strlen(buf)-1] = 0;
+	while ( (i > 0)
+		&& ( (buf[i - 1]==13)
+		     || ( buf[i - 1]==10)) ) {
+		i--;
+		buf[i] = 0;
 	}
-	return(strlen(buf));
+	return(i);
 }
 
 /*
@@ -213,12 +245,12 @@ int ml_sock_gets(int sock, char *buf) {
 	char bigbuf[1024];
 	int g;
 
-	g = sock_gets(sock, buf);
+	g = sock_getln(sock, buf, SIZ);
 	if (g < 4) return(g);
 	if (buf[3] != '-') return(g);
 
 	do {
-		g = sock_gets(sock, bigbuf);
+		g = sock_getln(sock, bigbuf, SIZ);
 		if (g < 0) return(g);
 	} while ( (g >= 4) && (bigbuf[3] == '-') );