Added referenceId handling for server.

[yazpp-moved-to-github.git] / src / yaz-z-assoc.cpp

diff --git a/src/yaz-z-assoc.cpp b/src/yaz-z-assoc.cpp
index e33b813..8782136 100644 (file)
--- a/src/yaz-z-assoc.cpp
+++ b/src/yaz-z-assoc.cpp
@@ -1,9 +1,24 @@
 /*
- * Copyright (c) 1998-2000, Index Data.
+ * Copyright (c) 1998-2001, Index Data.
  * See the file LICENSE for details.
  * 
  * $Log: yaz-z-assoc.cpp,v $
- * Revision 1.15  2000-10-11 11:58:17  adam
+ * Revision 1.20  2001-04-25 18:59:30  adam
+ * Added referenceId handling for server.
+ *
+ * Revision 1.19  2001/03/27 14:47:45  adam
+ * New server facility scheme.
+ *
+ * Revision 1.18  2001/03/26 14:43:49  adam
+ * New threaded PDU association.
+ *
+ * Revision 1.17  2001/01/04 14:25:25  heikki
+ * No SIGPIPES in windows...
+ *
+ * Revision 1.16  2000/12/14 16:00:39  adam
+ * Ignoring signal SIGPIPE.
+ *
+ * Revision 1.15  2000/10/11 11:58:17  adam
  * Moved header files to include/yaz++. Switched to libtool and automake.
  * Configure script creates yaz++-config script.
  *
@@ -60,6 +75,7 @@
  */
 
 #include <assert.h>
+#include <signal.h>
 
 #include <yaz/log.h>
 #include <yaz++/yaz-z-assoc.h>
@@ -67,6 +83,9 @@
 
 int Yaz_Z_Assoc::yaz_init_func()
 {
+#ifndef WIN32
+    signal (SIGPIPE, SIG_IGN);
+#endif
     nmem_init();
     return 1;
 }
@@ -131,6 +150,10 @@ void Yaz_Z_Assoc::recv_PDU(const char *buf, int len)
     {
        recv_Z_PDU (apdu);
     }
+    else
+    {
+       close();
+    }
 }
 
 Z_APDU *Yaz_Z_Assoc::create_Z_PDU(int type)
@@ -147,6 +170,75 @@ Z_APDU *Yaz_Z_Assoc::create_Z_PDU(int type)
     return apdu;
 }
 
+Z_ReferenceId **Yaz_Z_Assoc::get_referenceIdP(Z_APDU *apdu)
+{
+    switch (apdu->which)
+    {
+    case  Z_APDU_initRequest:
+       return &apdu->u.initRequest->referenceId; 
+    case  Z_APDU_initResponse:
+       return &apdu->u.initResponse->referenceId;
+    case  Z_APDU_searchRequest:
+       return &apdu->u.searchRequest->referenceId;
+    case  Z_APDU_searchResponse:
+       return &apdu->u.searchResponse->referenceId;
+    case  Z_APDU_presentRequest:
+       return &apdu->u.presentRequest->referenceId;
+    case  Z_APDU_presentResponse:
+       return &apdu->u.presentResponse->referenceId;
+    case  Z_APDU_deleteResultSetRequest:
+       return &apdu->u.deleteResultSetRequest->referenceId;
+    case  Z_APDU_deleteResultSetResponse:
+       return &apdu->u.deleteResultSetResponse->referenceId;
+    case  Z_APDU_accessControlRequest:
+       return &apdu->u.accessControlRequest->referenceId;
+    case  Z_APDU_accessControlResponse:
+       return &apdu->u.accessControlResponse->referenceId;
+    case  Z_APDU_resourceControlRequest:
+       return &apdu->u.resourceControlRequest->referenceId;
+    case  Z_APDU_resourceControlResponse:
+       return &apdu->u.resourceControlResponse->referenceId;
+    case  Z_APDU_triggerResourceControlRequest:
+       return &apdu->u.triggerResourceControlRequest->referenceId;
+    case  Z_APDU_resourceReportRequest:
+       return &apdu->u.resourceReportRequest->referenceId;
+    case  Z_APDU_resourceReportResponse:
+       return &apdu->u.resourceReportResponse->referenceId;
+    case  Z_APDU_scanRequest:
+       return &apdu->u.scanRequest->referenceId;
+    case  Z_APDU_scanResponse:
+       return &apdu->u.scanResponse->referenceId;
+    case  Z_APDU_sortRequest:
+       return &apdu->u.sortRequest->referenceId;
+    case  Z_APDU_sortResponse:
+       return &apdu->u.sortResponse->referenceId;
+    case  Z_APDU_segmentRequest:
+       return &apdu->u.segmentRequest->referenceId;
+    case  Z_APDU_extendedServicesRequest:
+       return &apdu->u.extendedServicesRequest->referenceId;
+    case  Z_APDU_extendedServicesResponse:
+       return &apdu->u.extendedServicesResponse->referenceId;
+    case  Z_APDU_close:
+       return &apdu->u.close->referenceId;
+    }
+    return 0;
+}
+
+void Yaz_Z_Assoc::transfer_referenceId(Z_APDU *from, Z_APDU *to)
+{
+    Z_ReferenceId **id_from = get_referenceIdP(from);
+    Z_ReferenceId **id_to = get_referenceIdP(to);
+    if (id_from && *id_from && id_to)
+    {
+       *id_to = (Z_ReferenceId*) odr_malloc (m_odr_out, sizeof(**id_to));
+       (*id_to)->size = (*id_to)->len = (*id_from)->len;
+       (*id_to)->buf = (unsigned char*) odr_malloc (m_odr_out, (*id_to)->len);
+       memcpy ((*id_to)->buf, (*id_from)->buf, (*id_to)->len);
+    }
+    else if (id_to)
+       *id_to = 0;
+}
+
 int Yaz_Z_Assoc::send_Z_PDU(Z_APDU *apdu)
 {
     char *buf;
@@ -182,13 +274,13 @@ Z_APDU *Yaz_Z_Assoc::decode_Z_PDU(const char *buf, int len)
 
 int Yaz_Z_Assoc::encode_Z_PDU(Z_APDU *apdu, char **buf, int *len)
 {
+    if (m_APDU_file)
+       z_APDU(m_odr_print, &apdu, 0, "encode");
     if (!z_APDU(m_odr_out, &apdu, 0, 0))
     {
        logf (LOG_LOG, "yaz_Z_Assoc::encode_Z_PDU failed");
         return -1;
     }
-    if (m_APDU_file)
-       z_APDU(m_odr_print, &apdu, 0, "encode");
     *buf = odr_getbuf (m_odr_out, len, 0);
     odr_reset (m_odr_out);
     return *len;
@@ -342,13 +434,12 @@ Z_ReferenceId* Yaz_Z_Assoc::getRefID(char* str)
 {
     Z_ReferenceId* id = NULL;
 
-    if ( str )
+    if (str)
     {
         id = (Z_ReferenceId*) odr_malloc (m_odr_out, sizeof(*id));
         id->size = id->len = strlen(str);
         id->buf = (unsigned char *) str;
     }
-
     return id;
 }