#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 <errno.h>
#include <stdarg.h>
#include "citadel.h"
+#include "server.h"
+#include "serv_extensions.h"
#ifndef HAVE_SNPRINTF
#include "snprintf.h"
#endif
#include "sysdep_decls.h"
+#include <clientsocket.h>
#ifndef INADDR_NONE
#define INADDR_NONE 0xffffffff
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);
}
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);
}
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);
}
-/* FIX ... the alarm clock is a problem for multithreaded programs because all
- * threads receive the signal.
- signal(SIGALRM, timeout);
- alarm(30);
- */
-
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);
}
-/*
- alarm(0);
- signal(SIGALRM, SIG_IGN);
- */
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);
}
}
+
/*
* Input string from socket - implemented in terms of sock_read()
*
*/
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);
return(strlen(buf));
}
+/*
+ * Multiline version of sock_gets() ... this is a convenience function for
+ * client side protocol implementations. It only returns the first line of
+ * a multiline response, discarding the rest.
+ */
+int ml_sock_gets(int sock, char *buf) {
+ char bigbuf[1024];
+ int g;
+
+ g = sock_gets(sock, buf);
+ if (g < 4) return(g);
+ if (buf[3] != '-') return(g);
+
+ do {
+ g = sock_gets(sock, bigbuf);
+ if (g < 0) return(g);
+ } while ( (g >= 4) && (bigbuf[3] == '-') );
+
+ return(strlen(buf));
+}
+
/*
* sock_puts() - send line to server - implemented in terms of serv_write()