X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftest_comstack.c;h=381ecb88f79dbbe54e8a9d635046f75997f90e51;hp=df53b2ef885d439eea7fa311e48783169a234482;hb=5921175c5859c16c2ba411999831b8aaf64917b4;hpb=d0e351c12fff564d876958e860338d43716dc269

diff --git a/test/test_comstack.c b/test/test_comstack.c
index df53b2e..381ecb8 100644
--- a/test/test_comstack.c
+++ b/test/test_comstack.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 #if HAVE_CONFIG_H
@@ -18,12 +18,12 @@ static void tst_http_request(void)
 {
     {
         /* no content, no headers */
-        const char *http_buf = 
+        const char *http_buf =
             /*123456789012345678 */
             "GET / HTTP/1.1\r\n"
             "\r\n"
             "GET / HTTP/1.0\r\n";
-        
+
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 1), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 2), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 16), 0);
@@ -33,99 +33,99 @@ static void tst_http_request(void)
     }
     {
         /* one header, no content */
-        const char *http_buf = 
+        const char *http_buf =
             /*123456789012345678 */
             "GET / HTTP/1.1\r\n"
             "Content-Type: x\r\n"
             "\r\n"
             "GET / HTTP/1.0\r\n";
-        
+
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 1), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 2), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 34), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 35), 35);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 36), 35);
-    }        
+    }
     {
         /* one content-length header, length 0 */
-        const char *http_buf = 
+        const char *http_buf =
             /*123456789012345678 */
             "GET / HTTP/1.1\r\n"
             "Content-Length: 0\r\n"
             "\r\n"
             "GET / HTTP/1.0\r\n";
-        
+
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 1), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 2), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 35), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 37), 37);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 38), 37);
-    }        
+    }
     {
         /* one content-length header, length 5 */
-        const char *http_buf = 
+        const char *http_buf =
             /*123456789012345678 */
             "GET / HTTP/1.1\r\n"
             "Content-Length: 5\r\n"
             "\r\n"
             "ABCDE"
             "GET / HTTP/1.0\r\n";
-        
+
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 1), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 2), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 41), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 42), 42);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 43), 42);
-    }        
+    }
     {
         /* LF only in GET, one content-length header, length 5 */
-        const char *http_buf = 
+        const char *http_buf =
             /*123456789012345678 */
             "GET / HTTP/1.1\n"
             "Content-Length: 5\r\n"
             "\r\n"
             "ABCDE"
             "GET / HTTP/1.0\r\n";
-        
+
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 1), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 2), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 40), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 41), 41);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 42), 41);
-    }        
+    }
     {
         /* LF only in all places, one content-length header, length 5 */
-        const char *http_buf = 
+        const char *http_buf =
             /*123456789012345678 */
             "GET / HTTP/1.1\n"
             "Content-Length: 5\n"
             "\n"
             "ABCDE"
             "GET / HTTP/1.0\r\n";
-        
+
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 1), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 2), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 38), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 39), 39);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 40), 39);
-    }        
+    }
 
     {
         /* one header, unknown transfer-encoding (no content) */
-        const char *http_buf = 
+        const char *http_buf =
             /*12345678901234567890123456789 */
             "GET / HTTP/1.1\r\n"
             "Transfer-Encoding: chunke_\r\n"
             "\r\n"
             "GET / HTTP/1.0\r\n";
-        
+
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 45), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 46), 46);
-    }        
+    }
 
     {
         /* one header, one chunk */
-        const char *http_buf = 
+        const char *http_buf =
             /*12345678901234567890123456789 */
             "GET / HTTP/1.1\r\n"
             "Transfer-Encoding: chunked\r\n"
@@ -134,14 +134,14 @@ static void tst_http_request(void)
             "123\r\n"
             "0\r\n\r\n"
             "GET / HTTP/1.0\r\n";
-        
+
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 58), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 59), 59);
-    }        
+    }
 
     {
         /* one header, two chunks */
-        const char *http_buf = 
+        const char *http_buf =
             /*12345678901234567890123456789 */
             "GET / HTTP/1.1\r\n"
             "Transfer-Encoding: chunked\r\n"
@@ -152,36 +152,50 @@ static void tst_http_request(void)
             "12\n"
             "0\r\n\r\n"
             "GET / HTTP/1.0\r\n";
-        
+
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 64), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 65), 65);
-    }        
+    }
 }
 
 static void tst_http_response(void)
 {
     {
         /* unlimited content, no headers */
-        const char *http_buf = 
+        const char *http_buf =
             /*123456789012345678 */
             "HTTP/1.1 200 OK\r\n"
             "\r\n"
             "HTTP/1.1 200 OK\r\n";
-        
+
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 1), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 2), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 24), 0);
     }
     {
+        /* no content, no headers */
+        const char *http_buf =
+            /*123456789012345678 */
+            "HTTP/1.1 204 OK\r\n"
+            "\r\n"
+            "HTTP/1.1 200 OK\r\n";
+
+        YAZ_CHECK_EQ(cs_complete_auto(http_buf, 1), 0);
+        YAZ_CHECK_EQ(cs_complete_auto(http_buf, 2), 0);
+        YAZ_CHECK_EQ(cs_complete_auto(http_buf, 18), 0);
+        YAZ_CHECK_EQ(cs_complete_auto(http_buf, 19), 19);
+        YAZ_CHECK_EQ(cs_complete_auto(http_buf, 24), 19);
+    }
+    {
         /* response, content  */
-        const char *http_buf = 
+        const char *http_buf =
             /*123456789012345678 */
             "HTTP/1.1 200 OK\r\n"
             "Content-Length: 2\r\n"
             "\r\n"
             "12"
             "HTTP/1.1 200 OK\r\n";
-        
+
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 1), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 2), 0);
         YAZ_CHECK_EQ(cs_complete_auto(http_buf, 39), 0);
@@ -192,7 +206,7 @@ static void tst_http_response(void)
 
 /** \brief COMSTACK synopsis from manual, doc/comstack.xml */
 static int comstack_example(const char *server_address_str)
-{    
+{
     COMSTACK stack;
     char *buf = 0;
     int size = 0, length_incoming;
@@ -207,28 +221,32 @@ static int comstack_example(const char *server_address_str)
         perror("cs_create");  /* use perror() here since we have no stack yet */
         return -1;
     }
-    
+
     server_address_ip = cs_straddr(stack, server_address_str);
-    if (!server_address_ip)
-    {
+    if (!server_address_ip) {
         fprintf(stderr, "cs_straddr: address could not be resolved\n");
         return -1;
     }
-    
+
     status = cs_connect(stack, server_address_ip);
-    if (status != 0) {
+    if (status) {
         fprintf(stderr, "cs_connect: %s\n", cs_strerror(stack));
         return -1;
     }
-    
+
+    status = cs_rcvconnect(stack);
+    if (status) {
+        fprintf(stderr, "cs_rcvconnect: %s\n", cs_strerror(stack));
+        return -1;
+    }
+
     status = cs_put(stack, protocol_package, protocol_package_length);
     if (status) {
         fprintf(stderr, "cs_put: %s\n", cs_strerror(stack));
         return -1;
     }
-    
+
     /* Now get a response */
-    
     length_incoming = cs_get(stack, &buf, &size);
     if (!length_incoming) {
         fprintf(stderr, "Connection closed\n");
@@ -237,17 +255,44 @@ static int comstack_example(const char *server_address_str)
         fprintf(stderr, "cs_get: %s\n", cs_strerror(stack));
         return -1;
     }
-    
+
     /* Print result */
     fwrite(buf, length_incoming, 1, stdout);
-    
+
     /* clean up */
     cs_close(stack);
     if (buf)
-        free(buf);
+        xfree(buf);
     return 0;
 }
 
+static void tst_cs_get_host_args(void)
+{
+    const char *arg = 0;
+
+    cs_get_host_args("http://localhost:9999", &arg);
+    YAZ_CHECK(arg && !strcmp(arg, ""));
+    cs_get_host_args("http://localhost:9999/x", &arg);
+    YAZ_CHECK(arg && !strcmp(arg, "x"));
+    cs_get_host_args("http://localhost:9999?x", &arg);
+    YAZ_CHECK(arg && !strcmp(arg, ""));
+    cs_get_host_args("localhost:9999", &arg);
+    YAZ_CHECK(arg && !strcmp(arg, ""));
+    cs_get_host_args("localhost:9999/", &arg);
+    YAZ_CHECK(arg && !strcmp(arg, ""));
+    cs_get_host_args("localhost:9999/x&url=http://some.host", &arg);
+    YAZ_CHECK(arg && !strcmp(arg, "x&url=http://some.host"));
+    cs_get_host_args("http://localhost:9999/x&url=http://some.host", &arg);
+    YAZ_CHECK(arg && !strcmp(arg, "x&url=http://some.host"));
+    cs_get_host_args("http:/localhost:9999/x", &arg);
+    YAZ_CHECK(arg && !strcmp(arg, "localhost:9999/x"));
+    cs_get_host_args("http//localhost:9999/x", &arg);
+    YAZ_CHECK(arg && !strcmp(arg, "/localhost:9999/x"));
+    cs_get_host_args("http://y/x", &arg);
+    YAZ_CHECK(arg && !strcmp(arg, "x"));
+    cs_get_host_args("http:///x", &arg);
+    YAZ_CHECK(arg && !strcmp(arg, "x"));
+}
 
 int main (int argc, char **argv)
 {
@@ -257,6 +302,7 @@ int main (int argc, char **argv)
        comstack_example(argv[1]);
     tst_http_request();
     tst_http_response();
+    tst_cs_get_host_args();
     YAZ_CHECK_TERM;
 }