X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Fcomstack.h;h=ed5065b83f86da7318c7ba3cb5564bd615df90e1;hp=d03e9879fcac1c649edf4445747c935a32d439fd;hb=43a9d38d20c1b1bcd1a03b2445a501d27526bd35;hpb=825d22351b1d59c71e98357b4931bf7bb67daa3a diff --git a/include/yaz/comstack.h b/include/yaz/comstack.h index d03e987..ed5065b 100644 --- a/include/yaz/comstack.h +++ b/include/yaz/comstack.h @@ -1,29 +1,28 @@ -/* - * 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, - * provided that: - * - * 1. This copyright and permission notice appear in all copies of the - * software and its documentation. Notices of copyright or attribution - * which appear at the beginning of any file must remain unchanged. - * - * 2. The name of Index Data or the individual authors may not be used to - * endorse or promote products derived from this software without specific - * prior written permission. +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2011 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: * - * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND, - * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY - * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL, - * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR - * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF - * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE - * OF THIS SOFTWARE. + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Index Data nor the names of its contributors + * may be used to endorse or promote products derived from this + * software without specific prior written permission. * - * $Id: comstack.h,v 1.19 2005-01-16 21:51:49 adam Exp $ + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /** @@ -35,7 +34,7 @@ #define COMSTACK_H #include -#include +#include #include YAZ_BEGIN_CDECL @@ -44,17 +43,16 @@ YAZ_BEGIN_CDECL struct comstack; typedef struct comstack *COMSTACK; -typedef COMSTACK (*CS_TYPE)(int s, int blocking, int protocol, void *vp); +typedef COMSTACK (*CS_TYPE)(int s, int flags, int protocol, void *vp); struct comstack { CS_TYPE type; int cerrno; /* current error code of this stack */ - char *stackerr;/* current lower-layer error string, or null if none */ 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 more; /* connection has extra data in buffer */ + int max_recv_bytes; /* max size of incoming package */ int state; /* current state */ #define CS_ST_UNBND 0 #define CS_ST_IDLE 1 @@ -64,7 +62,7 @@ struct comstack #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? */ + int flags; /* flags, blocking etc.. CS_FLAGS_.. */ unsigned io_pending; /* flag to signal read / write op is incomplete */ int event; /* current event */ #define CS_NONE 0 @@ -82,13 +80,14 @@ struct comstack #define CS_CLIENT 0 #define CS_SERVER 1 int (*f_listen)(COMSTACK h, char *raddr, int *addrlen, - int (*check_ip)(void *cd, const char *a, int len, int type), - void *cd); + int (*check_ip)(void *cd, const char *a, int len, int type), + void *cd); COMSTACK (*f_accept)(COMSTACK handle); - int (*f_close)(COMSTACK handle); - char *(*f_addrstr)(COMSTACK handle); + void (*f_close)(COMSTACK handle); + const 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)) @@ -103,10 +102,9 @@ struct comstack #define cs_close(handle) ((*(handle)->f_close)(handle)) #define cs_create(type, blocking, proto) ((*type)(-1, blocking, proto, 0)) #define cs_createbysocket(sock, type, blocking, proto) \ - ((*type)(sock, blocking, proto, 0)) + ((*type)(sock, blocking, proto, 0)) #define cs_type(handle) ((handle)->type) #define cs_fileno(handle) ((handle)->iofile) -#define cs_stackerr(handle) ((handle)->stackerr) #define cs_getstate(handle) ((handle)->getstate) #define cs_errno(handle) ((handle)->cerrno) #define cs_getproto(handle) ((handle)->protocol) @@ -115,7 +113,7 @@ struct comstack #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 @@ -125,16 +123,21 @@ 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 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 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 int completeWAIS(const char *buf, int len); + +YAZ_EXPORT void cs_print_session_info(COMSTACK cs); + /* * error management. */ - + #define CSNONE 0 #define CSYSERR 1 #define CSOUTSTATE 2 @@ -142,12 +145,25 @@ YAZ_EXPORT int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len); #define CSWRONGBUF 4 #define CSDENY 5 #define CSERRORSSL 6 -#define CSLASTERROR CSERRORSSL /* must be the value of last CS error */ +#define CSBUFSIZE 7 +#define CSLASTERROR CSBUFSIZE /* must be the value of last CS error */ /* backwards compatibility */ #define CS_SR PROTO_SR #define CS_Z3950 PROTO_Z3950 +#define CS_FLAGS_BLOCKING 1 +#define CS_FLAGS_NUMERICHOST 2 + YAZ_END_CDECL #endif +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +