/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
/**
#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",
}
}
-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;
uri = cp + 1;
}
#ifdef WIN32
+ xfree(*connect_host);
+ *connect_host = 0;
return 0;
#else
*t = unix_type;
}
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
}
}
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
}
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;
char *connect_host = 0;
if (!cs_parse_host(vhost, &host, &t, &proto, &connect_host))
- {
- xfree(connect_host);
return 0;
- }
if (proxy_host)
{
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);
+ cs = yaz_tcpip_create2(-1, blocking, proto, connect_host ? host : 0,
+ bind_host);
}
else
{
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;