Extended comstack with outgoing IP YAZ-795

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

diff --git a/src/comstack.c b/src/comstack.c
index eac17f7..1d0ee94 100644 (file)
--- a/src/comstack.c
+++ b/src/comstack.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -19,18 +19,7 @@
 #include <yaz/tcpip.h>
 #include <yaz/unix.h>
 #include <yaz/odr.h>
-
-#ifdef WIN32
-#define strncasecmp _strnicmp
-#endif
-
-#if HAVE_GNUTLS_H
-#define ENABLE_SSL 1
-#endif
-
-#if HAVE_OPENSSL_SSL_H
-#define ENABLE_SSL 1
-#endif
+#include <yaz/matchstr.h>
 
 static const char *cs_errlist[] =
 {
@@ -90,9 +79,9 @@ void cs_get_host_args(const char *type_and_host, const char **args)
     }
 }
 
-static int cs_parse_host(const char *uri, const char **host,
-                         CS_TYPE *t, enum oid_proto *proto,
-                         char **connect_host)
+int cs_parse_host(const char *uri, const char **host,
+                  CS_TYPE *t, enum oid_proto *proto,
+                  char **connect_host)
 {
     *connect_host = 0;
 
@@ -127,6 +116,8 @@ static int cs_parse_host(const char *uri, const char **host,
             uri = cp + 1;
         }
 #ifdef WIN32
+        xfree(*connect_host);
+        *connect_host = 0;
         return 0;
 #else
         *t = unix_type;
@@ -140,11 +131,13 @@ static int cs_parse_host(const char *uri, const char **host,
     }
     else if (strncmp (uri, "ssl:", 4) == 0)
     {
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
         *t = ssl_type;
         *host = uri + 4;
         *proto = PROTO_Z3950;
 #else
+        xfree(*connect_host);
+        *connect_host = 0;
         return 0;
 #endif
     }
@@ -157,13 +150,15 @@ static int cs_parse_host(const char *uri, const char **host,
     }
     else if (strncmp(uri, "https:", 6) == 0)
     {
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
         *t = ssl_type;
         *host = uri + 6;
         while (**host == '/')
             (*host)++;
         *proto = PROTO_HTTP;
 #else
+        xfree(*connect_host);
+        *connect_host = 0;
         return 0;
 #endif
     }
@@ -190,10 +185,7 @@ COMSTACK cs_create_host_proxy(const char *vhost, int blocking, void **vp,
     char *connect_host = 0;
 
     if (!cs_parse_host(vhost, &host, &t, &proto, &connect_host))
-    {
-        xfree(connect_host);
         return 0;
-    }
 
     if (proxy_host)
     {
@@ -201,15 +193,18 @@ COMSTACK cs_create_host_proxy(const char *vhost, int blocking, void **vp,
 
         xfree(connect_host);
         if (!cs_parse_host(proxy_host, &host, &t, &proto1, &connect_host))
-        {
-            xfree(connect_host);
             return 0;
-        }
     }
 
     if (t == tcpip_type)
     {
-        cs = yaz_tcpip_create(-1, blocking, proto, connect_host ? host : 0);
+        const char *bind_host = strchr(vhost, ' ');
+        if (bind_host && bind_host[1])
+            bind_host++;
+        else
+            bind_host = 0;
+        cs = yaz_tcpip_create2(-1, blocking, proto, connect_host ? host : 0,
+                               bind_host);
     }
     else
     {
@@ -389,17 +384,19 @@ static int cs_complete_http(const char *buf, int len, int head_only)
                 break;
             }
             else if (i < len - 20 &&
-                     !strncasecmp((const char *) buf+i, "Transfer-Encoding:", 18))
+                     !yaz_strncasecmp((const char *) buf+i,
+                                      "Transfer-Encoding:", 18))
             {
                 i+=18;
                 while (buf[i] == ' ')
                     i++;
                 if (i < len - 8)
-                    if (!strncasecmp((const char *) buf+i, "chunked", 7))
+                    if (!yaz_strncasecmp((const char *) buf+i, "chunked", 7))
                         chunked = 1;
             }
             else if (i < len - 17 &&
-                     !strncasecmp((const char *)buf+i, "Content-Length:", 15))
+                     !yaz_strncasecmp((const char *)buf+i,
+                                      "Content-Length:", 15))
             {
                 i+= 15;
                 while (buf[i] == ' ')
@@ -428,7 +425,7 @@ static int cs_complete_auto_x(const char *buf, int len, int head_only)
         int r = cs_complete_http(buf, len, head_only);
         return r;
     }
-    return completeBER((const unsigned char *) buf, len);
+    return completeBER(buf, len);
 }