/*
- * tcp_sockets.c
- *
- * TCP 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>
-#include <unistd.h>
-#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"
-
-#ifndef INADDR_NONE
-#define INADDR_NONE 0xffffffff
-#endif
-
+/*
+ * register the timeout
+ * signum signalhandler number
+ * \return signals
+ */
RETSIGTYPE timeout(int signum)
{
- lprintf(1, "Connection timed out.\n");
- exit(3);
+ lprintf(1, "Connection timed out; unable to reach citserver\n");
+ /* no exit here, since we need to server the connection unreachable thing. exit(3); */
}
-
/*
- * Connect a unix domain socket
+ * Connect a unix domain socket
+ * sockpath where to open a unix domain socket
*/
int uds_connectsock(char *sockpath)
{
memset(&addr, 0, sizeof(addr));
addr.sun_family = AF_UNIX;
- safestrncpy(addr.sun_path, sockpath, sizeof addr.sun_path);
+ 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",
+ lprintf(1, "Can't create socket[%s]: %s\n",
+ sockpath,
strerror(errno));
return(-1);
}
if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- lprintf(1, "Can't connect: %s\n",
+ lprintf(1, "Can't connect [%s]: %s\n",
+ sockpath,
strerror(errno));
+ close(s);
return(-1);
}
/*
- * Connect a TCP/IP socket
+ * 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;
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
+ * input string from pipe
*/
-void serv_read(char *buf, int bytes)
+int serv_getln(char *strbuf, int bufsize)
{
- int len, rlen;
-
- len = 0;
- while (len < bytes) {
- rlen = read(WC->serv_sock, &buf[len], bytes - len);
- if (rlen < 1) {
- lprintf(1, "Server connection broken: %s\n",
- strerror(errno));
- WC->connected = 0;
- WC->logged_in = 0;
- return;
- }
- len = len + rlen;
- }
+ 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;
}
-/*
- * input string from pipe
- */
-void serv_gets(char *strbuf)
+int StrBuf_ServGetln(StrBuf *buf)
{
- int ch, len;
- 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;
- /* lprintf(9, ">%s\n", strbuf); */
+ 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;
+}
/*
- * send binary to server
+ * send binary to server
+ * buf the buffer to write to citadel server
+ * nbytes how many bytes to send to citadel server
*/
-void serv_write(char *buf, int nbytes)
+void serv_write(const char *buf, int nbytes)
{
int bytes_written = 0;
int retval;
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;
/*
- * send line to server
+ * send line to server
+ * string the line to send to the citadel server
*/
-void serv_puts(char *string)
+void serv_puts(const char *string)
{
- char buf[SIZ];
+ wcsession *WCC = WC;
+#ifdef SERV_TRACE
+ lprintf(9, "%3d<%s\n", WC->serv_sock, string);
+#endif
+ FlushStrBuf(WCC->ReadBuf);
+ WCC->ReadPos = NULL;
- sprintf(buf, "%s\n", string);
- serv_write(buf, strlen(buf));
+ serv_write(string, strlen(string));
+ serv_write("\n", 1);
+}
+
+/*
+ * send line to server
+ * string the line to send to the citadel server
+ */
+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;
+
+ 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,...)
{
+ wcsession *WCC = WC;
va_list arg_ptr;
char buf[SIZ];
+ size_t len;
+
+ FlushStrBuf(WCC->ReadBuf);
+ WCC->ReadPos = NULL;
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));
- /* lprintf(9, "<%s", buf); */
+ 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