X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fcomstack.h;h=f4d2641adbf718bd4fed34f89fc9dc59a19c43fe;hb=3e506bbbebc55bd870aaf2be4d0014cec0779851;hp=2c8b4bde841af48f8036602e15fec4bb69588060;hpb=9d17b5cfa8555d4762f162785edede1e0314cc07;p=yaz-moved-to-github.git

diff --git a/include/comstack.h b/include/comstack.h
index 2c8b4bd..f4d2641 100644
--- a/include/comstack.h
+++ b/include/comstack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1998, 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,
@@ -24,7 +24,31 @@
  * OF THIS SOFTWARE.
  *
  * $Log: comstack.h,v $
- * Revision 1.14  1996-02-10 12:23:41  quinn
+ * Revision 1.21  1998-05-20 09:52:39  adam
+ * Removed 'dead' definition.
+ *
+ * Revision 1.20  1998/05/18 13:06:55  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.19  1997/09/29 07:16:14  adam
+ * Array cs_errlist no longer global.
+ *
+ * Revision 1.18  1997/09/17 12:10:31  adam
+ * YAZ version 1.4.
+ *
+ * Revision 1.17  1997/09/01 08:49:47  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.16  1997/05/14 06:53:37  adam
+ * C++ support.
+ *
+ * Revision 1.15  1996/07/06 19:58:32  quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.14  1996/02/10  12:23:41  quinn
  * Enable inetd operations fro TCP/IP stack
  *
  * Revision 1.13  1995/11/01  13:54:33  quinn
@@ -108,10 +132,15 @@
 #ifndef COMSTACK_H
 #define COMSTACK_H
 
+#define YNETINCLUDE
 #include <yconfig.h>
 #include <oid.h>
 #include <xmalloc.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define COMSTACK_DEFAULT_TIMEOUT -1  /* not used yet */
 
 struct comstack;
@@ -125,7 +154,7 @@ struct comstack
     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 *private; /* state info for lower stack */
+    void *cprivate;/* state info for lower stack */
     int more;      /* connection has extra data in buffer */
     int state;     /* current state */
 #define CS_UNBND      0
@@ -142,7 +171,6 @@ struct comstack
 #define CS_LISTEN     3
 #define CS_DATA       4
     enum oid_proto protocol;  /* what application protocol are we talking? */
-    int (*f_look)(COMSTACK handle);
     int (*f_put)(COMSTACK handle, char *buf, int size);
     int (*f_get)(COMSTACK handle, char **buf, int *bufsize);
     int (*f_more)(COMSTACK handle);
@@ -155,6 +183,7 @@ struct comstack
     COMSTACK (*f_accept)(COMSTACK handle);
     int (*f_close)(COMSTACK handle);
     char *(*f_addrstr)(COMSTACK handle);
+    void *(*f_straddr)(COMSTACK handle, const char *str);
 };
 
 #define cs_put(handle, buf, size) ((*(handle)->f_put)(handle, buf, size))
@@ -176,9 +205,10 @@ struct comstack
 #define cs_errno(handle) ((handle)->cerrno)
 #define cs_getproto(handle) ((handle)->protocol)
 #define cs_addrstr(handle) ((*(handle)->f_addrstr)(handle))
+#define cs_straddr(handle, str) ((*(handle)->f_straddr)(handle, str))
 
-const char *cs_strerror(COMSTACK h);
-const char *cs_errmsg(int n);
+YAZ_EXPORT const char *cs_strerror(COMSTACK h);
+YAZ_EXPORT const char *cs_errmsg(int n);
 
 /*
  * error management.
@@ -190,10 +220,12 @@ const char *cs_errmsg(int n);
 #define CSNODATA   3
 #define CSWRONGBUF 4
 
-extern char *cs_errlist[];
-
 /* backwards compatibility */
 #define CS_SR     PROTO_SR
 #define CS_Z3950  PROTO_Z3950
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif