Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz

[yaz-moved-to-github.git] / src / comstack.c

diff --git a/src/comstack.c b/src/comstack.c
index 62978da..0df8678 100644 (file)
--- a/src/comstack.c
+++ b/src/comstack.c
@@ -1,8 +1,6 @@
-/*
- * 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.20 2007-10-07 08:53:26 adam Exp $
  */
 
 /** 
@@ -24,6 +22,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 +91,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 +106,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 +134,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 == '/')
@@ -202,6 +208,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 (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 */
@@ -232,80 +314,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)
@@ -348,25 +357,25 @@ static int cs_complete_http(const char *buf, int len, int head_only)
     return 0;
 }
 
-static int cs_complete_auto_x(const unsigned char *buf, int len, int head_only)
+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, head_only);
+        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 unsigned char *buf, int len)
+int cs_complete_auto(const char *buf, int len)
 {
     return cs_complete_auto_x(buf, len, 0);
 }
 
-int cs_complete_auto_head(const unsigned char *buf, int len)
+int cs_complete_auto_head(const char *buf, int len)
 {
     return cs_complete_auto_x(buf, len, 1);
 }
@@ -379,6 +388,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