/*
- * tcp_sockets.c
+ * $Id$
*
- * TCP socket module for WebCit
+ * TCP client socket module for WebCit
*
- * $Id$
*/
+/*
+ * Uncomment this to log all communications with the Citadel server
+#define SERV_TRACE 1
+ */
+
+#include <ctype.h>
#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
#include <unistd.h>
-#endif
#include <stdio.h>
+#include <fcntl.h>
#include <signal.h>
#include <sys/types.h>
+#include <sys/wait.h>
#include <sys/socket.h>
+#include <sys/time.h>
+#include <limits.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <sys/un.h>
#include <netdb.h>
#include <string.h>
+#include <pwd.h>
+#include <errno.h>
#include <stdarg.h>
+#include <pthread.h>
+#include <signal.h>
#include "webcit.h"
+#include "webserver.h"
-char server_is_local = 0;
#ifndef INADDR_NONE
#define INADDR_NONE 0xffffffff
#endif
-extern int errno;
+RETSIGTYPE timeout(int signum)
+{
+ lprintf(1, "Connection timed out.\n");
+ exit(3);
+}
-int serv_sock;
-RETSIGTYPE timeout(int signum)
+/*
+ * Connect a unix domain socket
+ */
+int uds_connectsock(char *sockpath)
{
- fprintf(stderr, "Connection timed out.\n");
- exit(3);
+ struct sockaddr_un addr;
+ int s;
+
+ memset(&addr, 0, sizeof(addr));
+ addr.sun_family = AF_UNIX;
+ strncpy(addr.sun_path, sockpath, sizeof addr.sun_path);
+
+ s = socket(AF_UNIX, SOCK_STREAM, 0);
+ if (s < 0) {
+ lprintf(1, "Can't create socket: %s\n",
+ strerror(errno));
+ return(-1);
+ }
+
+ if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+ lprintf(1, "Can't connect: %s\n",
+ strerror(errno));
+ close(s);
+ return(-1);
+ }
+
+ return s;
}
-int connectsock(char *host, char *service, char *protocol)
+
+/*
+ * Connect a TCP/IP socket
+ */
+int tcp_connectsock(char *host, char *service)
{
struct hostent *phe;
struct servent *pse;
struct protoent *ppe;
struct sockaddr_in sin;
- int s, type;
+ int s;
- bzero((char *) &sin, sizeof(sin));
+ memset(&sin, 0, sizeof(sin));
sin.sin_family = AF_INET;
- pse = getservbyname(service, protocol);
+ pse = getservbyname(service, "tcp");
if (pse) {
sin.sin_port = pse->s_port;
} else if ((sin.sin_port = htons((u_short) atoi(service))) == 0) {
- fprintf(stderr, "Can't get %s service entry\n", service);
+ lprintf(1, "Can't get %s service entry\n", service);
return (-1);
}
phe = gethostbyname(host);
if (phe) {
- bcopy(phe->h_addr, (char *) &sin.sin_addr, phe->h_length);
+ memcpy(&sin.sin_addr, phe->h_addr, phe->h_length);
} else if ((sin.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE) {
- fprintf(stderr, "Can't get %s host entry: %s\n",
+ lprintf(1, "Can't get %s host entry: %s\n",
host, strerror(errno));
return (-1);
}
- if ((ppe = getprotobyname(protocol)) == 0) {
- fprintf(stderr, "Can't get %s protocol entry: %s\n",
- protocol, strerror(errno));
+ if ((ppe = getprotobyname("tcp")) == 0) {
+ lprintf(1, "Can't get TCP protocol entry: %s\n",
+ strerror(errno));
return (-1);
}
- if (!strcmp(protocol, "udp"))
- type = SOCK_DGRAM;
- else
- type = SOCK_STREAM;
- s = socket(PF_INET, type, ppe->p_proto);
+ s = socket(PF_INET, SOCK_STREAM, ppe->p_proto);
if (s < 0) {
- fprintf(stderr, "Can't create socket: %s\n", strerror(errno));
+ lprintf(1, "Can't create socket: %s\n", strerror(errno));
return (-1);
}
signal(SIGALRM, timeout);
alarm(30);
if (connect(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
- fprintf(stderr, "can't connect to %s.%s: %s\n",
+ lprintf(1, "Can't connect to %s.%s: %s\n",
host, service, strerror(errno));
+ close(s);
return (-1);
}
alarm(0);
len = 0;
while (len < bytes) {
- rlen = read(serv_sock, &buf[len], bytes - len);
+ rlen = read(WC->serv_sock, &buf[len], bytes - len);
if (rlen < 1) {
- fprintf(stderr, "Server connection broken: %s\n",
+ lprintf(1, "Server connection broken: %s\n",
strerror(errno));
- connected = 0;
- logged_in = 0;
+ close(WC->serv_sock);
+ WC->serv_sock = (-1);
+ WC->connected = 0;
+ WC->logged_in = 0;
+ memset(buf, 0, bytes);
return;
}
len = len + rlen;
serv_read(&buf[0], 1);
ch = buf[0];
strbuf[len++] = ch;
- } while ((ch != 10) && (ch != 13) && (ch != 0) && (len < 255));
- strbuf[len - 1] = 0;
- /* fprintf(stderr, ">%s\n", strbuf); */
+ } while ((ch != 10) && (ch != 0) && (len < (SIZ-1)));
+ if (strbuf[len-1] == 10) strbuf[--len] = 0;
+ if (strbuf[len-1] == 13) strbuf[--len] = 0;
+#ifdef SERV_TRACE
+ lprintf(9, ">%s\n", strbuf);
+#endif
}
int bytes_written = 0;
int retval;
while (bytes_written < nbytes) {
- retval = write(serv_sock, &buf[bytes_written],
+ retval = write(WC->serv_sock, &buf[bytes_written],
nbytes - bytes_written);
if (retval < 1) {
- fprintf(stderr, "Server connection broken: %s\n",
+ lprintf(1, "Server connection broken: %s\n",
strerror(errno));
- connected = 0;
- logged_in = 0;
+ close(WC->serv_sock);
+ WC->serv_sock = (-1);
+ WC->connected = 0;
+ WC->logged_in = 0;
return;
}
bytes_written = bytes_written + retval;
*/
void serv_puts(char *string)
{
- char buf[256];
+ char buf[SIZ];
+#ifdef SERV_TRACE
+ lprintf(9, "<%s\n", string);
+#endif
sprintf(buf, "%s\n", string);
serv_write(buf, strlen(buf));
}
void serv_printf(const char *format,...)
{
va_list arg_ptr;
- char buf[256];
+ char buf[SIZ];
va_start(arg_ptr, format);
- vsprintf(buf, format, arg_ptr);
+ vsnprintf(buf, sizeof buf, format, arg_ptr);
va_end(arg_ptr);
strcat(buf, "\n");
serv_write(buf, strlen(buf));
- /* fprintf(stderr, "<%s", buf); */
+#ifdef SERV_TRACE
+ lprintf(9, "<%s", buf);
+#endif
}
projects / citadel.git / blobdiff