/* 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/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[] =
{
void cs_get_host_args(const char *type_and_host, const char **args)
{
-
*args = "";
if (!strncmp(type_and_host, "unix:", 5))
{
}
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;
}
}
-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)[len] = '\0';
uri = cp + 1;
}
- else
- {
- *connect_host = xstrdup(uri);
- uri += strlen(uri); /* set to "" */
- }
#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
}
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;
+ /* 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;
+
+ 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
{
}
if (cs)
{
- if (proxy_host)
- host = proxy_host;
if (!(*vp = cs_straddr(cs, connect_host ? connect_host : host)))
{
cs_close (cs);
#if CHUNK_DEBUG
if (i < len-2)
{
- printf ("\n<<<");
int j;
+ printf ("\n<<<");
for (j = i; j <= i+3; j++)
printf ("%c", buf[j]);
printf (">>>\n");
static int cs_complete_http(const char *buf, int len, int head_only)
{
/* deal with HTTP request/response */
- int i = 2, content_len = 0, chunked = 0;
+ int i, content_len = 0, chunked = 0;
- if (len < 6)
- return 0;
+ /* need at least one line followed by \n or \r .. */
+ for (i = 0; ; i++)
+ if (i == len)
+ return 0; /* incomplete */
+ else if (buf[i] == '\n' || buf[i] == '\r')
+ break;
- /* if dealing with HTTP responses - then default
- content length is unlimited (socket close) */
+ /* check to see if it's a response with content */
if (!head_only && !memcmp(buf, "HTTP/", 5))
- content_len = -1;
-
+ {
+ int j;
+ for (j = 5; j < i; j++)
+ if (buf[j] == ' ')
+ {
+ ++j;
+ if (buf[j] == '1') /* 1XX */
+ ;
+ else if (!memcmp(buf + j, "204", 3))
+ ;
+ else if (!memcmp(buf + j, "304", 3))
+ ;
+ else
+ content_len = -1;
+ break;
+ }
+ }
#if 0
printf("len = %d\n", len);
fwrite (buf, 1, len, stdout);
printf("----------\n");
#endif
- while (i <= len-2)
+ for (i = 2; i <= len-2; )
{
if (i > 8192)
{
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] == ' ')
int r = cs_complete_http(buf, len, head_only);
return r;
}
- return completeBER((const unsigned char *) buf, len);
+ return completeBER(buf, len);
}
projects / yaz-moved-to-github.git / blobdiff