X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fsession.h;h=4254cd2c1945a61ba1498715cba596a52debb73d;hp=bf3fc3e8ac9c13b4d29b9b5d40176289820261b0;hb=c71d717ada2a9ef730d527f161eb5ba9aa641a9f;hpb=fe5f2da0c0c4ae00864cc72a36714e90405456e4

diff --git a/server/session.h b/server/session.h
index bf3fc3e..4254cd2 100644
--- a/server/session.h
+++ b/server/session.h
@@ -1,70 +1,64 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (C) 1995-2003, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: session.h,v $
- * 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.29 2003-02-17 21:23:31 adam Exp $
  */
 
 #ifndef SESSION_H
 #define SESSION_H
 
-#include <comstack.h>
-#include <odr.h>
-#include <oid.h>
-#include <proto.h>
-#include <eventl.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 */
-    ODR_MEM request_mem;    /* ODR memory handle for request */
+    Z_GDU *gdu_request;     /* Current request */
+    Z_APDU *apdu_request;   /* Current Z39.50 request */
+    NMEM request_mem;    /* memory handle for request */
 
     int size_response;     /* size of buffer */
     int len_response;      /* length of encoded data */
     char *response;        /* encoded data waiting for transmission */
 
+    void *clientData;
     struct request *next;
+    struct request_q *q; 
 } request;
 
 typedef struct request_q
 {
     request *head;
     request *tail;
+    request *list;
     int num;
 } 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 */
@@ -81,10 +75,18 @@ typedef struct association
     void *backend;                /* backend handle */
     request_q incoming;           /* Q of incoming PDUs */
     request_q outgoing;           /* Q of outgoing data buffers (enc. PDUs) */
+    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;
 } association;
 
 association *create_association(IOCHAN channel, COMSTACK link);
@@ -94,8 +96,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);
-request *request_get(void);
+void request_delq(request_q *q);
+request *request_get(request_q *q);
 void request_release(request *r);
 
+int statserv_must_terminate(void);
+
 #endif