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
Use CONNECT for SSL backends and for Z39.50 thru HTTP proxy YAZ-825
[yaz-moved-to-github.git]
/
include
/
yaz
/
comstack.h
diff --git
a/include/yaz/comstack.h
b/include/yaz/comstack.h
index
ed5065b
..
4456dd6
100644
(file)
--- a/
include/yaz/comstack.h
+++ b/
include/yaz/comstack.h
@@
-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) Index Data.
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@
-25,7
+25,7
@@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/**
+/**
* \file comstack.h
* \brief Header for COMSTACK
*/
* \file comstack.h
* \brief Header for COMSTACK
*/
@@
-39,8
+39,6
@@
YAZ_BEGIN_CDECL
YAZ_BEGIN_CDECL
-#define COMSTACK_DEFAULT_TIMEOUT -1 /* not used yet */
-
struct comstack;
typedef struct comstack *COMSTACK;
typedef COMSTACK (*CS_TYPE)(int s, int flags, int protocol, void *vp);
struct comstack;
typedef struct comstack *COMSTACK;
typedef COMSTACK (*CS_TYPE)(int s, int flags, int protocol, void *vp);
@@
-50,7
+48,6
@@
struct comstack
CS_TYPE type;
int cerrno; /* current error code of this stack */
int iofile; /* UNIX file descriptor for iochannel */
CS_TYPE type;
int cerrno; /* current error code of this stack */
int iofile; /* UNIX file descriptor for iochannel */
- int timeout; /* how long to wait for trailing blocks (ignored for now) */
void *cprivate;/* state info for lower stack */
int max_recv_bytes; /* max size of incoming package */
int state; /* current state */
void *cprivate;/* state info for lower stack */
int max_recv_bytes; /* max size of incoming package */
int state; /* current state */
@@
-113,31
+110,47
@@
struct comstack
#define cs_want_read(handle) ((handle)->io_pending & CS_WANT_READ)
#define cs_want_write(handle) ((handle)->io_pending & CS_WANT_WRITE)
#define cs_set_blocking(handle,blocking) ((handle)->f_set_blocking(handle, blocking))
#define cs_want_read(handle) ((handle)->io_pending & CS_WANT_READ)
#define cs_want_write(handle) ((handle)->io_pending & CS_WANT_WRITE)
#define cs_set_blocking(handle,blocking) ((handle)->f_set_blocking(handle, blocking))
-
+
#define CS_WANT_READ 1
#define CS_WANT_WRITE 2
YAZ_EXPORT int cs_look (COMSTACK);
YAZ_EXPORT const char *cs_strerror(COMSTACK h);
YAZ_EXPORT const char *cs_errmsg(int n);
#define CS_WANT_READ 1
#define CS_WANT_WRITE 2
YAZ_EXPORT int cs_look (COMSTACK);
YAZ_EXPORT const char *cs_strerror(COMSTACK h);
YAZ_EXPORT const char *cs_errmsg(int n);
-YAZ_EXPORT COMSTACK cs_create_host(const char *type_and_host,
+YAZ_EXPORT COMSTACK cs_create_host(const char *type_and_host,
int blocking, void **vp);
int blocking, void **vp);
+
+YAZ_EXPORT COMSTACK cs_create_host_proxy(const char *vhost,
+ int blocking, void **vp,
+ const char *proxy_host);
+YAZ_EXPORT COMSTACK cs_create_host2(const char *vhost, int blocking, void **vp,
+ const char *proxy_host, int *proxy_mode);
YAZ_EXPORT void cs_get_host_args(const char *type_and_host, const char **args);
YAZ_EXPORT int cs_complete_auto_head(const char *buf, int len);
YAZ_EXPORT int cs_complete_auto(const char *buf, int len);
YAZ_EXPORT void cs_get_host_args(const char *type_and_host, const char **args);
YAZ_EXPORT int cs_complete_auto_head(const char *buf, int len);
YAZ_EXPORT int cs_complete_auto(const char *buf, int len);
-YAZ_EXPORT void *cs_get_ssl(COMSTACK cs);
-YAZ_EXPORT int cs_set_ssl_ctx(COMSTACK cs, void *ctx);
+YAZ_EXPORT void *cs_get_ssl(COMSTACK cs)
+#ifdef __GNUC__
+ __attribute__ ((deprecated))
+#endif
+ ;
+YAZ_EXPORT int cs_set_ssl_ctx(COMSTACK cs, void *ctx)
+#ifdef __GNUC__
+ __attribute__ ((deprecated))
+#endif
+ ;
YAZ_EXPORT int cs_set_ssl_certificate_file(COMSTACK cs, const char *fname);
YAZ_EXPORT int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len);
YAZ_EXPORT void cs_set_max_recv_bytes(COMSTACK cs, int max_recv_bytes);
YAZ_EXPORT int cs_set_ssl_certificate_file(COMSTACK cs, const char *fname);
YAZ_EXPORT int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len);
YAZ_EXPORT void cs_set_max_recv_bytes(COMSTACK cs, int max_recv_bytes);
-YAZ_EXPORT int completeWAIS(const char *buf, int len);
-
YAZ_EXPORT void cs_print_session_info(COMSTACK cs);
YAZ_EXPORT void cs_print_session_info(COMSTACK cs);
+YAZ_EXPORT int cs_parse_host(const char *uri, const char **host,
+ CS_TYPE *t, enum oid_proto *proto,
+ char **connect_host);
+
/*
* error management.
*/
/*
* error management.
*/
-
+
#define CSNONE 0
#define CSYSERR 1
#define CSOUTSTATE 2
#define CSNONE 0
#define CSYSERR 1
#define CSOUTSTATE 2
@@
-148,12
+161,9
@@
YAZ_EXPORT void cs_print_session_info(COMSTACK cs);
#define CSBUFSIZE 7
#define CSLASTERROR CSBUFSIZE /* must be the value of last CS error */
#define CSBUFSIZE 7
#define CSLASTERROR CSBUFSIZE /* must be the value of last CS error */
-/* backwards compatibility */
-#define CS_SR PROTO_SR
-#define CS_Z3950 PROTO_Z3950
-
#define CS_FLAGS_BLOCKING 1
#define CS_FLAGS_NUMERICHOST 2
#define CS_FLAGS_BLOCKING 1
#define CS_FLAGS_NUMERICHOST 2
+#define CS_FLAGS_DNS_NO_BLOCK 4
YAZ_END_CDECL
YAZ_END_CDECL