Minor changes.

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

diff --git a/comstack/tcpip.c b/comstack/tcpip.c
index 9347e04..a106805 100644 (file)
--- a/comstack/tcpip.c
+++ b/comstack/tcpip.c
@@ -3,7 +3,13 @@
  * See the file LICENSE for details.
  *
  * $Log: tcpip.c,v $
- * Revision 1.41  2001-10-12 21:49:26  adam
+ * Revision 1.43  2001-10-22 16:00:04  adam
+ * Renamed states for COMSTACKs to avoid confusion with events.
+ *
+ * Revision 1.42  2001/10/22 13:57:24  adam
+ * Implemented cs_rcvconnect and cs_look as described in the documentation.
+ *
+ * Revision 1.41  2001/10/12 21:49:26  adam
  * For accept/recv/send check for EAGAIN if it's differs from EWOULDBLOCK.
  *
  * Revision 1.40  2001/08/23 09:02:46  adam
@@ -354,7 +360,7 @@ COMSTACK tcpip_type(int s, int blocking, int protocol, void *vp)
     p->f_straddr = tcpip_straddr;
     p->f_set_blocking = tcpip_set_blocking;
 
-    p->state = new_socket ? CS_UNBND : CS_IDLE; /* state of line */
+    p->state = new_socket ? CS_ST_UNBND : CS_ST_IDLE; /* state of line */
     p->event = CS_NONE;
     p->cerrno = 0;
     p->stackerr = 0;
@@ -487,7 +493,7 @@ int tcpip_connect(COMSTACK h, void *address)
 
     TRC(fprintf(stderr, "tcpip_connect\n"));
     h->io_pending = 0;
-    if (h->state == CS_UNBND)
+    if (h->state == CS_ST_UNBND)
     {
        r = connect(h->iofile, (struct sockaddr *) add, sizeof(*add));
        if (r < 0)
@@ -495,14 +501,16 @@ int tcpip_connect(COMSTACK h, void *address)
 #ifdef WIN32
            if (WSAGetLastError() == WSAEWOULDBLOCK)
            {
-               h->state = CS_CONNECTING;
+               h->event = CS_CONNECT;
+               h->state = CS_ST_CONNECTING;
                h->io_pending = CS_WANT_WRITE;
                return 1;
            }
 #else
            if (errno == EINPROGRESS)
            {
-               h->state = CS_CONNECTING;
+               h->event = CS_CONNECT;
+               h->state = CS_ST_CONNECTING;
                h->io_pending = CS_WANT_WRITE|CS_WANT_READ;
                return 1;
            }
@@ -510,9 +518,10 @@ int tcpip_connect(COMSTACK h, void *address)
            h->cerrno = CSYSERR;
            return -1;
        }
-       h->state = CS_CONNECTING;
+       h->event = CS_CONNECT;
+       h->state = CS_ST_CONNECTING;
     }
-    if (h->state != CS_CONNECTING)
+    if (h->state != CS_ST_CONNECTING)
     {
         h->cerrno = CSOUTSTATE;
        return -1;
@@ -548,17 +557,48 @@ int tcpip_connect(COMSTACK h, void *address)
        }
     }
 #endif
-    h->state = CS_DATAXFER;
+    h->event = CS_DATA;
+    h->state = CS_ST_DATAXFER;
     return 0;
 }
 
 /*
  * nop
  */
-int tcpip_rcvconnect(COMSTACK h)
+int tcpip_rcvconnect(COMSTACK cs)
 {
     TRC(fprintf(stderr, "tcpip_rcvconnect\n"));
-    return 0;
+
+    if (cs->event == CS_CONNECT)
+    {
+       int fd = cs->iofile;
+       fd_set input, output;
+       struct timeval tv;
+       int r;
+       
+       tv.tv_sec = 0;
+       tv.tv_usec = 1;
+       
+       FD_ZERO(&input);
+       FD_ZERO(&output);
+       FD_SET (fd, &input);
+       FD_SET (fd, &output);
+       
+       r = select (fd+1, &input, &output, 0, &tv);
+       if (r > 0)
+       {
+           if (FD_ISSET(cs->iofile, &output))
+           {
+               cs->event = CS_DATA;
+               return 0;   /* write OK, we're OK */
+           }
+           else
+               return -1;  /* an error, for sure */
+       }
+       else if (r == 0)
+           return 0;  /* timeout - incomplete */
+    }
+    return -1;    /* wrong state or bad select */
 }
 
 #define CERTF "ztest.pem"
@@ -628,7 +668,8 @@ int tcpip_bind(COMSTACK h, void *address, int mode)
         h->cerrno = CSYSERR;
         return -1;
     }
-    h->state = CS_IDLE;
+    h->state = CS_ST_IDLE;
+    h->event = CS_LISTEN;
     return 0;
 }
 
@@ -644,7 +685,7 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen,
 #endif
 
     TRC(fprintf(stderr, "tcpip_listen pid=%d\n", getpid()));
-    if (h->state != CS_IDLE)
+    if (h->state != CS_ST_IDLE)
     {
         h->cerrno = CSOUTSTATE;
         return -1;
@@ -685,7 +726,7 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen,
        h->newfd = -1;
        return -1;
     }
-    h->state = CS_INCON;
+    h->state = CS_ST_INCON;
     return 0;
 }
 
@@ -698,7 +739,7 @@ COMSTACK tcpip_accept(COMSTACK h)
 #endif
 
     TRC(fprintf(stderr, "tcpip_accept\n"));
-    if (h->state == CS_INCON)
+    if (h->state == CS_ST_INCON)
     {
        if (!(cnew = (COMSTACK)xmalloc(sizeof(*cnew))))
        {
@@ -756,8 +797,8 @@ COMSTACK tcpip_accept(COMSTACK h)
        state->altsize = state->altlen = 0;
        state->towrite = state->written = -1;
        state->complete = st->complete;
-       cnew->state = CS_ACCEPT;
-       h->state = CS_IDLE;
+       cnew->state = CS_ST_ACCEPT;
+       h->state = CS_ST_IDLE;
        
 #if HAVE_OPENSSL_SSL_H
        state->ctx = st->ctx;
@@ -771,7 +812,7 @@ COMSTACK tcpip_accept(COMSTACK h)
 #endif
        h = cnew;
     }
-    if (h->state == CS_ACCEPT)
+    if (h->state == CS_ST_ACCEPT)
     {
 #if HAVE_OPENSSL_SSL_H
        tcpip_state *state = (tcpip_state *)h->cprivate;
@@ -806,7 +847,8 @@ COMSTACK tcpip_accept(COMSTACK h)
         return 0;
     }
     h->io_pending = 0;
-    h->state = CS_DATAXFER;
+    h->state = CS_ST_DATAXFER;
+    h->event = CS_DATA;
     return h;
 }
 
@@ -1008,6 +1050,7 @@ int tcpip_put(COMSTACK h, char *buf, int size)
 
     TRC(fprintf(stderr, "tcpip_put: size=%d\n", size));
     h->io_pending = 0;
+    h->event = CS_DATA;
     if (state->towrite < 0)
     {
         state->towrite = size;
@@ -1020,8 +1063,15 @@ int tcpip_put(COMSTACK h, char *buf, int size)
     }
     while (state->towrite > state->written)
     {
-       if ((res = send(h->iofile, buf + state->written, size -
-                       state->written, 0)) < 0)
+       if ((res =
+            send(h->iofile, buf + state->written, size -
+                 state->written, 
+#ifdef MSG_NOSIGNAL
+                 MSG_NOSIGNAL
+#else
+                 0
+#endif
+                )) < 0)
        {
            if (
 #ifdef WIN32
@@ -1066,6 +1116,7 @@ int ssl_put(COMSTACK h, char *buf, int size)
 
     TRC(fprintf(stderr, "ssl_put: size=%d\n", size));
     h->io_pending = 0;
+    h->event = CS_DATA;
     if (state->towrite < 0)
     {
         state->towrite = size;