X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Ftcpip.h;h=a9ea61554aef898018a71ac6b3f6cd463634f582;hp=d985d03d4aaebc22bfe5e10afe3f00ac61002df8;hb=11dbebdf973d652e486f2b5e457cc46d1478556f;hpb=d9ee01635f03f9095a66f71b73580560d48798e8

diff --git a/include/yaz/tcpip.h b/include/yaz/tcpip.h
index d985d03..a9ea615 100644
--- a/include/yaz/tcpip.h
+++ b/include/yaz/tcpip.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-1999, 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,62 +23,11 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Log: tcpip.h,v $
- * Revision 1.1  1999-11-30 13:47:11  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.13  1999/06/16 11:55:24  adam
- * Added APDU log to client.
- *
- * Revision 1.12  1999/01/08 11:23:19  adam
- * Added const modifier to some of the BER/ODR encoding routines.
- *
- * Revision 1.11  1998/06/22 11:32:38  adam
- * Added 'conditional cs_listen' feature.
- *
- * Revision 1.10  1998/05/18 13:07:01  adam
- * Changed the way attribute sets are handled by the retriaval module.
- * Extended Explain conversion / schema.
- * Modified server and client to work with ASN.1 compiled protocol handlers.
- *
- * Revision 1.9  1997/09/01 08:49:54  adam
- * New windows NT/95 port using MSV5.0. To export DLL functions the
- * YAZ_EXPORT modifier was added. Defined in yconfig.h.
- *
- * Revision 1.8  1997/05/14 06:53:52  adam
- * C++ support.
- *
- * Revision 1.7  1996/07/06 19:58:32  quinn
- * System headerfiles gathered in yconfig
- *
- * Revision 1.6  1996/02/10  12:23:42  quinn
- * Enable inetd operations fro TCP/IP stack
- *
- * Revision 1.5  1995/09/29  17:12:13  quinn
- * Smallish
- *
- * Revision 1.4  1995/09/28  10:12:36  quinn
- * Windows-support changes
- *
- * Revision 1.3  1995/09/27  15:02:53  quinn
- * Modified function heads & prototypes.
- *
- * Revision 1.2  1995/05/16  08:50:39  quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.1  1995/03/30  09:39:43  quinn
- * Moved .h files to include directory
- *
- * Revision 1.3  1995/03/27  08:36:11  quinn
- * Some work on nonblocking operation in xmosi.c and rfct.c.
- * Added protocol parameter to cs_create()
- *
- * Revision 1.2  1995/03/14  10:28:43  quinn
- * Adding server-side support to tcpip.c and fixing bugs in nonblocking I/O
- *
- * Revision 1.1  1995/02/09  15:51:52  quinn
- * Works better now.
- *
+ * $Id: tcpip.h,v 1.9 2006-09-06 15:01:53 adam Exp $
+ */
+/**
+ * \file tcpip.h
+ * \brief Header for TCP/IP + SSL COMSTACK.
  */
 
 #ifndef TCPIP_H
@@ -87,16 +36,20 @@
 #include <yaz/comstack.h>
 #include <yaz/oid.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+YAZ_BEGIN_CDECL
 
 YAZ_EXPORT int completeWAIS(const unsigned char *buf, int len);
-YAZ_EXPORT struct sockaddr_in *tcpip_strtoaddr(const char *str);
-YAZ_EXPORT COMSTACK tcpip_type(int s, int blocking, int protocol);
+YAZ_EXPORT COMSTACK tcpip_type(int s, int flags, int protocol, void *vp);
+YAZ_EXPORT COMSTACK ssl_type(int s, int flags, int protocol, void *vp);
 
-#ifdef __cplusplus
-}
-#endif
+YAZ_END_CDECL
 
 #endif
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+