X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Fcomstack.h;h=e5c32f5a889c60129a68de0c2cc72962b8c1802b;hp=8abe30298433a7d0e71412ccdf9fbca0ef9d9986;hb=5b417578fa8bce4671d29d59201ae0ad0c7e5653;hpb=8e4eabe621f8b8195faa6625a38a2e1ae7b68aa1 diff --git a/include/yaz/comstack.h b/include/yaz/comstack.h index 8abe302..e5c32f5 100644 --- a/include/yaz/comstack.h +++ b/include/yaz/comstack.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-2000, Index Data. + * Copyright (c) 1995-2003, 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.3 2000-11-23 10:58:32 adam Exp $ + * $Id: comstack.h,v 1.11 2003-11-17 10:40:08 mike Exp $ */ #ifndef COMSTACK_H @@ -79,19 +79,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 @@ -111,6 +111,7 @@ struct comstack int (*f_close)(COMSTACK handle); char *(*f_addrstr)(COMSTACK handle); void *(*f_straddr)(COMSTACK handle, const char *str); + int (*f_set_blocking)(COMSTACK handle, int blocking); }; #define cs_put(handle, buf, size) ((*(handle)->f_put)(handle, buf, size)) @@ -136,22 +137,31 @@ 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_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); +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); + /* * error management. */ - + #define CSNONE 0 #define CSYSERR 1 #define CSOUTSTATE 2 #define CSNODATA 3 #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