X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=include%2Fyaz%2Fcomstack.h;h=d03e9879fcac1c649edf4445747c935a32d439fd;hb=825d22351b1d59c71e98357b4931bf7bb67daa3a;hp=2c87e44bad3c5a41c8411b83f40c98e995e2787b;hpb=b638e7e4efc850ee6446b14fa45c66690377ccf2;p=yaz-moved-to-github.git

diff --git a/include/yaz/comstack.h b/include/yaz/comstack.h
index 2c87e44..d03e987 100644
--- a/include/yaz/comstack.h
+++ b/include/yaz/comstack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-2001, Index Data.
+ * Copyright (C) 1995-2005, Index Data ApS
  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,
@@ -23,41 +23,18 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Id: comstack.h,v 1.7 2001-10-22 16:00:04 adam Exp $
+ * $Id: comstack.h,v 1.19 2005-01-16 21:51:49 adam Exp $
+ */
+
+/** 
+ * \file comstack.h
+ * \brief Header for COMSTACK
  */
 
 #ifndef COMSTACK_H
 #define COMSTACK_H
 
 #include <yaz/yconfig.h>
-
-#ifndef _VMS_
-
-# ifdef WIN32
-
-#  include <winsock.h>
-
-# else /* #ifdef WIN32 */
-#  include <sys/types.h>
-#  include <sys/time.h>
-#  include <sys/wait.h>
-
-#  include <netinet/in.h>
-#  include <sys/socket.h>
-#  include <netdb.h>
-#  include <arpa/inet.h>
-
-#  ifdef _AIX
-#   include <sys/select.h>
-#  endif
-
-#  ifndef O_BINARY
-#   define O_BINARY 0
-#  endif
-
-# endif
-#endif /* ifndef _VMS_ */
-
 #include <yaz/oid.h>
 #include <yaz/xmalloc.h>
 
@@ -137,15 +114,23 @@ struct comstack
 #define cs_straddr(handle, str) ((*(handle)->f_straddr)(handle, str))
 #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_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);
 YAZ_EXPORT COMSTACK cs_create_host(const char *type_and_host, 
-				   int blocking, void **vp);
+                                   int blocking, void **vp);
+YAZ_EXPORT void cs_get_host_args(const char *type_and_host, const char **args);
+YAZ_EXPORT int cs_complete_auto(const unsigned 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 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);
+                                          
 /*
  * error management.
  */
@@ -157,6 +142,7 @@ YAZ_EXPORT COMSTACK cs_create_host(const char *type_and_host,
 #define CSWRONGBUF 4
 #define CSDENY     5
 #define CSERRORSSL 6
+#define CSLASTERROR CSERRORSSL	/* must be the value of last CS error */
 
 /* backwards compatibility */
 #define CS_SR     PROTO_SR