X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=comstack%2Ftcpip.c;h=4c9b481d75a9e1497bfc91e90910e57d47578cda;hb=767ff54e1425e6be8208fe3fee6e7e1b9cadcfb6;hp=1d02f4e4f62a448d590413eeaa0d8d21e9e01656;hpb=e5324215018e129dd19734acd0e683e5af748423;p=yaz-moved-to-github.git

diff --git a/comstack/tcpip.c b/comstack/tcpip.c
index 1d02f4e..4c9b481 100644
--- a/comstack/tcpip.c
+++ b/comstack/tcpip.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (c) 1995-2000, Index Data
+ * Copyright (c) 1995-2001, Index Data
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: tcpip.c,v $
- * Revision 1.36  2001-02-21 13:46:53  adam
+ * Revision 1.40  2001-08-23 09:02:46  adam
+ * WIN32 fixes: Socket not re-used for bind. yaz_log logs WIN32 error
+ * message.
+ *
+ * Revision 1.39  2001/07/19 19:49:40  adam
+ * Fixed bug in tcpip_set_blocking.
+ *
+ * Revision 1.38  2001/03/21 12:43:36  adam
+ * Implemented cs_create_host. Better error reporting for SSL comstack.
+ *
+ * Revision 1.37  2001/03/08 20:18:55  adam
+ * Added cs_set_blocking. Patch from Matthew Carey.
+ *
+ * Revision 1.36  2001/02/21 13:46:53  adam
  * C++ fixes.
  *
  * Revision 1.35  2000/11/27 15:17:40  adam
@@ -214,6 +226,7 @@ int tcpip_bind(COMSTACK h, void *address, int mode);
 int tcpip_listen(COMSTACK h, char *raddr, int *addrlen,
 		 int (*check_ip)(void *cd, const char *a, int len, int type),
 		 void *cd);
+int static tcpip_set_blocking(COMSTACK p, int blocking);
 
 #if HAVE_OPENSSL_SSL_H
 int ssl_get(COMSTACK h, char **buf, int *bufsize);
@@ -336,6 +349,7 @@ COMSTACK tcpip_type(int s, int blocking, int protocol, void *vp)
     p->f_accept = tcpip_accept;
     p->f_addrstr = tcpip_addrstr;
     p->f_straddr = tcpip_straddr;
+    p->f_set_blocking = tcpip_set_blocking;
 
     p->state = new_socket ? CS_UNBND : CS_IDLE; /* state of line */
     p->event = CS_NONE;
@@ -490,6 +504,7 @@ int tcpip_connect(COMSTACK h, void *address)
 		return 1;
 	    }
 #endif
+	    h->cerrno = CSYSERR;
 	    return -1;
 	}
 	h->state = CS_CONNECTING;
@@ -525,6 +540,7 @@ int tcpip_connect(COMSTACK h, void *address)
 		h->io_pending = CS_WANT_WRITE;
 		return 1;
 	    }
+	    h->cerrno = CSERRORSSL;
 	    return -1;
 	}
     }
@@ -591,13 +607,15 @@ int tcpip_bind(COMSTACK h, void *address, int mode)
 #else
     TRC (fprintf (stderr, "tcpip_bind\n"));
 #endif
+#ifndef WIN32
     if (setsockopt(h->iofile, SOL_SOCKET, SO_REUSEADDR, (char*) 
 	&one, sizeof(one)) < 0)
     {
         h->cerrno = CSYSERR;
         return -1;
     }
-    if (bind(h->iofile, addr, sizeof(struct sockaddr_in)) < 0)
+#endif
+    if (bind(h->iofile, addr, sizeof(struct sockaddr_in)))
     {
         h->cerrno = CSYSERR;
         return -1;
@@ -936,6 +954,7 @@ int ssl_get(COMSTACK h, char **buf, int *bufsize)
 	    }
 	    if (res == 0)
 		return 0;
+	    h->cerrno = CSERRORSSL;
 	    return -1;
 	}
 	hasread += res;
@@ -1060,6 +1079,7 @@ int ssl_put(COMSTACK h, char *buf, int size)
 		yaz_log (LOG_LOG, "SSL_write. want_write");
 		return 1;
 	    }
+	    h->cerrno = CSERRORSSL;
 	    return -1;
 	}
 	state->written += res;
@@ -1134,3 +1154,26 @@ char *tcpip_addrstr(COMSTACK h)
 #endif
     return buf;
 }
+
+int static tcpip_set_blocking(COMSTACK p, int blocking)
+{
+    unsigned long flag;
+    
+    if (p->blocking == blocking)
+	return 1;
+#ifdef WIN32
+    flag = 1;
+    if (ioctlsocket(p->iofile, FIONBIO, &flag) < 0)
+	return 0;
+#else
+    flag = fcntl(p->iofile, F_GETFL, 0);
+    if(!blocking)
+	flag = flag & ~O_NONBLOCK;
+    else
+        flag = flag | O_NONBLOCK;
+    if (fcntl(p->iofile, F_SETFL, flag) < 0)
+	return 0;
+#endif
+    p->blocking = blocking;
+    return 1;
+}