Add cs_create_host_proxy

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

diff --git a/src/comstack.c b/src/comstack.c
index dcce2b0..b81e89c 100644 (file)
--- a/src/comstack.c
+++ b/src/comstack.c
@@ -1,17 +1,19 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2011 Index Data
  * See the file LICENSE for details.
  */
-
 /** 
  * \file comstack.c
  * \brief Implements Generic COMSTACK functions
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <string.h>
-#include <ctype.h>
 #include <errno.h>
 
+#include <yaz/yaz-iconv.h>
 #include <yaz/log.h>
 #include <yaz/comstack.h>
 #include <yaz/tcpip.h>
@@ -155,6 +157,12 @@ 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;
@@ -173,6 +181,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);
@@ -208,6 +218,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 */
@@ -238,80 +324,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)
@@ -340,7 +353,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;