X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Fcomstack.h;h=e830c39a131d4d9dc5db5208d05e2cb7af92c6f6;hb=31e3a0ef5a0866477a3b54dc6ffbeb0aca4e0029;hp=f7a5121d246975dadee6dbb698a81d1735911833;hpb=cfef2a68b0e7da6c2a3b47e44df9965d63156584;p=yaz-moved-to-github.git

diff --git a/include/yaz/comstack.h b/include/yaz/comstack.h
index f7a5121..e830c39 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.5 2001-03-21 12:43:36 adam Exp $
+ * $Id: comstack.h,v 1.20 2005-02-01 14:37:47 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>
 
@@ -79,19 +56,19 @@ struct comstack
     void *cprivate;/* state info for lower stack */
     int more;      /* connection has extra data in buffer */
     int state;     /* current state */
-#define CS_UNBND      0
-#define CS_IDLE       1
-#define CS_INCON      2
-#define CS_OUTCON     3
-#define CS_DATAXFER   4
-#define CS_ACCEPT     5
-#define CS_CONNECT    6
+#define CS_ST_UNBND      0
+#define CS_ST_IDLE       1
+#define CS_ST_INCON      2
+#define CS_ST_OUTCON     3
+#define CS_ST_DATAXFER   4
+#define CS_ST_ACCEPT     5
+#define CS_ST_CONNECTING 6
     int newfd;     /* storing new descriptor between listen and accept */
     int blocking;  /* is this link (supposed to be) blocking? */
     unsigned io_pending; /* flag to signal read / write op is incomplete */
     int event;     /* current event */
 #define CS_NONE       0
-#define CS_CONNECTING 1
+#define CS_CONNECT    1
 #define CS_DISCON     2
 #define CS_LISTEN     3
 #define CS_DATA       4
@@ -112,6 +89,7 @@ struct comstack
     char *(*f_addrstr)(COMSTACK handle);
     void *(*f_straddr)(COMSTACK handle, const char *str);
     int (*f_set_blocking)(COMSTACK handle, int blocking);
+    void *user;       /* user defined data associated with COMSTACK */
 };
 
 #define cs_put(handle, buf, size) ((*(handle)->f_put)(handle, buf, size))
@@ -137,19 +115,27 @@ 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.
  */
-
+					  
 #define CSNONE     0
 #define CSYSERR    1
 #define CSOUTSTATE 2
@@ -157,6 +143,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