/*
- * tcp_sockets.c
- *
- * TCP socket module for WebCit
- *
- * version 1.3
- *
+ * $Id$
*/
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <stdarg.h>
-#include "webcit.h"
-
-char server_is_local = 0;
+/*
+ * Uncomment this to log all communications with the Citadel server
+#define SERV_TRACE 1
+ */
-#ifndef INADDR_NONE
-#define INADDR_NONE 0xffffffff
-#endif
-extern int errno;
+#include "webcit.h"
+#include "webserver.h"
-int serv_sock;
+/*
+ * register the timeout
+ * signum signalhandler number
+ * \return signals
+ */
+RETSIGTYPE timeout(int signum)
+{
+ lprintf(1, "Connection timed out; unable to reach citserver\n");
+ /* no exit here, since we need to server the connection unreachable thing. exit(3); */
+}
-#ifndef DONT_PROTO_HTONS
-u_short htons();
-#endif
-u_long inet_addr();
+/*
+ * Connect a unix domain socket
+ * sockpath where to open a unix domain socket
+ */
+int uds_connectsock(char *sockpath)
+{
+ 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]: %s\n",
+ sockpath,
+ strerror(errno));
+ return(-1);
+ }
-void timeout() {
- printf("\rConnection timed out.\n");
- exit(3);
+ if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+ lprintf(1, "Can't connect [%s]: %s\n",
+ sockpath,
+ strerror(errno));
+ close(s);
+ return(-1);
}
-int connectsock(host,service,protocol)
-char *host;
-char *service;
-char *protocol; {
+ return s;
+}
+
+
+/*
+ * Connect a TCP/IP socket
+ * host the host to connect to
+ * service the service on the host to call
+ */
+int tcp_connectsock(char *host, char *service)
+{
+ int fdflags;
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: %s\n",
- service,strerror(errno));
- return(-1);
- }
-
- phe=gethostbyname(host);
+ } else if ((sin.sin_port = htons((u_short) atoi(service))) == 0) {
+ 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);
- }
- else if ((sin.sin_addr.s_addr = inet_addr(host))==INADDR_NONE) {
- fprintf(stderr,"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));
- return(-1);
- }
-
- if (!strcmp(protocol,"udp"))
- type = SOCK_DGRAM;
- else
- type = SOCK_STREAM;
-
- s = socket(PF_INET,type,ppe->p_proto);
- if (s<0) {
- fprintf(stderr,"can't create socket: %s\n",strerror(errno));
- return(-1);
- }
-
+ memcpy(&sin.sin_addr, phe->h_addr, phe->h_length);
+ } else if ((sin.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE) {
+ lprintf(1, "Can't get %s host entry: %s\n",
+ host, strerror(errno));
+ return (-1);
+ }
+ if ((ppe = getprotobyname("tcp")) == 0) {
+ lprintf(1, "Can't get TCP protocol entry: %s\n",
+ strerror(errno));
+ return (-1);
+ }
- signal(SIGALRM,timeout);
+ s = socket(PF_INET, SOCK_STREAM, ppe->p_proto);
+ if (s < 0) {
+ 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",
- host,service,strerror(errno));
- return(-1);
- }
-
- alarm(0);
- signal(SIGALRM,SIG_IGN);
-
- return(s);
+ if (connect(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
+ lprintf(1, "Can't connect to %s.%s: %s\n",
+ host, service, strerror(errno));
+ close(s);
+ return (-1);
}
+ alarm(0);
+ signal(SIGALRM, SIG_IGN);
+ fdflags = fcntl(s, F_GETFL);
+ fdflags = fdflags | O_NONBLOCK;
+ fcntl(s, F_SETFD, fdflags);
+ return (s);
+}
/*
- * Input binary data from socket
- */
-void serv_read(buf,bytes)
-char buf[];
-int bytes; {
- int len,rlen;
-
- len = 0;
- while(len<bytes) {
- rlen = read(serv_sock,&buf[len],bytes-len);
- if (rlen<1) {
- printf("Network error - connection terminated.\n");
- printf("%s\n", strerror(errno));
- exit(3);
- }
- len = len + rlen;
- }
- }
-
-
-/*
- * input string from pipe
+ * input string from pipe
*/
-void serv_gets(strbuf)
-char strbuf[]; {
- int ch,len,rlen;
- char buf[2];
-
- len = 0;
- strcpy(strbuf,"");
- do {
- serv_read(&buf[0], 1);
- ch = buf[0];
- strbuf[len++] = ch;
- } while((ch!=10)&&(ch!=13)&&(ch!=0)&&(len<255));
- strbuf[len-1] = 0;
+int serv_getln(char *strbuf, int bufsize)
+{
+ wcsession *WCC = WC;
+ int len;
+
+ *strbuf = '\0';
+ StrBuf_ServGetln(WCC->MigrateReadLineBuf);
+ len = StrLength(WCC->MigrateReadLineBuf);
+ if (len > bufsize)
+ len = bufsize - 1;
+ memcpy(strbuf, ChrPtr(WCC->MigrateReadLineBuf), len);
+ FlushStrBuf(WCC->MigrateReadLineBuf);
+ strbuf[len] = '\0';
+#ifdef SERV_TRACE
+ lprintf(9, "%3d>%s\n", WC->serv_sock, strbuf);
+#endif
+ return len;
+}
+
+
+int StrBuf_ServGetln(StrBuf *buf)
+{
+ wcsession *WCC = WC;
+ const char *ErrStr;
+ int rc;
+
+ rc = StrBufTCP_read_buffered_line_fast(buf,
+ WCC->ReadBuf,
+ &WCC->ReadPos,
+ &WCC->serv_sock,
+ 5, 1,
+ &ErrStr);
+ if (rc < 0)
+ {
+ lprintf(1, "Server connection broken: %s\n",
+ ErrStr);
+ wc_backtrace();
+ WCC->serv_sock = (-1);
+ WCC->connected = 0;
+ WCC->logged_in = 0;
}
-
-
+ return rc;
+}
+
+int StrBuf_ServGetBLOBBuffered(StrBuf *buf, long BlobSize)
+{
+ wcsession *WCC = WC;
+ const char *Err;
+ int rc;
+
+ rc = StrBufReadBLOBBuffered(buf,
+ WCC->ReadBuf,
+ &WCC->ReadPos,
+ &WCC->serv_sock,
+ 1,
+ BlobSize,
+ NNN_TERM,
+ &Err);
+ if (rc < 0)
+ {
+ lprintf(1, "Server connection broken: %s\n",
+ Err);
+ wc_backtrace();
+ WCC->serv_sock = (-1);
+ WCC->connected = 0;
+ WCC->logged_in = 0;
+ }
+ return rc;
+}
+
+int StrBuf_ServGetBLOB(StrBuf *buf, long BlobSize)
+{
+ wcsession *WCC = WC;
+ const char *Err;
+ int rc;
+
+ WCC->ReadPos = NULL;
+ rc = StrBufReadBLOB(buf, &WCC->serv_sock, 1, BlobSize, &Err);
+ if (rc < 0)
+ {
+ lprintf(1, "Server connection broken: %s\n",
+ Err);
+ wc_backtrace();
+ WCC->serv_sock = (-1);
+ WCC->connected = 0;
+ WCC->logged_in = 0;
+ }
+ return rc;
+}
/*
- * Attach to a Citadel server
+ * send binary to server
+ * buf the buffer to write to citadel server
+ * nbytes how many bytes to send to citadel server
*/
-void attach_to_server(argc,argv)
-int argc;
-char *argv[]; {
- if (argc==1) {
- server_is_local = 1;
- serv_sock = connectsock("localhost","citadel","tcp");
+void serv_write(const char *buf, int nbytes)
+{
+ int bytes_written = 0;
+ int retval;
+ while (bytes_written < nbytes) {
+ retval = write(WC->serv_sock, &buf[bytes_written],
+ nbytes - bytes_written);
+ if (retval < 1) {
+ lprintf(1, "Server connection broken: %s\n",
+ strerror(errno));
+ close(WC->serv_sock);
+ WC->serv_sock = (-1);
+ WC->connected = 0;
+ WC->logged_in = 0;
+ return;
}
- if (argc==2) {
- serv_sock = connectsock(argv[1],"citadel","tcp");
- if ( (!strcmp(argv[1],"localhost"))
- || (!strcmp(argv[1],"127.0.0.1")) ) server_is_local = 1;
- }
- if (argc>=3) serv_sock = connectsock(argv[1],argv[2],"tcp");
-
- if (serv_sock < 0) exit(errno);
+ bytes_written = bytes_written + retval;
}
+}
/*
- * send binary to server
+ * send line to server
+ * string the line to send to the citadel server
*/
-void serv_write(buf, nbytes)
-char buf[];
-int nbytes; {
- int bytes_written = 0;
- int retval;
- while (bytes_written < nbytes) {
- retval = write(serv_sock, &buf[bytes_written],
- nbytes - bytes_written);
- if (retval < 1) {
- printf("Network error - connection terminated.\n");
- printf("%s\n", strerror(errno));
- exit(3);
- }
- bytes_written = bytes_written + retval;
- }
- }
+void serv_puts(const char *string)
+{
+ wcsession *WCC = WC;
+#ifdef SERV_TRACE
+ lprintf(9, "%3d<%s\n", WC->serv_sock, string);
+#endif
+ FlushStrBuf(WCC->ReadBuf);
+ WCC->ReadPos = NULL;
+ serv_write(string, strlen(string));
+ serv_write("\n", 1);
+}
/*
- * send line to server
+ * send line to server
+ * string the line to send to the citadel server
*/
-void serv_puts(string)
-char *string; {
- char buf[256];
+void serv_putbuf(const StrBuf *string)
+{
+ wcsession *WCC = WC;
+#ifdef SERV_TRACE
+ lprintf(9, "%3d<%s\n", WC->serv_sock, ChrPtr(string));
+#endif
+ FlushStrBuf(WCC->ReadBuf);
+ WCC->ReadPos = NULL;
- sprintf(buf,"%s\n",string);
- serv_write(buf, strlen(buf));
- }
+ serv_write(ChrPtr(string), StrLength(string));
+ serv_write("\n", 1);
+}
/*
- * convenience function to send stuff to the server
+ * convenience function to send stuff to the server
+ * format the formatstring
+ * ... the entities to insert into format
*/
-void serv_printf(const char *format, ...) {
- va_list arg_ptr;
- char buf[256];
-
- va_start(arg_ptr, format);
- vsprintf(buf, format, arg_ptr);
- va_end(arg_ptr);
-
- strcat(buf, "\n");
- serv_write(buf, strlen(buf));
- }
-
+void serv_printf(const char *format,...)
+{
+ wcsession *WCC = WC;
+ va_list arg_ptr;
+ char buf[SIZ];
+ size_t len;
+
+ FlushStrBuf(WCC->ReadBuf);
+ WCC->ReadPos = NULL;
+
+ va_start(arg_ptr, format);
+ vsnprintf(buf, sizeof buf, format, arg_ptr);
+ va_end(arg_ptr);
+
+ len = strlen(buf);
+ buf[len++] = '\n';
+ buf[len] = '\0';
+ serv_write(buf, len);
+#ifdef SERV_TRACE
+ lprintf(9, "<%s", buf);
+#endif
+}
projects / citadel.git / blobdiff