projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
zoomsh: only prints ZOOM> lead if a console is use (isatty)
[yaz-moved-to-github.git]
/
src
/
comstack.c
diff --git
a/src/comstack.c
b/src/comstack.c
index
1755fc7
..
d364f05
100644
(file)
--- a/
src/comstack.c
+++ b/
src/comstack.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
/**
* See the file LICENSE for details.
*/
/**
@@
-21,14
+21,6
@@
#include <yaz/odr.h>
#include <yaz/matchstr.h>
#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 const char *cs_errlist[] =
{
"No error or unspecified error",
@@
-87,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;
{
*connect_host = 0;
@@
-124,6
+116,8
@@
static int cs_parse_host(const char *uri, const char **host,
uri = cp + 1;
}
#ifdef WIN32
uri = cp + 1;
}
#ifdef WIN32
+ xfree(*connect_host);
+ *connect_host = 0;
return 0;
#else
*t = unix_type;
return 0;
#else
*t = unix_type;
@@
-137,11
+131,13
@@
static int cs_parse_host(const char *uri, const char **host,
}
else if (strncmp (uri, "ssl:", 4) == 0)
{
}
else if (strncmp (uri, "ssl:", 4) == 0)
{
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
*t = ssl_type;
*host = uri + 4;
*proto = PROTO_Z3950;
#else
*t = ssl_type;
*host = uri + 4;
*proto = PROTO_Z3950;
#else
+ xfree(*connect_host);
+ *connect_host = 0;
return 0;
#endif
}
return 0;
#endif
}
@@
-154,13
+150,15
@@
static int cs_parse_host(const char *uri, const char **host,
}
else if (strncmp(uri, "https:", 6) == 0)
{
}
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
*t = ssl_type;
*host = uri + 6;
while (**host == '/')
(*host)++;
*proto = PROTO_HTTP;
#else
+ xfree(*connect_host);
+ *connect_host = 0;
return 0;
#endif
}
return 0;
#endif
}
@@
-187,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))
char *connect_host = 0;
if (!cs_parse_host(vhost, &host, &t, &proto, &connect_host))
- {
- xfree(connect_host);
return 0;
return 0;
- }
if (proxy_host)
{
if (proxy_host)
{
@@
-198,10
+193,7
@@
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);
if (!cs_parse_host(proxy_host, &host, &t, &proto1, &connect_host))
- {
- xfree(connect_host);
return 0;
return 0;
- }
}
if (t == tcpip_type)
}
if (t == tcpip_type)
@@
-427,7
+419,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;
}
int r = cs_complete_http(buf, len, head_only);
return r;
}
- return completeBER((const unsigned char *) buf, len);
+ return completeBER(buf, len);
}
}