/* 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",
const char *cs_errmsg(int n)
{
- static char buf[250];
-
- if (n < CSNONE || n > CSLASTERROR) {
- sprintf(buf, "unknown comstack error %d", n);
- return buf;
- }
- if (n == CSYSERR) {
- sprintf(buf, "%s: %s", cs_errlist[n], strerror(errno));
- return buf;
- }
+ if (n < CSNONE || n > CSLASTERROR)
+ n = CSNONE;
return cs_errlist[n];
}
void cs_get_host_args(const char *type_and_host, const char **args)
{
-
*args = "";
if (!strncmp(type_and_host, "unix:", 5))
{
const char *cp = strchr(type_and_host + 5, ':');
- if (cp)
- type_and_host = cp + 1;
- else
- type_and_host += strlen(type_and_host); /* empty string */
+ if (!cp)
+ return;
+ type_and_host = cp + 1;
+ if (!strchr(type_and_host, ':'))
+ {
+ *args = type_and_host; /* unix:path:args */
+ return;
+ }
}
if (*type_and_host)
{
- const char *cp;
- cp = strstr(type_and_host, "://");
+ const char *cp = strchr(type_and_host, '/');
if (cp)
- cp = cp+3;
- else
- cp = type_and_host;
- cp = strchr(cp, '/');
+ {
+ if (cp > type_and_host && !memcmp(cp - 1, "://", 3))
+ cp = strchr(cp + 2, '/');
+ }
if (cp)
- *args = cp+1;
+ *args = cp + 1;
}
}
}
else if (strncmp (uri, "ssl:", 4) == 0)
{
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
*t = ssl_type;
*host = uri + 4;
*proto = PROTO_Z3950;
}
else if (strncmp(uri, "https:", 6) == 0)
{
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
*t = ssl_type;
*host = uri + 6;
while (**host == '/')
COMSTACK cs_create_host_proxy(const char *vhost, int blocking, void **vp,
const char *proxy_host)
{
+ int proxy_mode;
+ return cs_create_host2(vhost, blocking, vp, proxy_host, &proxy_mode);
+}
+
+COMSTACK cs_create_host2(const char *vhost, int blocking, void **vp,
+ const char *proxy_host, int *proxy_mode)
+{
enum oid_proto proto = PROTO_Z3950;
const char *host = 0;
COMSTACK cs;
CS_TYPE t;
char *connect_host = 0;
+ const char *bind_host = strchr(vhost, ' ');
+ if (bind_host && bind_host[1])
+ bind_host++;
+ else
+ bind_host = 0;
+
+ *proxy_mode = 0;
if (!cs_parse_host(vhost, &host, &t, &proto, &connect_host))
return 0;
- if (proxy_host)
+ /* vhost proxy proxy method proxy-flag */
+ /* TCP+Z3950 TCP+Z3950 TCP+Z3950 1 */
+ /* TCP+Z3950 TCP+HTTP CONNECT 0 */
+ /* TCP+HTTP TCP+Z3950 TCP+HTTP 1 */
+ /* TCP+HTTP TCP+HTTP TCP+HTTP 1 */
+ /* SSL+* TCP+* CONNECT 0 */
+ /* ? SSL error */
+
+ if (proxy_host && !connect_host)
{
enum oid_proto proto1;
+ CS_TYPE t1;
+ const char *host1 = 0;
- xfree(connect_host);
- if (!cs_parse_host(proxy_host, &host, &t, &proto1, &connect_host))
+ if (!cs_parse_host(proxy_host, &host1, &t1, &proto1, &connect_host))
+ return 0;
+ if (connect_host)
+ {
+ xfree(connect_host);
return 0;
+ }
+ if (t1 != tcpip_type)
+ return 0;
+
+ if (t == ssl_type || (proto == PROTO_Z3950 && proto1 == PROTO_HTTP))
+ connect_host = xstrdup(host1);
+ else
+ {
+ *proxy_mode = 1;
+ host = host1;
+ }
}
if (t == tcpip_type)
{
- cs = yaz_tcpip_create(-1, blocking, proto, connect_host ? host : 0);
+ cs = yaz_tcpip_create3(-1, blocking, proto, connect_host ? host : 0,
+ 0 /* user:pass */, bind_host);
+ }
+ else if (t == ssl_type)
+ {
+ cs = yaz_ssl_create(-1, blocking, proto, connect_host ? host : 0,
+ 0 /* user:pass */, bind_host);
}
else
{