X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Fcomstack.h;h=4456dd65071b0daeb8a22fab66b56afd6abed6d8;hp=cea7db467176ae3904d161cd832dd4fd74227b46;hb=HEAD;hpb=6cf32fafe48e17e937809e54edf5abc7451d557b

diff --git a/include/yaz/comstack.h b/include/yaz/comstack.h
index cea7db4..4456dd6 100644
--- a/include/yaz/comstack.h
+++ b/include/yaz/comstack.h
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 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:
@@ -39,8 +39,6 @@
 
 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);
@@ -50,7 +48,6 @@ struct comstack
     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 */
@@ -126,16 +123,30 @@ YAZ_EXPORT COMSTACK cs_create_host(const char *type_and_host,
 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_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 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.
  */
@@ -152,6 +163,7 @@ YAZ_EXPORT void cs_print_session_info(COMSTACK cs);
 
 #define CS_FLAGS_BLOCKING 1
 #define CS_FLAGS_NUMERICHOST 2
+#define CS_FLAGS_DNS_NO_BLOCK 4
 
 YAZ_END_CDECL