X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fcomstack.h;h=449b8ced183f299af21778ed488b233a0dc4ec6d;hp=b5e53896a0ffc65457b34b27d0bf571c6876ecf3;hb=cb182c3eb21ca4405d0c9f928ceb33f3fd2f95ba;hpb=9c459af695605b44a044ad206562818be10034f1

diff --git a/include/comstack.h b/include/comstack.h
index b5e5389..449b8ce 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,46 @@
  * OF THIS SOFTWARE.
  *
  * $Log: comstack.h,v $
- * Revision 1.10  1995-09-29 17:01:48  quinn
+ * Revision 1.22  1998-06-22 11:32:37  adam
+ * Added 'conditional cs_listen' feature.
+ *
+ * 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
+ * Minor adjustments
+ *
+ * Revision 1.12  1995/10/30  12:41:27  quinn
+ * Added hostname lookup for server.
+ *
+ * Revision 1.11  1995/09/29  17:12:01  quinn
+ * Smallish
+ *
+ * Revision 1.10  1995/09/29  17:01:48  quinn
  * More Windows work
  *
  * Revision 1.9  1995/09/28  10:12:36  quinn
@@ -96,15 +135,20 @@
 #ifndef COMSTACK_H
 #define COMSTACK_H
 
+#define YNETINCLUDE
 #include <yconfig.h>
 #include <oid.h>
-#include <dmalloc.h>
+#include <xmalloc.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #define COMSTACK_DEFAULT_TIMEOUT -1  /* not used yet */
 
 struct comstack;
 typedef struct comstack *COMSTACK;
-typedef COMSTACK (*CS_TYPE)(int blocking, int protocol);
+typedef COMSTACK (*CS_TYPE)(int s, int blocking, int protocol);
 
 struct comstack
 {
@@ -113,7 +157,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
@@ -130,7 +174,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);
@@ -139,9 +182,13 @@ struct comstack
     int (*f_bind)(COMSTACK handle, void *address, int mode);
 #define CS_CLIENT 0
 #define CS_SERVER 1
-    int (*f_listen)(COMSTACK handle, char *addrp, int *addrlen);
+    int (*f_listen)(COMSTACK h, char *raddr, int *addrlen,
+		   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_straddr)(COMSTACK handle, const char *str);
 };
 
 #define cs_put(handle, buf, size) ((*(handle)->f_put)(handle, buf, size))
@@ -150,19 +197,24 @@ struct comstack
 #define cs_connect(handle, address) ((*(handle)->f_connect)(handle, address))
 #define cs_rcvconnect(handle) ((*(handle)->f_rcvconnect)(handle))
 #define cs_bind(handle, ad, mo) ((*(handle)->f_bind)(handle, ad, mo))
-#define cs_listen(handle, ap, al) ((*(handle)->f_listen)(handle, ap, al))
+#define cs_listen(handle, ap, al) ((*(handle)->f_listen)(handle, ap, al, 0, 0))
+#define cs_listen_check(handle, ap, al, cf, cd) ((*(handle)->f_listen)(handle, ap, al, cf, cd))
 #define cs_accept(handle) ((*(handle)->f_accept)(handle))
 #define cs_close(handle) ((*(handle)->f_close)(handle))
-#define cs_create(type, blocking, proto) ((*type)(blocking, proto))
+#define cs_create(type, blocking, proto) ((*type)(-1, blocking, proto))
+#define cs_createbysocket(sock, type, blocking, proto) \
+	((*type)(sock, blocking, proto))
 #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_addrstr(handle) ((*(handle)->f_addrstr)(handle))
+#define cs_straddr(handle, str) ((*(handle)->f_straddr)(handle, str))
 
-const char MDF *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.
@@ -173,11 +225,14 @@ const char *cs_errmsg(int n);
 #define CSOUTSTATE 2
 #define CSNODATA   3
 #define CSWRONGBUF 4
-
-extern char *cs_errlist[];
+#define CSDENY     5
 
 /* backwards compatibility */
 #define CS_SR     PROTO_SR
 #define CS_Z3950  PROTO_Z3950
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif