Init member timeout_this in socket manager (valgrind warnig)

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

diff --git a/src/yaz-z-server.cpp b/src/yaz-z-server.cpp
index 98e5929..06992b7 100644 (file)
--- a/src/yaz-z-server.cpp
+++ b/src/yaz-z-server.cpp
@@ -1,30 +1,32 @@
 /*
- * Copyright (c) 2000-2001, Index Data.
+ * Copyright (c) 2000-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-z-server.cpp,v 1.13 2001-11-04 22:36:21 adam Exp $
+ * $Id: yaz-z-server.cpp,v 1.22 2005-06-08 13:28:06 adam Exp $
  */
 
 #include <yaz/log.h>
-#include <yaz++/yaz-z-server.h>
+#include <yaz++/z-server.h>
 
-Yaz_Z_Server::Yaz_Z_Server(IYaz_PDU_Observable *the_PDU_Observable)
-    : Yaz_Z_Assoc(the_PDU_Observable)
+using namespace yazpp_1;
+
+Z_Server::Z_Server(IPDU_Observable *the_PDU_Observable)
+    : Z_Assoc(the_PDU_Observable)
 {
     m_facilities = 0;
 }
 
-Yaz_Z_Server::~Yaz_Z_Server()
+Z_Server::~Z_Server()
 {
     facility_reset();
 }
 
-void Yaz_Z_Server::facility_reset ()
+void Z_Server::facility_reset ()
 {
-    Yaz_Z_Server_Facility_Info *p = m_facilities;
+    Z_Server_Facility_Info *p = m_facilities;
     while (p)
     {
-       Yaz_Z_Server_Facility_Info *p_next = p->m_next;
+       Z_Server_Facility_Info *p_next = p->m_next;
 
        delete [] p->m_name;
        delete p;
@@ -33,14 +35,14 @@ void Yaz_Z_Server::facility_reset ()
     m_facilities = 0;
 }
 
-void Yaz_Z_Server::facility_add(IYaz_Server_Facility *facility,
-                               const char *name)
+void Z_Server::facility_add(IServer_Facility *facility,
+                           const char *name)
 {
-    Yaz_Z_Server_Facility_Info **p = &m_facilities;
+    Z_Server_Facility_Info **p = &m_facilities;
     while (*p)
        p = &(*p)->m_next;
 
-    *p = new Yaz_Z_Server_Facility_Info;
+    *p = new Z_Server_Facility_Info;
 
     (*p)->m_next = 0;
     (*p)->m_name = new char [strlen(name)+1];
@@ -48,9 +50,17 @@ void Yaz_Z_Server::facility_add(IYaz_Server_Facility *facility,
     (*p)->m_facility = facility;
 }
 
-void Yaz_Z_Server::recv_Z_PDU (Z_APDU *apdu_request)
+void Z_Server::recv_GDU (Z_GDU *apdu, int len)
+{
+    if (apdu->which == Z_GDU_Z3950)
+       recv_Z_PDU(apdu->u.z3950, len);
+    else
+       delete this;
+}
+
+void Z_Server::recv_Z_PDU (Z_APDU *apdu_request, int len)
 {   
-    Yaz_Z_Server_Facility_Info *f = m_facilities;
+    Z_Server_Facility_Info *f = m_facilities;
     
     if (apdu_request->which == Z_APDU_initRequest)
     {
@@ -77,7 +87,7 @@ void Yaz_Z_Server::recv_Z_PDU (Z_APDU *apdu_request)
            f = f->m_next;
        }
        transfer_referenceId(apdu_request, apdu_response);
-       send_Z_PDU(apdu_response);
+       send_Z_PDU(apdu_response, 0);
     }
     else
     {
@@ -92,7 +102,7 @@ void Yaz_Z_Server::recv_Z_PDU (Z_APDU *apdu_request)
        }
        if (!taken)
        {
-           yaz_log (LOG_WARN, "unhandled request = %d", apdu_request->which);
+           yaz_log (YLOG_WARN, "unhandled request = %d", apdu_request->which);
            delete this;
        }
     }
@@ -101,7 +111,7 @@ void Yaz_Z_Server::recv_Z_PDU (Z_APDU *apdu_request)
 /*
  * database record.
  */
-void Yaz_Z_ServerUtility::create_databaseRecord (
+void Z_ServerUtility::create_databaseRecord (
     ODR odr, Z_NamePlusRecord *rec, const char *dbname, int format,
     const void *buf, int len)
 {
@@ -114,42 +124,35 @@ void Yaz_Z_ServerUtility::create_databaseRecord (
 /*
  * surrogate diagnostic.
  */
-void Yaz_Z_ServerUtility::create_surrogateDiagnostics(
+void Z_ServerUtility::create_surrogateDiagnostics(
     ODR odr, Z_NamePlusRecord *rec, const char *dbname,
     int error, char *const addinfo)
 {
-    int oid[OID_SIZE];
     int *err = (int *)odr_malloc (odr, sizeof(*err));
-    oident bib1;
     Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (odr, sizeof(*drec));
     Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
        odr_malloc (odr, sizeof(*dr));
     
-    bib1.proto = PROTO_Z3950;
-    bib1.oclass = CLASS_DIAGSET;
-    bib1.value = VAL_BIB1;
-
-    yaz_log(LOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo);
+    yaz_log(YLOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo);
     *err = error;
     rec->databaseName = dbname ? odr_strdup (odr, dbname) : 0;
     rec->which = Z_NamePlusRecord_surrogateDiagnostic;
     rec->u.surrogateDiagnostic = drec;
     drec->which = Z_DiagRec_defaultFormat;
     drec->u.defaultFormat = dr;
-    dr->diagnosticSetId = odr_oiddup (odr,
-                                      oid_ent_to_oid(&bib1, oid));
+    dr->diagnosticSetId =
+        yaz_oidval_to_z3950oid (odr, CLASS_DIAGSET, VAL_BIB1);
+
     dr->condition = err;
     dr->which = Z_DefaultDiagFormat_v2Addinfo;
     dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : "");
 }
 
-Z_Records *Yaz_Z_ServerUtility::create_nonSurrogateDiagnostics (
+Z_Records *Z_ServerUtility::create_nonSurrogateDiagnostics (
     ODR odr, int error, const char *addinfo)
 {
-    int oid[OID_SIZE];
     Z_Records *rec = (Z_Records *)
         odr_malloc (odr, sizeof(*rec));
-    oident bib1;
     int *err = (int *)
         odr_malloc (odr, sizeof(*err));
     Z_DiagRec *drec = (Z_DiagRec *)
@@ -157,17 +160,35 @@ Z_Records *Yaz_Z_ServerUtility::create_nonSurrogateDiagnostics (
     Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
         odr_malloc (odr, sizeof(*dr));
 
-    bib1.proto = PROTO_Z3950;
-    bib1.oclass = CLASS_DIAGSET;
-    bib1.value = VAL_BIB1;
-
     *err = error;
     rec->which = Z_Records_NSD;
     rec->u.nonSurrogateDiagnostic = dr;
     dr->diagnosticSetId =
-        odr_oiddup (odr, oid_ent_to_oid(&bib1, oid));
+        yaz_oidval_to_z3950oid (odr, CLASS_DIAGSET, VAL_BIB1);
+
     dr->condition = err;
     dr->which = Z_DefaultDiagFormat_v2Addinfo;
     dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : "");
     return rec;
 }
+
+void Z_ServerUtility::create_diagnostics (
+    ODR odr, int error, const char *addinfo,
+    Z_DiagRec ***dreca, int *num)
+{
+    Z_DiagRec *drec = (Z_DiagRec *) odr_malloc (odr, sizeof(*drec));
+    Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
+        odr_malloc (odr, sizeof(*dr));
+    
+    *num = 1;
+    *dreca = (Z_DiagRec **) odr_malloc (odr, sizeof(*dreca));
+    (*dreca)[0] = drec;
+        
+    drec->which = Z_DiagRec_defaultFormat;
+    drec->u.defaultFormat = dr;
+    dr->diagnosticSetId =
+        yaz_oidval_to_z3950oid (odr, CLASS_DIAGSET, VAL_BIB1);
+    dr->condition = odr_intdup (odr, error);
+    dr->which = Z_DefaultDiagFormat_v2Addinfo;
+    dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : "");
+}