X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fcomstack.c;h=c943c46aee9a9c3762d5de6fcd2570d85a7c6e5a;hp=4d842f7ae29373519dacbdcc78b7f4d536fba8c4;hb=5c3d2d2ab097e4bb59ba5718a396b020a2d302c0;hpb=c6e47cbbff56f39f6d81b079ebaeac41d793d4d9 diff --git a/src/comstack.c b/src/comstack.c index 4d842f7..c943c46 100644 --- a/src/comstack.c +++ b/src/comstack.c @@ -1,18 +1,28 @@ /* - * Copyright (c) 1995-2003, Index Data + * Copyright (c) 1995-2004, Index Data * See the file LICENSE for details. * - * $Id: comstack.c,v 1.1 2003-10-27 12:21:30 adam Exp $ + * $Id: comstack.c,v 1.13 2004-10-15 00:19:00 adam Exp $ + */ + +/** + * \file comstack.c + * \brief Implements Generic COMSTACK functions */ #include #include +#include #include #include #include #include +#ifdef WIN32 +#define strncasecmp _strnicmp +#endif + static const char *cs_errlist[] = { "No error or unspecified error", @@ -26,8 +36,16 @@ static const char *cs_errlist[] = const char *cs_errmsg(int n) { - if (n < 0 || n > 6) - n = 0; + static char buf[250]; + + if (n < CSNONE || n > CSLASTERROR) { + sprintf(buf, "unknown comstack error %d", n); + return buf; + } + if (n == CSYSERR) { + sprintf(buf, "%s: %s", cs_errlist[n], strerror(errno)); + return buf; + } return cs_errlist[n]; } @@ -88,8 +106,8 @@ COMSTACK cs_create_host(const char *type_and_host, int blocking, void **vp) { t = tcpip_type; host = type_and_host + 5; - if (host[0] == '/' && host[1] == '/') - host = host + 2; + while (host[0] == '/') + host++; proto = PROTO_HTTP; } else if (strncmp(type_and_host, "https:", 6) == 0) @@ -97,8 +115,8 @@ COMSTACK cs_create_host(const char *type_and_host, int blocking, void **vp) #if HAVE_OPENSSL_SSL_H t = ssl_type; host = type_and_host + 6; - if (host[0] == '/' && host[1] == '/') - host = host + 2; + while (host[0] == '/') + host++; proto = PROTO_HTTP; #else return 0; @@ -108,7 +126,6 @@ COMSTACK cs_create_host(const char *type_and_host, int blocking, void **vp) { t = tcpip_type; host = type_and_host; - } cs = cs_create (t, blocking, proto); if (!cs) @@ -127,6 +144,7 @@ int cs_look (COMSTACK cs) return cs->event; } +#define CHUNK_DEBUG 0 int cs_complete_auto(const unsigned char *buf, int len) { if (len > 5 && buf[0] >= 0x20 && buf[0] < 0x7f @@ -135,11 +153,18 @@ int cs_complete_auto(const unsigned char *buf, int len) { /* 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)) + content_len = -1; while (i <= len-4) { if (i > 8192) + { return i; /* do not allow more than 8K HTTP header */ + } if (buf[i] == '\r' && buf[i+1] == '\n') { i += 2; @@ -147,23 +172,26 @@ int cs_complete_auto(const unsigned char *buf, int len) { if (chunked) { + /* inside chunked body .. */ while(1) { - int chunk_len = 0; + int j, chunk_len = 0; i += 2; -#if 0 +#if CHUNK_DEBUG /* debugging */ if (i >>"); + printf ("\n<<<"); + int j; for (j = i; j <= i+4; j++) printf ("%c", buf[j]); - printf ("<<<\n"); + printf (">>>\n"); } #endif + /* read chunk length */ while (1) if (i >= len-2) { -#if 0 +#if CHUNK_DEBUG /* debugging */ printf ("XXXXXXXX not there yet 1\n"); printf ("i=%d len=%d\n", i, len); @@ -180,54 +208,70 @@ int cs_complete_auto(const unsigned char *buf, int len) (buf[i++] - ('a'-10)); else break; - if (buf[i] != '\r' || buf[i+1] != '\n' || - chunk_len < 0) - return i+2; /* bad. stop now */ + /* move forward until CRLF - skip chunk ext */ + j = 0; + while (buf[i] != '\r' && buf[i+1] != '\n') + { + if (i >= len-2) + return 0; /* need more buffer .. */ + if (++j > 1000) + return i; /* enough.. stop */ + i++; + } + /* got CRLF */ +#if CHUNK_DEBUG + printf ("XXXXXX chunk_len=%d\n", chunk_len); +#endif + if (chunk_len < 0) + return i+2; /* bad chunk_len */ if (chunk_len == 0) - { - /* consider trailing headers .. */ - while(i <= len-4) - { - if (buf[i] == '\r' && buf[i+1] == '\n' && - buf[i+2] == '\r' && buf[i+3] == '\n') - if (len >= i+4) - return i+4; - i++; - } -#if 0 -/* debugging */ - printf ("XXXXXXXXX not there yet 2\n"); - printf ("i=%d len=%d\n", i, len); -#endif - return 0; - } + break; i += chunk_len+2; } + /* consider trailing headers .. */ + while(i <= len-4) + { + if (buf[i] == '\r' && buf[i+1] == '\n' && + buf[i+2] == '\r' && buf[i+3] == '\n') + if (len >= i+4) + return i+4; + i++; + } +#if CHUNK_DEBUG +/* debugging */ + printf ("XXXXXXXXX not there yet 2\n"); + printf ("i=%d len=%d\n", i, len); +#endif + return 0; } else { /* not chunked ; inside body */ /* i += 2 seems not to work with GCC -O2 .. so i+2 is used instead .. */ - if (len >= (i+2)+ content_len) + if (content_len == -1) + return 0; /* no content length */ + else if (len >= (i+2)+ content_len) + { return (i+2)+ content_len; + } } break; } - else if (i < len - 21 && - !memcmp(buf+i, "Transfer-Encoding: ", 18)) + else if (i < len - 20 && + !strncasecmp((const char *) buf+i, "Transfer-Encoding:", 18)) { i+=18; - if (buf[i] == ' ') + while (buf[i] == ' ') i++; if (i < len - 8) - if (!memcmp(buf+i, "chunked", 7)) + if (!strncasecmp((const char *) buf+i, "chunked", 7)) chunked = 1; } - else if (i < len - 18 && - !memcmp(buf+i, "Content-Length: ", 15)) + else if (i < len - 17 && + !strncasecmp((const char *)buf+i, "Content-Length:", 15)) { i+= 15; - if (buf[i] == ' ') + while (buf[i] == ' ') i++; content_len = 0; while (i <= len-4 && isdigit(buf[i]))