projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug in tcpip_set_blocking.
[yaz-moved-to-github.git]
/
comstack
/
tcpip.c
diff --git
a/comstack/tcpip.c
b/comstack/tcpip.c
index
6887469
..
9feb455
100644
(file)
--- a/
comstack/tcpip.c
+++ b/
comstack/tcpip.c
@@
-3,7
+3,13
@@
* See the file LICENSE for details.
*
* $Log: tcpip.c,v $
* See the file LICENSE for details.
*
* $Log: tcpip.c,v $
- * Revision 1.37 2001-03-08 20:18:55 adam
+ * 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
* Added cs_set_blocking. Patch from Matthew Carey.
*
* Revision 1.36 2001/02/21 13:46:53 adam
@@
-494,6
+500,7
@@
int tcpip_connect(COMSTACK h, void *address)
return 1;
}
#endif
return 1;
}
#endif
+ h->cerrno = CSYSERR;
return -1;
}
h->state = CS_CONNECTING;
return -1;
}
h->state = CS_CONNECTING;
@@
-529,6
+536,7
@@
int tcpip_connect(COMSTACK h, void *address)
h->io_pending = CS_WANT_WRITE;
return 1;
}
h->io_pending = CS_WANT_WRITE;
return 1;
}
+ h->cerrno = CSERRORSSL;
return -1;
}
}
return -1;
}
}
@@
-940,6
+948,7
@@
int ssl_get(COMSTACK h, char **buf, int *bufsize)
}
if (res == 0)
return 0;
}
if (res == 0)
return 0;
+ h->cerrno = CSERRORSSL;
return -1;
}
hasread += res;
return -1;
}
hasread += res;
@@
-1064,6
+1073,7
@@
int ssl_put(COMSTACK h, char *buf, int size)
yaz_log (LOG_LOG, "SSL_write. want_write");
return 1;
}
yaz_log (LOG_LOG, "SSL_write. want_write");
return 1;
}
+ h->cerrno = CSERRORSSL;
return -1;
}
state->written += res;
return -1;
}
state->written += res;
@@
-1145,9
+1155,8
@@
int static tcpip_set_blocking(COMSTACK p, int blocking)
if (p->blocking == blocking)
return 1;
if (p->blocking == blocking)
return 1;
- if(blocking)
#ifdef WIN32
#ifdef WIN32
- flag = blocking;
+ flag = 1;
if (ioctlsocket(p->iofile, FIONBIO, &flag) < 0)
return 0;
#else
if (ioctlsocket(p->iofile, FIONBIO, &flag) < 0)
return 0;
#else