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 fdcfcdb..ee64fc8 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.
  */
 /**
@@ -21,14 +21,6 @@
 #include <yaz/odr.h>
 #include <yaz/matchstr.h>
 
-#if HAVE_GNUTLS_H
-#define ENABLE_SSL 1
-#endif
-
-#if HAVE_OPENSSL_SSL_H
-#define ENABLE_SSL 1
-#endif
-
 static const char *cs_errlist[] =
 {
     "No error or unspecified error",
@@ -139,7 +131,7 @@ 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;
@@ -158,7 +150,7 @@ 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 == '/')
@@ -183,8 +175,8 @@ COMSTACK cs_create_host(const char *vhost, int blocking, void **vp)
     return cs_create_host_proxy(vhost, blocking, vp, 0);
 }
 
-COMSTACK cs_create_host_proxy(const char *vhost, int blocking, void **vp,
-                              const char *proxy_host)
+COMSTACK cs_create_host2(const char *vhost, int blocking, void **vp,
+                         const char *proxy_host, const char *bind_host)
 {
     enum oid_proto proto = PROTO_Z3950;
     const char *host = 0;
@@ -206,7 +198,8 @@ COMSTACK cs_create_host_proxy(const char *vhost, int blocking, void **vp,
 
     if (t == tcpip_type)
     {
-        cs = yaz_tcpip_create(-1, blocking, proto, connect_host ? host : 0);
+        cs = yaz_tcpip_create2(-1, blocking, proto, connect_host ? host : 0,
+                               bind_host);
     }
     else
     {
@@ -224,6 +217,12 @@ COMSTACK cs_create_host_proxy(const char *vhost, int blocking, void **vp,
     return cs;
 }
 
+COMSTACK cs_create_host_proxy(const char *vhost, int blocking, void **vp,
+                              const char *proxy_host)
+{
+    return cs_create_host2(vhost, blocking, vp, proxy_host, 0);
+}
+
 int cs_look (COMSTACK cs)
 {
     return cs->event;