X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fcomstack.h;h=8e619cb54bfa9da8191833bd67a53d77d8e148e4;hp=b931987e8c2cedf975ceea6157688a0b5d522c6c;hb=4ae699c927bc26f3550d1a8ca911e8d1fe75dbfc;hpb=657fb99115b87a5244e9a33bbe4ca3d9d18849c4

diff --git a/include/comstack.h b/include/comstack.h
index b931987..8e619cb 100644
--- a/include/comstack.h
+++ b/include/comstack.h
@@ -24,7 +24,22 @@
  * OF THIS SOFTWARE.
  *
  * $Log: comstack.h,v $
- * Revision 1.8  1995-09-27 15:02:46  quinn
+ * 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
+ * Windows-support changes
+ *
+ * Revision 1.8  1995/09/27  15:02:46  quinn
  * Modified function heads & prototypes.
  *
  * Revision 1.7  1995/06/19  12:38:24  quinn
@@ -92,7 +107,7 @@
 
 #include <yconfig.h>
 #include <oid.h>
-#include <dmalloc.h>
+#include <xmalloc.h>
 
 #define COMSTACK_DEFAULT_TIMEOUT -1  /* not used yet */
 
@@ -103,7 +118,7 @@ typedef COMSTACK (*CS_TYPE)(int blocking, int protocol);
 struct comstack
 {
     CS_TYPE type;
-    int errno;     /* current error code of this stack */
+    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) */
@@ -136,6 +151,7 @@ struct comstack
     int (*f_listen)(COMSTACK handle, char *addrp, int *addrlen);
     COMSTACK (*f_accept)(COMSTACK handle);
     int (*f_close)(COMSTACK handle);
+    char *(*f_addrstr)(COMSTACK handle);
 };
 
 #define cs_put(handle, buf, size) ((*(handle)->f_put)(handle, buf, size))
@@ -152,10 +168,12 @@ struct comstack
 #define cs_fileno(handle) ((handle)->iofile)
 #define cs_stackerr(handle) ((handle)->stackerr)
 #define cs_getstate(handle) ((handle)->getstate)
-#define cs_errno(handle) ((handle)->errno)
+#define cs_errno(handle) ((handle)->cerrno)
 #define cs_getproto(handle) ((handle)->protocol)
+#define cs_addrstr(handle) ((*(handle)->f_addrstr)(handle))
 
-const char MDF *cs_strerror(COMSTACK h);
+const char *cs_strerror(COMSTACK h);
+const char *cs_errmsg(int n);
 
 /*
  * error management.