Fix sample PQF

[yaz-moved-to-github.git] / server / session.h

diff --git a/server/session.h b/server/session.h
index deb4c20..4254cd2 100644 (file)
--- a/server/session.h
+++ b/server/session.h
@@ -1,85 +1,19 @@
 /*
- * Copyright (C) 1995-1999, Index Data
+ * Copyright (C) 1995-2003, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: session.h,v $
- * 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
- * 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.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 <sys/types.h>
+#include <yaz/comstack.h>
+#include <yaz/odr.h>
+#include <yaz/oid.h>
+#include <yaz/proto.h>
 #include "eventl.h"
 
 typedef enum {
@@ -94,7 +28,8 @@ typedef struct request
     char *refid;            /* referenceid */
     request_state state;
 
-    Z_APDU *request;        /* Current 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 */
@@ -147,12 +82,11 @@ typedef struct association
     int maximumRecordSize;
     int version;                  /* highest version-bit set (2 or 3) */
 
-    int (*bend_sort) ();
-    int (*bend_search) ();
-    int (*bend_present) ();
-    int (*bend_esrequest) ();
-    int (*bend_delete) ();
-    int (*bend_scan) ();
+    unsigned cs_get_mask;
+    unsigned cs_put_mask;
+    unsigned cs_accept_mask;
+
+    struct bend_initrequest *init;
 } association;
 
 association *create_association(IOCHAN channel, COMSTACK link);
@@ -168,4 +102,6 @@ void request_delq(request_q *q);
 request *request_get(request_q *q);
 void request_release(request *r);
 
+int statserv_must_terminate(void);
+
 #endif