X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Fcomstack.h;h=160ab65a7e946d92b5aa1b9c004f35e42d2f380e;hb=725fc033b729b22a1e0cfba614192b6fbfaeda4f;hp=6993d5b9c30bb88b2560916c00ae862a1053864c;hpb=4ca818ec201c9dcf5461e419002c95fd2eac620e;p=yaz-moved-to-github.git diff --git a/include/yaz/comstack.h b/include/yaz/comstack.h index 6993d5b..160ab65 100644 --- a/include/yaz/comstack.h +++ b/include/yaz/comstack.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-2001, Index Data. + * Copyright (c) 1995-2004, Index Data. * * 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,7 +23,7 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. * - * $Id: comstack.h,v 1.8 2003-02-21 12:08:58 adam Exp $ + * $Id: comstack.h,v 1.15 2004-04-30 19:10:35 adam Exp $ */ #ifndef COMSTACK_H @@ -137,7 +137,7 @@ 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 @@ -147,7 +147,12 @@ 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); +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_certf(COMSTACK cs, const char *fname); +YAZ_EXPORT int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len); /* * error management. @@ -160,6 +165,7 @@ YAZ_EXPORT int cs_complete_auto(const unsigned char *buf, int len); #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