Put proper reference IDs in response PDUs properly.

[metaproxy-moved-to-github.git] / src / util.cpp

diff --git a/src/util.cpp b/src/util.cpp
index 479aebf..fc304ca 100644 (file)
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,4 +1,4 @@
-/* $Id: util.cpp,v 1.3 2005-10-30 18:51:21 adam Exp $
+/* $Id: util.cpp,v 1.4 2006-01-13 15:09:35 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -48,9 +48,10 @@ yp2::odr::operator ODR() const
     return m_odr;
 }
 
-Z_APDU *yp2::odr::create_close(int reason, const char *addinfo)
+Z_APDU *yp2::odr::create_close(Z_APDU *in_apdu,
+                               int reason, const char *addinfo)
 {
-    Z_APDU *apdu = zget_APDU(m_odr, Z_APDU_close);
+    Z_APDU *apdu = create_APDU(Z_APDU_close, in_apdu);
     
     *apdu->u.close->closeReason = reason;
     if (addinfo)
@@ -58,9 +59,37 @@ Z_APDU *yp2::odr::create_close(int reason, const char *addinfo)
     return apdu;
 }
 
-Z_APDU *yp2::odr::create_initResponse(int error, const char *addinfo)
+Z_APDU *yp2::odr::create_APDU(int type, Z_APDU *in_apdu)
 {
-    Z_APDU *apdu = zget_APDU(m_odr, Z_APDU_initResponse);
+    return yp2::util::create_APDU(m_odr, type, in_apdu);
+}
+
+Z_APDU *yp2::util::create_APDU(ODR odr, int type, Z_APDU *in_apdu)
+{
+    Z_APDU *out_apdu = zget_APDU(odr, type);
+
+    Z_ReferenceId **id_to = yp2::util::get_referenceId(out_apdu);
+    *id_to = 0;
+    if (in_apdu)
+    {
+        Z_ReferenceId **id_from = yp2::util::get_referenceId(in_apdu);
+        if (id_from && *id_from && id_to)
+        {
+            *id_to = (Z_ReferenceId*) odr_malloc (odr, sizeof(**id_to));
+            (*id_to)->size = (*id_to)->len = (*id_from)->len;
+            (*id_to)->buf = (unsigned char*) odr_malloc(odr, (*id_to)->len);
+            memcpy((*id_to)->buf, (*id_from)->buf, (*id_to)->len);
+        }
+        else if (id_to)
+            *id_to = 0;
+    }
+    return out_apdu;
+}
+
+Z_APDU *yp2::odr::create_initResponse(Z_APDU *in_apdu,
+                                      int error, const char *addinfo)
+{
+    Z_APDU *apdu = create_APDU(Z_APDU_initResponse, in_apdu);
     if (error)
     {
         apdu->u.initResponse->userInformationField =
@@ -70,6 +99,114 @@ Z_APDU *yp2::odr::create_initResponse(int error, const char *addinfo)
     return apdu;
 }
 
+Z_APDU *yp2::odr::create_searchResponse(Z_APDU *in_apdu,
+                                        int error, const char *addinfo)
+{
+    Z_APDU *apdu = create_APDU(Z_APDU_searchResponse, in_apdu);
+    if (error)
+    {
+        Z_Records *rec = (Z_Records *) odr_malloc(m_odr, sizeof(Z_Records));
+        *apdu->u.searchResponse->searchStatus = 0;
+        apdu->u.searchResponse->records = rec;
+        rec->which = Z_Records_NSD;
+        rec->u.nonSurrogateDiagnostic =
+            zget_DefaultDiagFormat(m_odr, error, addinfo);
+        
+    }
+    return apdu;
+}
+
+Z_APDU *yp2::odr::create_presentResponse(Z_APDU *in_apdu,
+                                         int error, const char *addinfo)
+{
+    Z_APDU *apdu = create_APDU(Z_APDU_presentResponse, in_apdu);
+    if (error)
+    {
+        Z_Records *rec = (Z_Records *) odr_malloc(m_odr, sizeof(Z_Records));
+        apdu->u.presentResponse->records = rec;
+        rec->which = Z_Records_NSD;
+        rec->u.nonSurrogateDiagnostic =
+            zget_DefaultDiagFormat(m_odr, error, addinfo);
+    }
+    return apdu;
+}
+
+Z_APDU *yp2::odr::create_scanResponse(Z_APDU *in_apdu,
+                                      int error, const char *addinfo)
+{
+    Z_APDU *apdu = create_APDU(Z_APDU_scanResponse, in_apdu);
+    if (error)
+    {
+        Z_ScanResponse *res = apdu->u.scanResponse;
+        res->entries = (Z_ListEntries *) odr_malloc(m_odr, sizeof(*res->entries));
+        *res->scanStatus = Z_Scan_failure;
+
+        res->entries->num_entries = 0;
+        res->entries->entries = 0;
+        res->entries->num_nonsurrogateDiagnostics = 1;
+        res->entries->nonsurrogateDiagnostics = (Z_DiagRec **)
+            odr_malloc(m_odr, sizeof(Z_DiagRec *));
+        res->entries->nonsurrogateDiagnostics[0] = 
+            zget_DiagRec(m_odr, error, addinfo);
+    }
+    return apdu;
+}
+
+Z_ReferenceId **yp2::util::get_referenceId(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;
+}
+
+
 /*
  * Local variables:
  * c-basic-offset: 4