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 a warning (always to stderr) when opening the log file fails
[yaz-moved-to-github.git]
/
src
/
tcpip.c
diff --git
a/src/tcpip.c
b/src/tcpip.c
index
dae6c77
..
f417c24
100644
(file)
--- a/
src/tcpip.c
+++ b/
src/tcpip.c
@@
-2,7
+2,11
@@
* Copyright (c) 1995-2004, Index Data
* See the file LICENSE for details.
*
* Copyright (c) 1995-2004, Index Data
* See the file LICENSE for details.
*
- * $Id: tcpip.c,v 1.7 2004-05-03 09:00:50 adam Exp $
+ * $Id: tcpip.c,v 1.12 2004-11-18 15:18:14 heikki Exp $
+ */
+/**
+ * \file tcpip.c
+ * \brief Implements TCP/IP + SSL COMSTACK.
*/
#include <stdio.h>
*/
#include <stdio.h>
@@
-24,7
+28,6
@@
#include <yaz/comstack.h>
#include <yaz/tcpip.h>
#include <yaz/comstack.h>
#include <yaz/tcpip.h>
-#include <yaz/log.h>
#include <yaz/nmem.h>
#ifdef WIN32
#include <yaz/nmem.h>
#ifdef WIN32
@@
-776,7
+779,7
@@
int tcpip_get(COMSTACK h, char **buf, int *bufsize)
#endif
}
else if (!res)
#endif
}
else if (!res)
- return 0;
+ return hasread;
hasread += res;
}
TRC (fprintf (stderr, " Out of read loop with hasread=%d, berlen=%d\n",
hasread += res;
}
TRC (fprintf (stderr, " Out of read loop with hasread=%d, berlen=%d\n",
@@
-1131,7
+1134,7
@@
void *cs_get_ssl(COMSTACK cs)
return sp->ssl;
}
return sp->ssl;
}
-int cs_set_ssl_certf(COMSTACK cs, const char *fname)
+int cs_set_ssl_certificate_file(COMSTACK cs, const char *fname)
{
struct tcpip_state *sp;
if (!cs || cs->type != ssl_type)
{
struct tcpip_state *sp;
if (!cs || cs->type != ssl_type)
@@
-1179,7
+1182,7
@@
int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len)
return 0;
}
return 0;
}
-int cs_set_ssl_certf(COMSTACK cs, const char *fname)
+int cs_set_ssl_certificate_file(COMSTACK cs, const char *fname)
{
return 0;
}
{
return 0;
}