Enablie inetd operations fro TCP/IP stack

[yaz-moved-to-github.git] / comstack / tcpip.c

diff --git a/comstack/tcpip.c b/comstack/tcpip.c
index 4e2ab4f..04b6013 100644 (file)
--- a/comstack/tcpip.c
+++ b/comstack/tcpip.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: tcpip.c,v $
- * Revision 1.7  1995-10-30 12:41:16  quinn
+ * Revision 1.9  1996-02-10 12:23:11  quinn
+ * Enablie inetd operations fro TCP/IP stack
+ *
+ * Revision 1.8  1995/11/01  13:54:27  quinn
+ * Minor adjustments
+ *
+ * Revision 1.7  1995/10/30  12:41:16  quinn
  * Added hostname lookup for server.
  *
  * Revision 1.6  1995/09/29  17:12:00  quinn
@@ -129,18 +135,21 @@ static int initialized = 0;
 typedef struct tcpip_state
 {
     char *altbuf; /* alternate buffer for surplus data */
-    int altsize;  /* size as malloced */
+    int altsize;  /* size as xmalloced */
     int altlen;   /* length of data or 0 if none */
 
     int written;  /* -1 if we aren't writing */
     int towrite;  /* to verify against user input */
 } tcpip_state;
 
-COMSTACK tcpip_type(int blocking, int protocol)
+/*
+ * s >= 0: socket has already been established for us.
+ */
+COMSTACK tcpip_type(int s, int blocking, int protocol)
 {
     COMSTACK p;
     tcpip_state *state;
-    int s;
+    int new_socket;
 #ifdef WINDOWS
     unsigned long tru = 1;
 #else
@@ -160,24 +169,32 @@ COMSTACK tcpip_type(int blocking, int protocol)
         initialized = 1;
     }
 
+    if (s < 0)
+    {
 #ifndef WINDOWS
-    if (!(proto = getprotobyname("tcp")))
-        return 0;
-    if ((s = socket(AF_INET, SOCK_STREAM, proto->p_proto)) < 0)
+       if (!(proto = getprotobyname("tcp")))
+           return 0;
+       if ((s = socket(AF_INET, SOCK_STREAM, proto->p_proto)) < 0)
 #else
-    if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+       if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0)
 #endif
-        return 0;
-    if (!(p = malloc(sizeof(struct comstack))))
-        return 0;
-    if (!(state = p->private = malloc(sizeof(tcpip_state))))
-        return 0;
+           return 0;
+       new_socket = 1;
+    }
+    else
+       new_socket = 0;
+    if (!(p = xmalloc(sizeof(struct comstack))))
+       return 0;
+    if (!(state = p->private = xmalloc(sizeof(tcpip_state))))
+       return 0;
+
 #ifdef WINDOWS
     if (!(p->blocking = blocking) && ioctlsocket(s, FIONBIO, &tru) < 0)
 #else
     if (!(p->blocking = blocking) && fcntl(s, F_SETFL, O_NONBLOCK) < 0)
 #endif
-        return 0;
+       return 0;
+
     p->iofile = s;
     p->type = tcpip_type;
     p->protocol = protocol;
@@ -193,7 +210,7 @@ COMSTACK tcpip_type(int blocking, int protocol)
     p->f_accept = tcpip_accept;
     p->f_addrstr = tcpip_addrstr;
 
-    p->state = CS_UNBND;
+    p->state = new_socket ? CS_UNBND : CS_IDLE; /* state of line */
     p->event = CS_NONE;
     p->cerrno = 0;
     p->stackerr = 0;
@@ -347,14 +364,14 @@ COMSTACK tcpip_accept(COMSTACK h)
         h->cerrno = CSOUTSTATE;
         return 0;
     }
-    if (!(new = malloc(sizeof(*new))))
+    if (!(new = xmalloc(sizeof(*new))))
     {
         h->cerrno = CSYSERR;
         return 0;
     }
     memcpy(new, h, sizeof(*h));
     new->iofile = h->newfd;
-    if (!(state = new->private = malloc(sizeof(tcpip_state))))
+    if (!(state = new->private = xmalloc(sizeof(tcpip_state))))
     {
         h->cerrno = CSYSERR;
         return 0;
@@ -404,11 +421,11 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize)
     {
         if (!*bufsize)
         {
-            if (!(*buf = malloc(*bufsize = CS_TCPIP_BUFCHUNK)))
+            if (!(*buf = xmalloc(*bufsize = CS_TCPIP_BUFCHUNK)))
                 return -1;
         }
         else if (*bufsize - hasread < CS_TCPIP_BUFCHUNK)
-            if (!(*buf = realloc(*buf, *bufsize *= 2)))
+            if (!(*buf =xrealloc(*buf, *bufsize *= 2)))
                 return -1;
         if ((res = recv(h->iofile, *buf + hasread, CS_TCPIP_BUFCHUNK, 0)) < 0)
 #ifdef WINDOWS
@@ -435,10 +452,10 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize)
             req += CS_TCPIP_BUFCHUNK - rest;
         if (!sp->altbuf)
         {
-            if (!(sp->altbuf = malloc(sp->altsize = req)))
+            if (!(sp->altbuf = xmalloc(sp->altsize = req)))
                 return -1;
         } else if (sp->altsize < req)
-            if (!(sp->altbuf = realloc(sp->altbuf, sp->altsize = req)))
+            if (!(sp->altbuf =xrealloc(sp->altbuf, sp->altsize = req)))
                 return -1;
         TRC(fprintf(stderr, "  Moving %d bytes to altbuf(0x%x)\n", tomove,
             (unsigned) sp->altbuf));
@@ -503,9 +520,9 @@ int tcpip_close(COMSTACK h)
     TRC(fprintf(stderr, "tcpip_close\n"));
     close(h->iofile);
     if (sp->altbuf)
-        free(sp->altbuf);
-    free(sp);
-    free(h);
+        xfree(sp->altbuf);
+    xfree(sp);
+    xfree(h);
     return 0;
 }