X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fsession.h;h=6e8f8b0180644e9fea8619451127f3ce335834d2;hp=b5b6db26155404ff0492a16ceb6b73f2ffe5d18b;hb=4d531a1a9131d69c3b6c27fbac42837e22cff61c;hpb=ee1eaa955f545d57c0ff8ce4ce210db95a4d817c

diff --git a/server/session.h b/server/session.h
index b5b6db2..6e8f8b0 100644
--- a/server/session.h
+++ b/server/session.h
@@ -1,78 +1,34 @@
 /*
- * Copyright (C) 1995-1998, Index Data I/S 
+ * Copyright (C) 1995-2003, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: session.h,v $
- * Revision 1.14  1998-02-10 11:03:57  adam
- * Added support for extended handlers in backend server interface.
- *
- * Revision 1.13  1998/01/29 13:30:23  adam
- * Better event handle system for NT/Unix.
- *
- * Revision 1.12  1997/09/01 08:53:01  adam
- * New windows NT/95 port using MSV5.0. The test server 'ztest' was
- * moved a separate directory. MSV5.0 project server.dsp created.
- * As an option, the server can now operate as an NT service.
- *
- * Revision 1.11  1995/11/08 17:41:40  quinn
- * Smallish.
- *
- * Revision 1.10  1995/08/29  11:18:01  quinn
- * Added code to receive close
- *
- * Revision 1.9  1995/06/16  10:31:38  quinn
- * Added session timeout.
- *
- * Revision 1.8  1995/05/17  08:42:28  quinn
- * Transfer auth info to backend. Allow backend to reject init gracefully.
- *
- * Revision 1.7  1995/05/16  08:51:08  quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.6  1995/05/15  11:56:41  quinn
- * Asynchronous facilities. Restructuring of seshigh code.
- *
- * Revision 1.5  1995/04/20  15:13:01  quinn
- * Cosmetic
- *
- * Revision 1.4  1995/04/10  10:23:39  quinn
- * Some work to add scan and other things.
- *
- * Revision 1.3  1995/03/30  09:09:27  quinn
- * Added state-handle and some support for asynchronous activities.
- *
- * Revision 1.2  1995/03/27  08:34:29  quinn
- * Added dynamic server functionality.
- * Released bindings to session.c (is now redundant)
- *
- * Revision 1.1  1995/03/14  10:28:02  quinn
- * More work on demo server.
- *
- *
+ * $Id: session.h,v 1.27 2003-01-06 08:20:28 adam Exp $
  */
 
 #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 {
+   	REQUEST_IDLE,    /* the request is just sitting in the queue */
+	REQUEST_PENDING  /* operation pending (b'end processing or network I/O*/
+	/* this list will have more elements when acc/res control is added */
+} request_state;
+
 typedef struct request
 {
     int len_refid;          /* length of referenceid */
     char *refid;            /* referenceid */
-    enum {
-    	REQUEST_IDLE,    /* the request is just sitting in the queue */
-	REQUEST_PENDING  /* operation pending (b'end processing or network I/O*/
-	/* this list will have more elements when acc/res control is added */
-    } state;
+    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 */
@@ -95,6 +51,13 @@ typedef struct request_q
 /*
  * association state.
  */
+typedef enum
+{
+    ASSOC_NEW,                /* not initialized yet */
+    ASSOC_UP,                 /* normal operation */
+    ASSOC_DEAD                /* dead. Close if input arrives */
+} association_state;
+
 typedef struct association
 {
     IOCHAN client_chan;           /* event-loop control */
@@ -111,21 +74,27 @@ typedef struct association
     void *backend;                /* backend handle */
     request_q incoming;           /* Q of incoming PDUs */
     request_q outgoing;           /* Q of outgoing data buffers (enc. PDUs) */
-    enum
-    {
-    	ASSOC_NEW,                /* not initialized yet */
-	ASSOC_UP,                 /* normal operation */
-	ASSOC_DEAD                /* dead. Close if input arrives */
-    } state;
+    association_state state;
 
     /* session parameters */
     int preferredMessageSize;
     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);
@@ -135,9 +104,12 @@ void ir_session(IOCHAN h, int event);
 void request_enq(request_q *q, request *r);
 request *request_head(request_q *q);
 request *request_deq(request_q *q);
+request *request_deq_x(request_q *q, request *r);
 void request_initq(request_q *q);
 void request_delq(request_q *q);
 request *request_get(request_q *q);
 void request_release(request *r);
 
+int statserv_must_terminate(void);
+
 #endif