Extended comstack with outgoing IP YAZ-795

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

diff --git a/src/comstack.c b/src/comstack.c
index cec2fd3..1d0ee94 100644 (file)
--- a/src/comstack.c
+++ b/src/comstack.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2012 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -19,18 +19,7 @@
 #include <yaz/tcpip.h>
 #include <yaz/unix.h>
 #include <yaz/odr.h>
-
-#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 <yaz/matchstr.h>
 
 static const char *cs_errlist[] =
 {
@@ -90,9 +79,9 @@ 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;
 
@@ -126,12 +115,9 @@ static int cs_parse_host(const char *uri, const char **host,
             (*connect_host)[len] = '\0';
             uri = cp + 1;
         }
-        else
-        {
-            *connect_host = xstrdup(uri);
-            uri += strlen(uri); /* set to "" */
-        }
 #ifdef WIN32
+        xfree(*connect_host);
+        *connect_host = 0;
         return 0;
 #else
         *t = unix_type;
@@ -145,11 +131,13 @@ static int cs_parse_host(const char *uri, const char **host,
     }
     else if (strncmp (uri, "ssl:", 4) == 0)
     {
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
         *t = ssl_type;
         *host = uri + 4;
         *proto = PROTO_Z3950;
 #else
+        xfree(*connect_host);
+        *connect_host = 0;
         return 0;
 #endif
     }
@@ -162,13 +150,15 @@ 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
     }
@@ -197,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
     {
@@ -207,8 +212,6 @@ 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);
@@ -253,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");
@@ -323,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)
         {
@@ -363,17 +384,19 @@ 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))
+                     !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] == ' ')
@@ -402,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);
 }