X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fsession.h;h=2e5503549b00e73d2d30a031bcba8b21abcd8330;hp=f0f96ebb51a2cc8f9acf49a66dfb29a966f4d2f9;hb=c5f9b67c889e65446bcbf727bef3705229c3fd7f;hpb=044d170f0a963555486df54653cd2fdc5815928b

diff --git a/server/session.h b/server/session.h
index f0f96eb..2e55035 100644
--- a/server/session.h
+++ b/server/session.h
@@ -1,10 +1,42 @@
 /*
- * Copyright (C) 1995-1998, Index Data I/S 
+ * Copyright (C) 1995-1999, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: session.h,v $
- * Revision 1.15  1998-02-11 11:53:36  adam
+ * Revision 1.25  2001-07-19 19:51:42  adam
+ * Added typecasts to make C++ happy.
+ *
+ * Revision 1.24  2000/11/23 10:58:32  adam
+ * SSL comstack support. Separate POSIX thread support library.
+ *
+ * Revision 1.23  2000/04/05 07:39:55  adam
+ * Added shared library support (libtool).
+ *
+ * Revision 1.22  2000/03/20 19:06:25  adam
+ * Added Segment request for fronend server. Work on admin for client.
+ *
+ * Revision 1.21  1999/11/30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.20  1999/10/11 10:01:24  adam
+ * Implemented bend_sort_rr handler for frontend server.
+ *
+ * Revision 1.19  1999/04/20 09:56:48  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.18  1998/08/03 10:23:57  adam
+ * Fixed bug regarding Options for Sort.
+ *
+ * Revision 1.17  1998/07/20 12:38:43  adam
+ * Implemented delete result set service to server API.
+ *
+ * Revision 1.16  1998/03/31 11:07:45  adam
+ * Furhter work on UNIverse resource report.
+ * Added Extended Services handling in frontend server.
+ *
+ * Revision 1.15  1998/02/11 11:53:36  adam
  * Changed code so that it compiles as C++.
  *
  * Revision 1.14  1998/02/10 11:03:57  adam
@@ -58,11 +90,11 @@
 #ifndef SESSION_H
 #define SESSION_H
 
-#include <comstack.h>
-#include <odr.h>
-#include <oid.h>
-#include <proto.h>
 #include <sys/types.h>
+#include <yaz/comstack.h>
+#include <yaz/odr.h>
+#include <yaz/oid.h>
+#include <yaz/proto.h>
 #include "eventl.h"
 
 typedef enum {
@@ -77,7 +109,7 @@ typedef struct request
     char *refid;            /* referenceid */
     request_state state;
 
-    Z_APDU *request;        /* Current request */
+    Z_APDU *apdu_request;   /* Current request */
     NMEM request_mem;    /* memory handle for request */
 
     int size_response;     /* size of buffer */
@@ -102,9 +134,9 @@ typedef struct request_q
  */
 typedef enum
 {
-   	ASSOC_NEW,                /* not initialized yet */
-	ASSOC_UP,                 /* normal operation */
-	ASSOC_DEAD                /* dead. Close if input arrives */
+    ASSOC_NEW,                /* not initialized yet */
+    ASSOC_UP,                 /* normal operation */
+    ASSOC_DEAD                /* dead. Close if input arrives */
 } association_state;
 
 typedef struct association
@@ -130,9 +162,20 @@ typedef struct association
     int maximumRecordSize;
     int version;                  /* highest version-bit set (2 or 3) */
 
+    unsigned cs_get_mask;
+    unsigned cs_put_mask;
+    unsigned cs_accept_mask;
+
+    struct bend_initrequest *init;
+#if 0
     int (*bend_sort) ();
     int (*bend_search) ();
     int (*bend_present) ();
+    int (*bend_esrequest) ();
+    int (*bend_delete) ();
+    int (*bend_scan) ();
+    int (*bend_segment) ();
+#endif
 } association;
 
 association *create_association(IOCHAN channel, COMSTACK link);