*
*/
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
#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 <arpa/inet.h>
#include <pwd.h>
#include <errno.h>
#include <stdarg.h>
+#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
-#include "dynloader.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
struct servent *pse;
struct protoent *ppe;
struct sockaddr_in sin;
+ struct sockaddr_in egress_sin;
int s, type;
+ 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 (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",
+ CtdlLogPrintf(CTDL_CRIT, "Can't get %s service entry: %s\n",
service, strerror(errno));
return(-1);
}
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",
+ CtdlLogPrintf(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",
+ CtdlLogPrintf(CTDL_CRIT, "Can't get %s protocol entry: %s\n",
protocol, strerror(errno));
return(-1);
}
s = socket(PF_INET, type, ppe->p_proto);
if (s < 0) {
- lprintf(3, "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(3, "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);
}
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.
+ * If keep_reading_until_full is nonzero, we keep reading until we get the number of requested bytes
*/
-int sock_read(int sock, char *buf, int bytes)
+int sock_read_to(int sock, char *buf, int bytes, int timeout, int keep_reading_until_full)
{
- 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 */
+ CtdlLogPrintf(CTDL_ERR, "sock_read() timed out.\n");
+ return(-1);
+ }
+
+ rlen = read(sock, &buf[len], bytes-len);
+ if (rlen<1) {
+ CtdlLogPrintf(CTDL_ERR, "sock_read() failed: %s\n",
+ strerror(errno));
+ return(-1);
}
len = len + rlen;
+ if (!keep_reading_until_full) return(len);
}
- 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, int keep_reading_until_full)
+{
+ return sock_read_to(sock, buf, bytes, CLIENT_TIMEOUT, keep_reading_until_full);
}
* 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);
}
/*
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] == '-') );
if (j<0) return(j);
return(i+j);
}
-
-
-/*
- * sock_puts_crlf() - same as sock_puts() but ends line with CRLF, not LF
- * Returns the number of bytes written, or -1 for error.
- */
-int sock_puts_crlf(int sock, char *buf)
-{
- int i, j;
-
- i = sock_write(sock, buf, strlen(buf));
- if (i<0) return(i);
- j = sock_write(sock, "\r\n", 2);
- if (j<0) return(j);
- return(i+j);
-}
projects / citadel.git / blobdiff