X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fclientsocket.c;h=cd375db2d016fc1c7607ac8b588deace27b764ed;hb=01cc19a4c2da27b4db0e980ccd3ca54d834319c8;hp=f645e9261cd231e205ab6f8ab7449cccb2251063;hpb=6388ea5e94497e23e79d39e8d4e7dc758cf0e1d6;p=citadel.git

diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c
index f645e9261..cd375db2d 100644
--- a/citadel/clientsocket.c
+++ b/citadel/clientsocket.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <signal.h>
 #include <sys/types.h>
+#include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -23,10 +24,13 @@
 #include <errno.h>
 #include <stdarg.h>
 #include "citadel.h"
+#include "server.h"
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"
 #endif
 #include "sysdep_decls.h"
+#include "config.h"
+#include "clientsocket.h"
 
 #ifndef INADDR_NONE
 #define INADDR_NONE 0xffffffff
@@ -38,8 +42,16 @@ 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);
+
 	memset(&sin, 0, sizeof(sin));
 	sin.sin_family = AF_INET;
 
@@ -47,7 +59,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(3, "Can't get %s service entry: %s\n",
+		lprintf(CTDL_CRIT, "Can't get %s service entry: %s\n",
 			service, strerror(errno));
 		return(-1);
 	}
@@ -55,12 +67,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(3, "Can't get %s host entry: %s\n",
+		lprintf(CTDL_ERR, "Can't get %s host entry: %s\n",
 			host, strerror(errno));
 		return(-1);
 	}
 	if ((ppe = getprotobyname(protocol)) == 0) {
-		lprintf(3, "Can't get %s protocol entry: %s\n",
+		lprintf(CTDL_CRIT, "Can't get %s protocol entry: %s\n",
 			protocol, strerror(errno));
 		return(-1);
 	}
@@ -72,36 +84,82 @@ int sock_connect(char *host, char *service, char *protocol)
 
 	s = socket(PF_INET, type, ppe->p_proto);
 	if (s < 0) {
-		lprintf(3, "Can't create socket: %s\n", strerror(errno));
+		lprintf(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 (strlen(config.c_ip_addr) > 0) {
+		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(3, "can't connect to %s.%s: %s\n",
+		lprintf(CTDL_ERR, "Can't connect to %s:%s: %s\n",
 			host, service, strerror(errno));
+		close(s);
 		return(-1);
 	}
 
 	return (s);
 }
 
+
+
 /*
- * sock_read() - input binary data from socket.
+ * sock_read_to() - input binary data from socket, with a settable timeout.
  * Returns the number of bytes read, or -1 for error.
  */
-int sock_read(int sock, char *buf, int bytes)
+int sock_read_to(int sock, char *buf, int bytes, int timeout)
 {
-	int len, rlen;
+	int len,rlen;
+	fd_set rfds;
+	struct timeval tv;
+	int retval;
 
 	len = 0;
-	while (len < bytes) {
-		rlen = read(sock, &buf[len], bytes - len);
-		if (rlen < 1) {
-			return (-1);
+	while(len<bytes) {
+		FD_ZERO(&rfds);
+		FD_SET(sock, &rfds);
+		tv.tv_sec = timeout;
+		tv.tv_usec = 0;
+
+		retval = select(sock+1, &rfds, NULL, NULL, &tv);
+
+		if (FD_ISSET(sock, &rfds) == 0) {	/* timed out */
+			lprintf(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",
+				strerror(errno));
+			return(-1);
 		}
 		len = len + rlen;
 	}
-	return (len);
+	return(bytes);
+}
+
+
+/*
+ * 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)
+{
+	return sock_read_to(sock, buf, bytes, CLIENT_TIMEOUT);
 }
 
 
@@ -138,13 +196,13 @@ int sock_gets(int sock, char *buf)
 	 */
 	for (i = 0;; i++) {
 		if (sock_read(sock, &buf[i], 1) < 0) return(-1);
-		if (buf[i] == '\n' || i == 255)
+		if (buf[i] == '\n' || i == (SIZ-1))
 			break;
 	}
 
 	/* If we got a long line, discard characters until the newline.
 	 */
-	if (i == 255)
+	if (i == (SIZ-1))
 		while (buf[i] != '\n')
 			if (sock_read(sock, &buf[i], 1) < 0) return(-1);
 
@@ -169,8 +227,8 @@ int ml_sock_gets(int sock, char *buf) {
 	int g;
 
 	g = sock_gets(sock, buf);
-	if (g < 0) return(g);
-	if ( (g < 4) || (buf[3] != '-')) return(g);
+	if (g < 4) return(g);
+	if (buf[3] != '-') return(g);
 
 	do {
 		g = sock_gets(sock, bigbuf);