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

diff --git a/comstack/tcpip.c b/comstack/tcpip.c
index b558c88..4c9b481 100644
--- a/comstack/tcpip.c
+++ b/comstack/tcpip.c
@@ -3,7 +3,14 @@
  * See the file LICENSE for details.
  *
  * $Log: tcpip.c,v $
- * Revision 1.38  2001-03-21 12:43:36  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
@@ -600,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;
@@ -1152,9 +1161,8 @@ int static tcpip_set_blocking(COMSTACK p, int blocking)
     
     if (p->blocking == blocking)
 	return 1;
-    if(blocking)
 #ifdef WIN32
-        flag = blocking;
+    flag = 1;
     if (ioctlsocket(p->iofile, FIONBIO, &flag) < 0)
 	return 0;
 #else