X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fcomstack.c;h=1d0ee940950bc0458428e2a86789997f77246178;hp=17c6a416b68eba7d7435627808ce141021667d41;hb=b822082114c8d580461eb58ff90de9a92e397b90;hpb=77c5a4fca8b516fd39b8ba213daed17a465a6b2a diff --git a/src/comstack.c b/src/comstack.c index 17c6a41..1d0ee94 100644 --- a/src/comstack.c +++ b/src/comstack.c @@ -1,8 +1,8 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2012 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ -/** +/** * \file comstack.c * \brief Implements Generic COMSTACK functions */ @@ -19,18 +19,7 @@ #include #include #include - -#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 static const char *cs_errlist[] = { @@ -66,9 +55,17 @@ const char *cs_strerror(COMSTACK h) void cs_get_host_args(const char *type_and_host, const char **args) { - + *args = ""; - if (*type_and_host && strncmp(type_and_host, "unix:", 5)) + 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 (*type_and_host) { const char *cp; cp = strstr(type_and_host, "://"); @@ -82,53 +79,70 @@ 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; + + *t = tcpip_type; 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); + size_t len; + + uri += 8; + len = cp - uri; + *connect_host = (char *) xmalloc(len + 1); + memcpy(*connect_host, uri, len); + (*connect_host)[len] = '\0'; + uri = cp + 1; + } + } + else if (strncmp(uri, "unix:", 5) == 0) + { + const char *cp; + + uri += 5; + cp = strchr(uri, ':'); + if (cp) + { + size_t len = cp - uri; + *connect_host = (char *) xmalloc(len + 1); + memcpy(*connect_host, uri, len); (*connect_host)[len] = '\0'; - uri = cp+1; + uri = cp + 1; } +#ifdef WIN32 + xfree(*connect_host); + *connect_host = 0; + return 0; +#else + *t = unix_type; +#endif } if (strncmp (uri, "tcp:", 4) == 0) { - *t = tcpip_type; *host = uri + 4; *proto = PROTO_Z3950; } else if (strncmp (uri, "ssl:", 4) == 0) { -#if ENABLE_SSL +#if HAVE_GNUTLS_H *t = ssl_type; *host = uri + 4; *proto = PROTO_Z3950; #else - return 0; -#endif - } - else if (strncmp (uri, "unix:", 5) == 0) - { -#ifndef WIN32 - *t = unix_type; - *host = uri + 5; - *proto = PROTO_Z3950; -#else + xfree(*connect_host); + *connect_host = 0; return 0; #endif } else if (strncmp(uri, "http:", 5) == 0) { - *t = tcpip_type; *host = uri + 5; while (**host == '/') (*host)++; @@ -136,21 +150,22 @@ static int cs_parse_host(const char *uri, const char **host, } 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 } else { - *proto = PROTO_Z3950; - *t = tcpip_type; *host = uri; + *proto = PROTO_Z3950; } return 1; } @@ -172,9 +187,24 @@ COMSTACK cs_create_host_proxy(const char *vhost, int blocking, void **vp, if (!cs_parse_host(vhost, &host, &t, &proto, &connect_host)) return 0; + if (proxy_host) + { + enum oid_proto proto1; + + xfree(connect_host); + if (!cs_parse_host(proxy_host, &host, &t, &proto1, &connect_host)) + return 0; + } + if (t == tcpip_type) { - cs = yaz_tcpip_create(-1, blocking, proto, connect_host ? host : 0); + const char *bind_host = strchr(vhost, ' '); + if (bind_host && bind_host[1]) + bind_host++; + else + bind_host = 0; + cs = yaz_tcpip_create2(-1, blocking, proto, connect_host ? host : 0, + bind_host); } else { @@ -182,13 +212,11 @@ COMSTACK cs_create_host_proxy(const char *vhost, int blocking, void **vp, } if (cs) { - if (proxy_host) - host = proxy_host; if (!(*vp = cs_straddr(cs, connect_host ? connect_host : host))) { cs_close (cs); cs = 0; - } + } } xfree(connect_host); return cs; @@ -228,8 +256,8 @@ static int cs_read_chunk(const char *buf, int i, int len) #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"); @@ -244,13 +272,13 @@ static int cs_read_chunk(const char *buf, int i, int len) #endif return 0; } else if (yaz_isdigit(buf[i])) - chunk_len = chunk_len * 16 + + chunk_len = chunk_len * 16 + (buf[i++] - '0'); else if (yaz_isupper(buf[i])) - chunk_len = chunk_len * 16 + + chunk_len = chunk_len * 16 + (buf[i++] - ('A'-10)); else if (yaz_islower(buf[i])) - chunk_len = chunk_len * 16 + + chunk_len = chunk_len * 16 + (buf[i++] - ('a'-10)); else break; @@ -258,7 +286,7 @@ static int cs_read_chunk(const char *buf, int i, int len) break; if (chunk_len < 0) return i; - + while (1) { if (i >= len -1) @@ -270,7 +298,7 @@ static int cs_read_chunk(const char *buf, int i, int len) /* got CRLF */ #if CHUNK_DEBUG printf ("chunk_len=%d\n", chunk_len); -#endif +#endif i += chunk_len; if (i >= len-2) return 0; @@ -298,22 +326,40 @@ static int cs_read_chunk(const char *buf, int i, int len) 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) { @@ -337,18 +383,20 @@ static int cs_complete_http(const char *buf, int len, int head_only) } break; } - else if (i < len - 20 && - !strncasecmp((const char *) buf+i, "Transfer-Encoding:", 18)) + else if (i < len - 20 && + !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] == ' ') @@ -377,7 +425,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; } - return completeBER((const unsigned char *) buf, len); + return completeBER(buf, len); }