-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
* See the file LICENSE for details.
- *
- * $Id: comstack.c,v 1.18 2007-01-11 10:30:41 adam Exp $
*/
/**
#define strncasecmp _strnicmp
#endif
+#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",
}
}
-COMSTACK cs_create_host(const char *type_and_host, int blocking, void **vp)
+static int cs_parse_host(const char *uri, const char **host,
+ CS_TYPE *t, enum oid_proto *proto,
+ char **connect_host)
{
- enum oid_proto proto = PROTO_Z3950;
- const char *host = 0;
- COMSTACK cs;
- CS_TYPE t;
+ *connect_host = 0;
+ if (strncmp(uri, "connect:", 8) == 0)
+ {
+ const char *cp = strchr(uri, ',');
+ if (cp)
+ {
+ size_t len = cp - (uri + 8);
+ *connect_host = (char *) xmalloc(len+1);
+ memcpy(*connect_host, uri + 8, len);
+ (*connect_host)[len] = '\0';
+ uri = cp+1;
+ }
+ }
- if (strncmp (type_and_host, "tcp:", 4) == 0)
+ if (strncmp (uri, "tcp:", 4) == 0)
{
- t = tcpip_type;
- host = type_and_host + 4;
+ *t = tcpip_type;
+ *host = uri + 4;
+ *proto = PROTO_Z3950;
}
- else if (strncmp (type_and_host, "ssl:", 4) == 0)
+ else if (strncmp (uri, "ssl:", 4) == 0)
{
-#if HAVE_OPENSSL_SSL_H
- t = ssl_type;
- host = type_and_host + 4;
+#if ENABLE_SSL
+ *t = ssl_type;
+ *host = uri + 4;
+ *proto = PROTO_Z3950;
#else
return 0;
#endif
}
- else if (strncmp (type_and_host, "unix:", 5) == 0)
+ else if (strncmp (uri, "unix:", 5) == 0)
{
#ifndef WIN32
- t = unix_type;
- host = type_and_host + 5;
+ *t = unix_type;
+ *host = uri + 5;
+ *proto = PROTO_Z3950;
#else
return 0;
#endif
}
- else if (strncmp(type_and_host, "http:", 5) == 0)
+ else if (strncmp(uri, "http:", 5) == 0)
{
- t = tcpip_type;
- host = type_and_host + 5;
- while (host[0] == '/')
- host++;
- proto = PROTO_HTTP;
+ *t = tcpip_type;
+ *host = uri + 5;
+ while (**host == '/')
+ (*host)++;
+ *proto = PROTO_HTTP;
}
- else if (strncmp(type_and_host, "https:", 6) == 0)
+ else if (strncmp(uri, "https:", 6) == 0)
{
-#if HAVE_OPENSSL_SSL_H
- t = ssl_type;
- host = type_and_host + 6;
- while (host[0] == '/')
- host++;
- proto = PROTO_HTTP;
+#if ENABLE_SSL
+ *t = ssl_type;
+ *host = uri + 6;
+ while (**host == '/')
+ (*host)++;
+ *proto = PROTO_HTTP;
#else
return 0;
#endif
}
else
{
- t = tcpip_type;
- host = type_and_host;
+ *proto = PROTO_Z3950;
+ *t = tcpip_type;
+ *host = uri;
}
- cs = cs_create (t, blocking, proto);
- if (!cs)
- return 0;
+ return 1;
+}
- if (!(*vp = cs_straddr(cs, host)))
+COMSTACK cs_create_host(const char *vhost, int blocking, void **vp)
+{
+ enum oid_proto proto = PROTO_Z3950;
+ const char *host = 0;
+ COMSTACK cs;
+ CS_TYPE t;
+ char *connect_host = 0;
+
+ cs_parse_host(vhost, &host, &t, &proto, &connect_host);
+
+ if (t == tcpip_type)
{
- cs_close (cs);
- return 0;
- }
+ cs = yaz_tcpip_create(-1, blocking, proto, connect_host ? host : 0);
+ }
+ else
+ {
+ cs = cs_create(t, blocking, proto);
+ }
+ if (cs)
+ {
+ if (!(*vp = cs_straddr(cs, connect_host ? connect_host : host)))
+ {
+ cs_close (cs);
+ cs = 0;
+ }
+ }
+ xfree(connect_host);
return cs;
}
#define CHUNK_DEBUG 0
-int cs_complete_http(const char *buf, int len)
+static int cs_read_chunk(const char *buf, int i, int len)
+{
+ /* inside chunked body .. */
+ while (1)
+ {
+ int chunk_len = 0;
+#if CHUNK_DEBUG
+ if (i < len-2)
+ {
+ printf ("\n<<<");
+ int j;
+ for (j = i; j <= i+3; j++)
+ printf ("%c", buf[j]);
+ printf (">>>\n");
+ }
+#endif
+ /* read chunk length */
+ while (1)
+ if (i >= len-2) {
+#if CHUNK_DEBUG
+ printf ("returning incomplete read at 1\n");
+ printf ("i=%d len=%d\n", i, len);
+#endif
+ return 0;
+ } else if (isdigit(buf[i]))
+ chunk_len = chunk_len * 16 +
+ (buf[i++] - '0');
+ else if (isupper(buf[i]))
+ chunk_len = chunk_len * 16 +
+ (buf[i++] - ('A'-10));
+ else if (islower(buf[i]))
+ chunk_len = chunk_len * 16 +
+ (buf[i++] - ('a'-10));
+ else
+ break;
+ if (chunk_len == 0)
+ break;
+ if (chunk_len < 0)
+ return i;
+
+ while (1)
+ {
+ if (i >= len -1)
+ return 0;
+ if (skip_crlf(buf, len, &i))
+ break;
+ i++;
+ }
+ /* got CRLF */
+#if CHUNK_DEBUG
+ printf ("chunk_len=%d\n", chunk_len);
+#endif
+ i += chunk_len;
+ if (i >= len-2)
+ return 0;
+ if (!skip_crlf(buf, len, &i))
+ return 0;
+ }
+ /* consider trailing headers .. */
+ while (i < len)
+ {
+ if (skip_crlf(buf, len, &i))
+ {
+ if (skip_crlf(buf, len, &i))
+ return i;
+ }
+ else
+ i++;
+ }
+#if CHUNK_DEBUG
+ printf ("returning incomplete read at 2\n");
+ printf ("i=%d len=%d\n", i, len);
+#endif
+ return 0;
+}
+
+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;
/* if dealing with HTTP responses - then default
content length is unlimited (socket close) */
- if (!memcmp(buf, "HTTP/", 5))
+ if (!head_only && !memcmp(buf, "HTTP/", 5))
content_len = -1;
#if 0
{
/* inside content */
if (chunked)
- {
- /* inside chunked body .. */
- while(1)
- {
- int chunk_len = 0;
-#if CHUNK_DEBUG
- if (i < len-2)
- {
- printf ("\n<<<");
- int j;
- for (j = i; j <= i+3; j++)
- printf ("%c", buf[j]);
- printf (">>>\n");
- }
-#endif
- /* read chunk length */
- while (1)
- if (i >= len-2) {
-#if CHUNK_DEBUG
- printf ("returning incomplete read at 1\n");
- printf ("i=%d len=%d\n", i, len);
-#endif
- return 0;
- } else if (isdigit(buf[i]))
- chunk_len = chunk_len * 16 +
- (buf[i++] - '0');
- else if (isupper(buf[i]))
- chunk_len = chunk_len * 16 +
- (buf[i++] - ('A'-10));
- else if (islower(buf[i]))
- chunk_len = chunk_len * 16 +
- (buf[i++] - ('a'-10));
- else
- break;
- if (chunk_len == 0)
- break;
- if (chunk_len < 0)
- return i;
-
- while (1)
- {
- if (i >= len -1)
- return 0;
- if (skip_crlf(buf, len, &i))
- break;
- i++;
- }
- /* got CRLF */
-#if CHUNK_DEBUG
- printf ("chunk_len=%d\n", chunk_len);
-#endif
- i += chunk_len;
- if (i >= len-2)
- return 0;
- if (!skip_crlf(buf, len, &i))
- return 0;
- }
- /* consider trailing headers .. */
- while (i < len)
- {
- if (skip_crlf(buf, len, &i))
- {
- if (skip_crlf(buf, len, &i))
- return i;
- }
- else
- i++;
- }
-#if CHUNK_DEBUG
- printf ("returning incomplete read at 2\n");
- printf ("i=%d len=%d\n", i, len);
-#endif
- return 0;
- }
+ return cs_read_chunk(buf, i, len);
else
{ /* not chunked ; inside body */
if (content_len == -1)
return 0;
}
-int cs_complete_auto(const unsigned char *buf, int len)
+static int cs_complete_auto_x(const char *buf, int len, int head_only)
{
if (len > 5 && buf[0] >= 0x20 && buf[0] < 0x7f
&& buf[1] >= 0x20 && buf[1] < 0x7f
&& buf[2] >= 0x20 && buf[2] < 0x7f)
{
- int r = cs_complete_http((const char *) buf, len);
+ int r = cs_complete_http(buf, len, head_only);
return r;
}
- return completeBER(buf, len);
+ return completeBER((const unsigned char *) buf, len);
+}
+
+
+int cs_complete_auto(const char *buf, int len)
+{
+ return cs_complete_auto_x(buf, len, 0);
+}
+
+int cs_complete_auto_head(const char *buf, int len)
+{
+ return cs_complete_auto_x(buf, len, 1);
}
void cs_set_max_recv_bytes(COMSTACK cs, int max_recv_bytes)
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
projects / yaz-moved-to-github.git / blobdiff