Deprecated log.h and created a new ylog.h

[yaz-moved-to-github.git] / src / tcpip.c

diff --git a/src/tcpip.c b/src/tcpip.c
index 54d8dba..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.
  *
- * $Id: tcpip.c,v 1.6 2004-04-30 19:10:35 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>
@@ -24,7 +28,6 @@
 
 #include <yaz/comstack.h>
 #include <yaz/tcpip.h>
-#include <yaz/log.h>
 #include <yaz/nmem.h>
 
 #ifdef WIN32
@@ -207,7 +210,7 @@ COMSTACK ssl_type(int s, int blocking, int protocol, void *vp)
     p->type = ssl_type;
     sp = (tcpip_state *) p->cprivate;
 
-    sp->ctx = vp;  /* may be NULL */
+    sp->ctx = (SSL_CTX *) vp;  /* may be NULL */
 
     /* note: we don't handle already opened socket in SSL mode - yet */
     return p;
@@ -776,7 +779,7 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize)
 #endif
        }
        else if (!res)
-           return 0;
+           return hasread;
         hasread += res;
     }
     TRC (fprintf (stderr, "  Out of read loop with hasread=%d, berlen=%d\n",
@@ -1118,7 +1121,7 @@ int cs_set_ssl_ctx(COMSTACK cs, void *ctx)
     sp = (struct tcpip_state *) cs->cprivate;
     if (sp->ctx_alloc)
        return 0;
-    sp->ctx = ctx;
+    sp->ctx = (SSL_CTX *) ctx;
     return 1;
 }
 
@@ -1131,7 +1134,7 @@ void *cs_get_ssl(COMSTACK cs)
     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)
@@ -1144,7 +1147,7 @@ int cs_set_ssl_certf(COMSTACK cs, const char *fname)
 
 int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len)
 {
-    SSL *ssl = cs_get_ssl(cs);
+    SSL *ssl = (SSL *) cs_get_ssl(cs);
     if (ssl)
     {
        X509 *server_cert = SSL_get_peer_certificate (ssl);
@@ -1155,7 +1158,7 @@ int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len)
            /* get PEM buffer in memory */
            PEM_write_bio_X509(bio, server_cert);
            *len = BIO_get_mem_data(bio, &pem_buf);
-           *buf = xmalloc(*len);
+           *buf = (char *) xmalloc(*len);
            memcpy(*buf, pem_buf, *len);
            BIO_free(bio);
            return 1;
@@ -1179,7 +1182,7 @@ int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len)
     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;
 }