projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test for solr sort specs
[yaz-moved-to-github.git]
/
src
/
comstack.c
diff --git
a/src/comstack.c
b/src/comstack.c
index
0df8678
..
cf1d4b6
100644
(file)
--- a/
src/comstack.c
+++ b/
src/comstack.c
@@
-1,17
+1,19
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) 1995-2012 Index Data
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
-
-/**
+/**
* \file comstack.c
* \brief Implements Generic COMSTACK functions
*/
* \file comstack.c
* \brief Implements Generic COMSTACK functions
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <string.h>
#include <string.h>
-#include <ctype.h>
#include <errno.h>
#include <errno.h>
+#include <yaz/yaz-iconv.h>
#include <yaz/log.h>
#include <yaz/comstack.h>
#include <yaz/tcpip.h>
#include <yaz/log.h>
#include <yaz/comstack.h>
#include <yaz/tcpip.h>
@@
-64,7
+66,7
@@
const char *cs_strerror(COMSTACK h)
void cs_get_host_args(const char *type_and_host, const char **args)
{
void cs_get_host_args(const char *type_and_host, const char **args)
{
-
+
*args = "";
if (*type_and_host && strncmp(type_and_host, "unix:", 5))
{
*args = "";
if (*type_and_host && strncmp(type_and_host, "unix:", 5))
{
@@
-155,13
+157,20
@@
static int cs_parse_host(const char *uri, const char **host,
COMSTACK cs_create_host(const char *vhost, int blocking, void **vp)
{
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;
CS_TYPE t;
char *connect_host = 0;
enum oid_proto proto = PROTO_Z3950;
const char *host = 0;
COMSTACK cs;
CS_TYPE t;
char *connect_host = 0;
- cs_parse_host(vhost, &host, &t, &proto, &connect_host);
+ if (!cs_parse_host(vhost, &host, &t, &proto, &connect_host))
+ return 0;
if (t == tcpip_type)
{
if (t == tcpip_type)
{
@@
-173,11
+182,13
@@
COMSTACK cs_create_host(const char *vhost, int blocking, void **vp)
}
if (cs)
{
}
if (cs)
{
+ if (proxy_host)
+ host = proxy_host;
if (!(*vp = cs_straddr(cs, connect_host ? connect_host : host)))
{
cs_close (cs);
cs = 0;
if (!(*vp = cs_straddr(cs, connect_host ? connect_host : host)))
{
cs_close (cs);
cs = 0;
- }
+ }
}
xfree(connect_host);
return cs;
}
xfree(connect_host);
return cs;
@@
-232,14
+243,14
@@
static int cs_read_chunk(const char *buf, int i, int len)
printf ("i=%d len=%d\n", i, len);
#endif
return 0;
printf ("i=%d len=%d\n", i, len);
#endif
return 0;
- } else if (isdigit(buf[i]))
- chunk_len = chunk_len * 16 +
+ } else if (yaz_isdigit(buf[i]))
+ chunk_len = chunk_len * 16 +
(buf[i++] - '0');
(buf[i++] - '0');
- else if (isupper(buf[i]))
- chunk_len = chunk_len * 16 +
+ else if (yaz_isupper(buf[i]))
+ chunk_len = chunk_len * 16 +
(buf[i++] - ('A'-10));
(buf[i++] - ('A'-10));
- else if (islower(buf[i]))
- chunk_len = chunk_len * 16 +
+ else if (yaz_islower(buf[i]))
+ chunk_len = chunk_len * 16 +
(buf[i++] - ('a'-10));
else
break;
(buf[i++] - ('a'-10));
else
break;
@@
-247,7
+258,7
@@
static int cs_read_chunk(const char *buf, int i, int len)
break;
if (chunk_len < 0)
return i;
break;
if (chunk_len < 0)
return i;
-
+
while (1)
{
if (i >= len -1)
while (1)
{
if (i >= len -1)
@@
-259,7
+270,7
@@
static int cs_read_chunk(const char *buf, int i, int len)
/* got CRLF */
#if CHUNK_DEBUG
printf ("chunk_len=%d\n", chunk_len);
/* got CRLF */
#if CHUNK_DEBUG
printf ("chunk_len=%d\n", chunk_len);
-#endif
+#endif
i += chunk_len;
if (i >= len-2)
return 0;
i += chunk_len;
if (i >= len-2)
return 0;
@@
-295,7
+306,7
@@
static int cs_complete_http(const char *buf, int len, int head_only)
/* if dealing with HTTP responses - then default
content length is unlimited (socket close) */
if (!head_only && !memcmp(buf, "HTTP/", 5))
/* if dealing with HTTP responses - then default
content length is unlimited (socket close) */
if (!head_only && !memcmp(buf, "HTTP/", 5))
- content_len = -1;
+ content_len = -1;
#if 0
printf("len = %d\n", len);
#if 0
printf("len = %d\n", len);
@@
-326,7
+337,7
@@
static int cs_complete_http(const char *buf, int len, int head_only)
}
break;
}
}
break;
}
- else if (i < len - 20 &&
+ else if (i < len - 20 &&
!strncasecmp((const char *) buf+i, "Transfer-Encoding:", 18))
{
i+=18;
!strncasecmp((const char *) buf+i, "Transfer-Encoding:", 18))
{
i+=18;
@@
-343,7
+354,7
@@
static int cs_complete_http(const char *buf, int len, int head_only)
while (buf[i] == ' ')
i++;
content_len = 0;
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;
content_len = content_len*10 + (buf[i++] - '0');
if (content_len < 0) /* prevent negative offsets */
content_len = 0;