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
Added version info for WIN32.
[yaz-moved-to-github.git]
/
comstack
/
tcpip.c
diff --git
a/comstack/tcpip.c
b/comstack/tcpip.c
index
c6076b0
..
1d02f4e
100644
(file)
--- a/
comstack/tcpip.c
+++ b/
comstack/tcpip.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: tcpip.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: tcpip.c,v $
- * Revision 1.34 2000-11-23 10:58:32 adam
+ * Revision 1.36 2001-02-21 13:46:53 adam
+ * C++ fixes.
+ *
+ * Revision 1.35 2000/11/27 15:17:40 adam
+ * Using SSLeay_add_all_algorithms instead of OpenSSL_add_all_algorithms.
+ *
+ * Revision 1.34 2000/11/23 10:58:32 adam
* SSL comstack support. Separate POSIX thread support library.
*
* Revision 1.33 2000/09/04 08:27:11 adam
* SSL comstack support. Separate POSIX thread support library.
*
* Revision 1.33 2000/09/04 08:27:11 adam
@@
-375,7
+381,7
@@
COMSTACK ssl_type(int s, int blocking, int protocol, void *vp)
else
{
SSL_load_error_strings();
else
{
SSL_load_error_strings();
- OpenSSL_add_all_algorithms();
+ SSLeay_add_all_algorithms();
state->ctx = state->ctx_alloc = SSL_CTX_new (SSLv23_method());
if (!state->ctx)
state->ctx = state->ctx_alloc = SSL_CTX_new (SSLv23_method());
if (!state->ctx)
@@
-610,7
+616,11
@@
int tcpip_listen(COMSTACK h, char *raddr, int *addrlen,
void *cd)
{
struct sockaddr_in addr;
void *cd)
{
struct sockaddr_in addr;
+#ifdef __cplusplus
+ socklen_t len = sizeof(addr);
+#else
int len = sizeof(addr);
int len = sizeof(addr);
+#endif
TRC(fprintf(stderr, "tcpip_listen pid=%d\n", getpid()));
if (h->state != CS_IDLE)
TRC(fprintf(stderr, "tcpip_listen pid=%d\n", getpid()));
if (h->state != CS_IDLE)