projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test_xml_include: no test wo Libxml2
[yaz-moved-to-github.git]
/
include
/
yaz
/
comstack.h
diff --git
a/include/yaz/comstack.h
b/include/yaz/comstack.h
index
46aef6c
..
ed5065b
100644
(file)
--- a/
include/yaz/comstack.h
+++ b/
include/yaz/comstack.h
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data.
+ * 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:
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@
-24,7
+24,6
@@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $Id: comstack.h,v 1.30 2007-10-09 06:00:55 adam Exp $ */
/**
* \file comstack.h
/**
* \file comstack.h
@@
-50,7
+49,6
@@
struct comstack
{
CS_TYPE type;
int cerrno; /* current error code of this stack */
{
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 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 */
@@
-85,8
+83,8
@@
struct comstack
int (*check_ip)(void *cd, const char *a, int len, int type),
void *cd);
COMSTACK (*f_accept)(COMSTACK handle);
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 */
void *(*f_straddr)(COMSTACK handle, const char *str);
int (*f_set_blocking)(COMSTACK handle, int blocking);
void *user; /* user defined data associated with COMSTACK */
@@
-107,7
+105,6
@@
struct comstack
((*type)(sock, blocking, proto, 0))
#define cs_type(handle) ((handle)->type)
#define cs_fileno(handle) ((handle)->iofile)
((*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)
#define cs_getstate(handle) ((handle)->getstate)
#define cs_errno(handle) ((handle)->cerrno)
#define cs_getproto(handle) ((handle)->protocol)
@@
-135,6
+132,8
@@
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_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.
*/
/*
* error management.
*/
@@
-162,6
+161,7
@@
YAZ_END_CDECL
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab