X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fcomstack.h;h=12c9dc68de1a307fee270602dbb8141488a7adce;hb=a7b235097c10590dde6dfa1859590d4c4e930366;hp=c7c12f13c93674034fecdb6776f98c815fab9a92;hpb=372a500da226336c7bb4036e980be2587ad5fdeb;p=yaz-moved-to-github.git

diff --git a/include/comstack.h b/include/comstack.h
index c7c12f1..12c9dc6 100644
--- a/include/comstack.h
+++ b/include/comstack.h
@@ -1,10 +1,45 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
+ * Copyright (c) 1995, 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,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
  *
  * $Log: comstack.h,v $
- * Revision 1.1  1995-03-30 09:39:40  quinn
+ * Revision 1.6  1995-05-30 10:54:51  quinn
+ * Added some backwards compatibility to the comstack (CS_SR->PROTO_SR)
+ *
+ * Revision 1.5  1995/05/29  08:11:31  quinn
+ * Moved oid from odr/asn to util.
+ *
+ * Revision 1.4  1995/05/16  08:50:29  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.3  1995/04/20  15:12:44  quinn
+ * Cosmetic
+ *
+ * Revision 1.2  1995/04/17  11:28:17  quinn
+ * Smallish
+ *
+ * Revision 1.1  1995/03/30  09:39:40  quinn
  * Moved .h files to include directory
  *
  * Revision 1.11  1995/03/27  08:36:05  quinn
@@ -49,13 +84,13 @@
 #ifndef COMSTACK_H
 #define COMSTACK_H
 
+#include <oid.h>
 #include <dmalloc.h>
 
 #define COMSTACK_DEFAULT_TIMEOUT -1
 
 struct comstack;
 typedef struct comstack *COMSTACK;
-
 typedef COMSTACK (*CS_TYPE)(int blocking, int protocol);
 
 struct comstack
@@ -81,9 +116,7 @@ struct comstack
 #define CS_DISCON     2
 #define CS_LISTEN     3
 #define CS_DATA       4
-    int protocol;  /* what application protocol are we talking? */
-#define CS_Z3950      0
-#define CS_SR         1
+    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);
@@ -96,7 +129,6 @@ struct comstack
     int (*f_listen)(COMSTACK handle, char *addrp, int *addrlen);
     COMSTACK (*f_accept)(COMSTACK handle);
     int (*f_close)(COMSTACK handle);
-    /* to add: commands for the server side (bind, listen, accept) */
 };
 
 #define cs_put(handle, buf, size) ((*(handle)->f_put)(handle, buf, size))
@@ -130,4 +162,8 @@ const char *cs_strerror(COMSTACK h);
 
 extern char *cs_errlist[];
 
+/* backwards compatibility */
+#define CS_SR     PROTO_SR
+#define CS_Z3950  PROTO_Z3950
+
 #endif