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
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
496fe22
..
17c6a41
100644
(file)
--- a/
src/comstack.c
+++ b/
src/comstack.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) 1995-2012 Index Data
* See the file LICENSE for details.
*/
/**
* See the file LICENSE for details.
*/
/**
@@
-11,9
+11,9
@@
#endif
#include <string.h>
#endif
#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>
@@
-157,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)
{
@@
-175,6
+182,8
@@
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);
if (!(*vp = cs_straddr(cs, connect_host ? connect_host : host)))
{
cs_close (cs);
@@
-234,13
+243,13
@@
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]))
+ } else if (yaz_isdigit(buf[i]))
chunk_len = chunk_len * 16 +
(buf[i++] - '0');
chunk_len = chunk_len * 16 +
(buf[i++] - '0');
- else if (isupper(buf[i]))
+ else if (yaz_isupper(buf[i]))
chunk_len = chunk_len * 16 +
(buf[i++] - ('A'-10));
chunk_len = chunk_len * 16 +
(buf[i++] - ('A'-10));
- else if (islower(buf[i]))
+ else if (yaz_islower(buf[i]))
chunk_len = chunk_len * 16 +
(buf[i++] - ('a'-10));
else
chunk_len = chunk_len * 16 +
(buf[i++] - ('a'-10));
else
@@
-345,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;