X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftcpip.c;h=603f3315ca3ea1a54819d50888da4585b69833d9;hb=3c287bc1d48ee6a1f300054c2cebd0ba312bd5b9;hp=dc1d127c42825386880a20af66e2cce66cb539a5;hpb=29e4554a9be9e8c25f200c3012e7fa4c2d03aaef;p=yaz-moved-to-github.git

diff --git a/src/tcpip.c b/src/tcpip.c
index dc1d127..603f331 100644
--- a/src/tcpip.c
+++ b/src/tcpip.c
@@ -1,11 +1,14 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) 1995-2011 Index Data
  * See the file LICENSE for details.
  */
 /**
  * \file tcpip.c
  * \brief Implements TCP/IP + SSL COMSTACK.
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <string.h>
@@ -431,7 +434,12 @@ void *tcpip_straddr(COMSTACK h, const char *str)
     const char *port = "210";
     struct addrinfo *ai = 0;
     if (h->protocol == PROTO_HTTP)
-        port = "80";
+    {
+        if (h->type == ssl_type)
+            port = "443";
+        else
+            port = "80";
+    }
     if (!tcpip_init())
         return 0;
 
@@ -463,7 +471,12 @@ void *tcpip_straddr(COMSTACK h, const char *str)
     tcpip_state *sp = (tcpip_state *)h->cprivate;
     int port = 210;
     if (h->protocol == PROTO_HTTP)
-        port = 80;
+    {
+        if (h->type == ssl_type)
+            port = 443;
+        else
+            port = 80;
+    }
 
     if (!tcpip_init())
         return 0;
@@ -1156,7 +1169,12 @@ int ssl_get(COMSTACK h, char **buf, int *bufsize)
 #if HAVE_GNUTLS_H
         res = gnutls_record_recv(sp->session, *buf + hasread,
                                  CS_TCPIP_BUFCHUNK);
-        if (res < 0)
+        if (res == 0)
+        {
+            TRC(fprintf(stderr, "gnutls_record_recv returned 0\n"));
+            return 0;
+        }
+        else if (res < 0)
         {
             if (ssl_check_error(h, sp, res))
                 break;
@@ -1521,47 +1539,44 @@ void cs_print_session_info(COMSTACK cs)
 void *cs_get_ssl(COMSTACK cs)
 {
 #if HAVE_OPENSSL_SSL_H
-    struct tcpip_state *sp;
-    if (!cs || cs->type != ssl_type)
-        return 0;
-    sp = (struct tcpip_state *) cs->cprivate;
-    return sp->ssl;  
-#else
-    return 0;
+    if (cs && cs->type == ssl_type)
+    {
+        struct tcpip_state *sp = (struct tcpip_state *) cs->cprivate;
+        return sp->ssl;  
+    }
 #endif
+    return 0;
 }
 
 int cs_set_ssl_ctx(COMSTACK cs, void *ctx)
 {
 #if ENABLE_SSL
-    struct tcpip_state *sp;
-    if (!cs || cs->type != ssl_type)
-        return 0;
-    sp = (struct tcpip_state *) cs->cprivate;
+    if (cs && cs->type == ssl_type)
+    {
 #if HAVE_OPENSSL_SSL_H
-    if (sp->ctx_alloc)
-        return 0;
-    sp->ctx = (SSL_CTX *) ctx;
+        struct tcpip_state *sp = (struct tcpip_state *) cs->cprivate;
+        if (sp->ctx_alloc)
+            return 0;
+        sp->ctx = (SSL_CTX *) ctx;
 #endif
-    return 1;
-#else
-    return 0;
+        return 1;
+    }
 #endif
+    return 0;
 }
 
 int cs_set_ssl_certificate_file(COMSTACK cs, const char *fname)
 {
 #if ENABLE_SSL
-    struct tcpip_state *sp;
-    if (!cs || cs->type != ssl_type)
-        return 0;
-    sp = (struct tcpip_state *) cs->cprivate;
-    strncpy(sp->cert_fname, fname, sizeof(sp->cert_fname)-1);
-    sp->cert_fname[sizeof(sp->cert_fname)-1] = '\0';
-    return 1;
-#else
-    return 0;
+    if (cs && cs->type == ssl_type)
+    {
+        struct tcpip_state *sp = (struct tcpip_state *) cs->cprivate;
+        strncpy(sp->cert_fname, fname, sizeof(sp->cert_fname)-1);
+        sp->cert_fname[sizeof(sp->cert_fname)-1] = '\0';
+        return 1;
+    }
 #endif
+    return 0;
 }
 
 int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len)