X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-z-assoc.cpp;h=e9f4b199cedb1a9a304e832753a6ba9ee42ba04b;hb=c96f00d22f0af97ad7fd5d8687fa0b65b67de77e;hp=94b8638281b388fb87fcd65dda9c93acf5dcef11;hpb=5238ea544d4a2b414592f1d503f5ed83f305b21b;p=yazpp-moved-to-github.git

diff --git a/src/yaz-z-assoc.cpp b/src/yaz-z-assoc.cpp
index 94b8638..e9f4b19 100644
--- a/src/yaz-z-assoc.cpp
+++ b/src/yaz-z-assoc.cpp
@@ -3,7 +3,13 @@
  * See the file LICENSE for details.
  * 
  * $Log: yaz-z-assoc.cpp,v $
- * Revision 1.19  2001-03-27 14:47:45  adam
+ * Revision 1.21  2001-08-13 16:39:12  adam
+ * PDU_Assoc keeps track of children. Using yaz_log instead of logf.
+ *
+ * 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
@@ -141,7 +147,7 @@ Yaz_Z_Assoc::~Yaz_Z_Assoc()
 
 void Yaz_Z_Assoc::recv_PDU(const char *buf, int len)
 {
-    logf (m_log, "recv_PDU len=%d", len);
+    yaz_log (m_log, "recv_PDU len=%d", len);
     Z_APDU *apdu = decode_Z_PDU (buf, len);
     if (apdu)
     {
@@ -167,6 +173,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;
@@ -185,10 +260,10 @@ Z_APDU *Yaz_Z_Assoc::decode_Z_PDU(const char *buf, int len)
 
     if (!z_APDU(m_odr_in, &apdu, 0, 0))
     {
-        logf(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ",
+        yaz_log(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ",
              odr_errmsg(odr_geterror(m_odr_in)),
              odr_offset(m_odr_in));
-        logf(LOG_LOG, "PDU dump:");
+        yaz_log(LOG_LOG, "PDU dump:");
         odr_dumpBER(yaz_log_file(), buf, len);
         return 0;
     }
@@ -206,7 +281,7 @@ int Yaz_Z_Assoc::encode_Z_PDU(Z_APDU *apdu, char **buf, int *len)
 	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");
+	yaz_log (LOG_LOG, "yaz_Z_Assoc::encode_Z_PDU failed");
         return -1;
     }
     *buf = odr_getbuf (m_odr_out, len, 0);