GFS: Allow multiple listenrefs YAZ-554

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

diff --git a/src/session.h b/src/session.h
index e0cba4c..90ee0b1 100644 (file)
--- a/src/session.h
+++ b/src/session.h
@@ -1,8 +1,28 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
- * See the file LICENSE for details.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2013 Index Data.
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Index Data nor the names of its contributors
+ *       may be used to endorse or promote products derived from this
+ *       software without specific prior written permission.
  *
- * $Id: session.h,v 1.13 2007-01-03 08:42:15 adam Exp $
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /**
  * \file session.h
@@ -13,8 +33,8 @@
 
 #include <yaz/comstack.h>
 #include <yaz/cql.h>
+#include <yaz/ccl.h>
 #include <yaz/odr.h>
-#include <yaz/oid.h>
 #include <yaz/proto.h>
 #include <yaz/backend.h>
 #include <yaz/retrieval.h>
@@ -23,8 +43,10 @@
 struct gfs_server {
     statserv_options_block cb;
     char *host;
-    int listen_ref;
+    char *id;
+    int *listen_ref;
     cql_transform_t cql_transform;
+    CCL_bibset ccl_transform;
     void *server_node_ptr;
     char *directory;
     char *docpath;
@@ -47,8 +69,6 @@ typedef enum {
 
 typedef struct request
 {
-    int len_refid;          /* length of referenceid */
-    char *refid;            /* referenceid */
     request_state state;
 
     Z_GDU *gdu_request;     /* Current request */
@@ -61,7 +81,7 @@ typedef struct request
 
     void *clientData;
     struct request *next;
-    struct request_q *q; 
+    struct request_q *q;
 } request;
 
 typedef struct request_q
@@ -77,8 +97,8 @@ typedef struct request_q
  */
 typedef enum
 {
-    ASSOC_NEW,                /* not initialized yet */
-    ASSOC_UP,                 /* normal operation */
+    ASSOC_NEW,                /* not initialized yet or HTTP session */
+    ASSOC_UP,                 /* Z39.50 session is UP */
     ASSOC_DEAD                /* dead. Close if input arrives */
 } association_state;
 
@@ -105,9 +125,9 @@ 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;
+    int cs_get_mask;
+    int cs_put_mask;
+    int cs_accept_mask;
 
     struct bend_initrequest *init;
     statserv_options_block *last_control;
@@ -129,8 +149,6 @@ void request_delq(request_q *q);
 request *request_get(request_q *q);
 void request_release(request *r);
 
-int statserv_must_terminate(void);
-
 int control_association(association *assoc, const char *host, int force);
 
 int ir_read(IOCHAN h, int event);
@@ -139,6 +157,7 @@ int ir_read(IOCHAN h, int event);
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab