X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fcomstack.c;h=74faf5ca3c728307909e18bfc00be0f2b47ec6fe;hb=8fba4cf2cac1cc543aa4c1063c78b449ebac44a7;hp=896127b1c6e58abc4168c54744447c8d1fcd2709;hpb=377e50914cd78d52e77032a3eaf8972f23b4e7b9;p=yaz-moved-to-github.git diff --git a/src/comstack.c b/src/comstack.c index 896127b..74faf5c 100644 --- a/src/comstack.c +++ b/src/comstack.c @@ -1,19 +1,19 @@ -/* - * Copyright (C) 1995-2007, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2011 Index Data * See the file LICENSE for details. - * - * $Id: comstack.c,v 1.21 2007-10-09 06:00:56 adam Exp $ */ - /** * \file comstack.c * \brief Implements Generic COMSTACK functions */ +#if HAVE_CONFIG_H +#include +#endif #include -#include #include +#include #include #include #include @@ -24,6 +24,14 @@ #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", @@ -85,7 +93,7 @@ static int cs_parse_host(const char *uri, const char **host, if (cp) { size_t len = cp - (uri + 8); - *connect_host = xmalloc(len+1); + *connect_host = (char *) xmalloc(len+1); memcpy(*connect_host, uri + 8, len); (*connect_host)[len] = '\0'; uri = cp+1; @@ -100,7 +108,7 @@ static int cs_parse_host(const char *uri, const char **host, } else if (strncmp (uri, "ssl:", 4) == 0) { -#if HAVE_OPENSSL_SSL_H +#if ENABLE_SSL *t = ssl_type; *host = uri + 4; *proto = PROTO_Z3950; @@ -128,7 +136,7 @@ static int cs_parse_host(const char *uri, const char **host, } else if (strncmp(uri, "https:", 6) == 0) { -#if HAVE_OPENSSL_SSL_H +#if ENABLE_SSL *t = ssl_type; *host = uri + 6; while (**host == '/') @@ -149,13 +157,20 @@ static int cs_parse_host(const char *uri, const char **host, COMSTACK cs_create_host(const char *vhost, int blocking, void **vp) { + return cs_create_host_proxy(vhost, blocking, vp, 0); +} + +COMSTACK cs_create_host_proxy(const char *vhost, int blocking, void **vp, + const char *proxy_host) +{ 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 (!cs_parse_host(vhost, &host, &t, &proto, &connect_host)) + return 0; if (t == tcpip_type) { @@ -167,6 +182,8 @@ COMSTACK cs_create_host(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); @@ -202,6 +219,82 @@ static int skip_crlf(const char *buf, int len, int *i) #define CHUNK_DEBUG 0 +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 (yaz_isdigit(buf[i])) + chunk_len = chunk_len * 16 + + (buf[i++] - '0'); + else if (yaz_isupper(buf[i])) + chunk_len = chunk_len * 16 + + (buf[i++] - ('A'-10)); + else if (yaz_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 */ @@ -232,80 +325,7 @@ static int cs_complete_http(const char *buf, int len, int head_only) { /* 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) @@ -334,7 +354,7 @@ static int cs_complete_http(const char *buf, int len, int head_only) while (buf[i] == ' ') i++; content_len = 0; - while (i <= len-4 && isdigit(buf[i])) + while (i <= len-4 && yaz_isdigit(buf[i])) content_len = content_len*10 + (buf[i++] - '0'); if (content_len < 0) /* prevent negative offsets */ content_len = 0; @@ -379,6 +399,7 @@ 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