X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-z-assoc.cpp;h=f6acc2d16a714710d79a55a9be95922be263999d;hp=6e75c30ad84a333029a27c44f1b786c29e589cce;hb=e432b52c33a684e9f90627b971d14da6b362daff;hpb=eea2caea1263bed0aae268f72d985cbb1822ac30 diff --git a/src/yaz-z-assoc.cpp b/src/yaz-z-assoc.cpp index 6e75c30..f6acc2d 100644 --- a/src/yaz-z-assoc.cpp +++ b/src/yaz-z-assoc.cpp @@ -1,16 +1,17 @@ /* - * Copyright (c) 1998-2004, Index Data. + * Copyright (c) 1998-2007, Index Data. * See the file LICENSE for details. * - * $Id: yaz-z-assoc.cpp,v 1.37 2005-06-08 13:28:06 adam Exp $ + * $Id: yaz-z-assoc.cpp,v 1.44 2008-01-21 15:57:28 adam Exp $ */ #include #include #include -#include +#include #include +#include using namespace yazpp_1; @@ -41,23 +42,23 @@ void Z_Assoc::set_APDU_log(const char *fname) { if (m_APDU_file && m_APDU_file != stderr) { - fclose (m_APDU_file); - m_APDU_file = 0; + fclose (m_APDU_file); + m_APDU_file = 0; } delete [] m_APDU_fname; m_APDU_fname = 0; if (fname) { - m_APDU_fname = new char[strlen(fname)+1]; - strcpy (m_APDU_fname, fname); - if (!strcmp(fname, "-")) - m_APDU_file = stderr; - else if (*fname == '\0') - m_APDU_file = 0; - else - m_APDU_file = fopen (fname, "a"); - odr_setprint(m_odr_print, m_APDU_file); + m_APDU_fname = new char[strlen(fname)+1]; + strcpy (m_APDU_fname, fname); + if (!strcmp(fname, "-")) + m_APDU_file = stderr; + else if (*fname == '\0') + m_APDU_file = 0; + else + m_APDU_file = fopen (fname, "a"); + odr_setprint(m_odr_print, m_APDU_file); } } @@ -90,12 +91,12 @@ void Z_Assoc::recv_PDU(const char *buf, int len) Z_GDU *apdu = decode_GDU (buf, len); if (apdu) { - recv_GDU (apdu, len); + recv_GDU (apdu, len); } else { - close(); - failNotify(); + close(); + failNotify(); } } @@ -104,11 +105,11 @@ Z_APDU *Z_Assoc::create_Z_PDU(int type) Z_APDU *apdu = zget_APDU(m_odr_out, type); if (apdu->which == Z_APDU_initRequest) { - Z_InitRequest * p = apdu->u.initRequest; - char *newName = (char*) odr_malloc(m_odr_out, 50); - strcpy (newName, p->implementationName); - strcat (newName, " YAZ++"); - p->implementationName = newName; + Z_InitRequest * p = apdu->u.initRequest; + char *newName = (char*) odr_malloc(m_odr_out, 50); + strcpy (newName, p->implementationName); + strcat (newName, " YAZ++"); + p->implementationName = newName; } return apdu; } @@ -118,51 +119,51 @@ Z_ReferenceId **Z_Assoc::get_referenceIdP(Z_APDU *apdu) switch (apdu->which) { case Z_APDU_initRequest: - return &apdu->u.initRequest->referenceId; + return &apdu->u.initRequest->referenceId; case Z_APDU_initResponse: - return &apdu->u.initResponse->referenceId; + return &apdu->u.initResponse->referenceId; case Z_APDU_searchRequest: - return &apdu->u.searchRequest->referenceId; + return &apdu->u.searchRequest->referenceId; case Z_APDU_searchResponse: - return &apdu->u.searchResponse->referenceId; + return &apdu->u.searchResponse->referenceId; case Z_APDU_presentRequest: - return &apdu->u.presentRequest->referenceId; + return &apdu->u.presentRequest->referenceId; case Z_APDU_presentResponse: - return &apdu->u.presentResponse->referenceId; + return &apdu->u.presentResponse->referenceId; case Z_APDU_deleteResultSetRequest: - return &apdu->u.deleteResultSetRequest->referenceId; + return &apdu->u.deleteResultSetRequest->referenceId; case Z_APDU_deleteResultSetResponse: - return &apdu->u.deleteResultSetResponse->referenceId; + return &apdu->u.deleteResultSetResponse->referenceId; case Z_APDU_accessControlRequest: - return &apdu->u.accessControlRequest->referenceId; + return &apdu->u.accessControlRequest->referenceId; case Z_APDU_accessControlResponse: - return &apdu->u.accessControlResponse->referenceId; + return &apdu->u.accessControlResponse->referenceId; case Z_APDU_resourceControlRequest: - return &apdu->u.resourceControlRequest->referenceId; + return &apdu->u.resourceControlRequest->referenceId; case Z_APDU_resourceControlResponse: - return &apdu->u.resourceControlResponse->referenceId; + return &apdu->u.resourceControlResponse->referenceId; case Z_APDU_triggerResourceControlRequest: - return &apdu->u.triggerResourceControlRequest->referenceId; + return &apdu->u.triggerResourceControlRequest->referenceId; case Z_APDU_resourceReportRequest: - return &apdu->u.resourceReportRequest->referenceId; + return &apdu->u.resourceReportRequest->referenceId; case Z_APDU_resourceReportResponse: - return &apdu->u.resourceReportResponse->referenceId; + return &apdu->u.resourceReportResponse->referenceId; case Z_APDU_scanRequest: - return &apdu->u.scanRequest->referenceId; + return &apdu->u.scanRequest->referenceId; case Z_APDU_scanResponse: - return &apdu->u.scanResponse->referenceId; + return &apdu->u.scanResponse->referenceId; case Z_APDU_sortRequest: - return &apdu->u.sortRequest->referenceId; + return &apdu->u.sortRequest->referenceId; case Z_APDU_sortResponse: - return &apdu->u.sortResponse->referenceId; + return &apdu->u.sortResponse->referenceId; case Z_APDU_segmentRequest: - return &apdu->u.segmentRequest->referenceId; + return &apdu->u.segmentRequest->referenceId; case Z_APDU_extendedServicesRequest: - return &apdu->u.extendedServicesRequest->referenceId; + return &apdu->u.extendedServicesRequest->referenceId; case Z_APDU_extendedServicesResponse: - return &apdu->u.extendedServicesResponse->referenceId; + return &apdu->u.extendedServicesResponse->referenceId; case Z_APDU_close: - return &apdu->u.close->referenceId; + return &apdu->u.close->referenceId; } return 0; } @@ -173,13 +174,13 @@ void Z_Assoc::transfer_referenceId(Z_APDU *from, Z_APDU *to) 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); + *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; + *id_to = 0; } int Z_Assoc::send_Z_PDU(Z_APDU *apdu, int *plen) @@ -196,9 +197,9 @@ int Z_Assoc::send_GDU(Z_GDU *apdu, int *plen) int len; if (encode_GDU(apdu, &buf, &len) > 0) { - if (plen) - *plen = len; - return m_PDU_Observable->send_PDU(buf, len); + if (plen) + *plen = len; + return m_PDU_Observable->send_PDU(buf, len); } return -1; } @@ -212,31 +213,31 @@ Z_GDU *Z_Assoc::decode_GDU(const char *buf, int len) if (!z_GDU(m_odr_in, &apdu, 0, 0)) { - const char *element = odr_getelement(m_odr_in); - yaz_log(YLOG_LOG, "PDU decode failed '%s' near byte %d. Element %s", - odr_errmsg(odr_geterror(m_odr_in)), - odr_offset(m_odr_in), - element ? element : "unknown"); + const char *element = odr_getelement(m_odr_in); + yaz_log(YLOG_LOG, "PDU decode failed '%s' near byte %ld. Element %s", + odr_errmsg(odr_geterror(m_odr_in)), + (long) odr_offset(m_odr_in), + element ? element : "unknown"); yaz_log(YLOG_LOG, "PDU dump:"); odr_dumpBER(yaz_log_file(), buf, len); return 0; } else { - if (m_APDU_yazlog) - { // use YAZ log FILE - FILE *save = m_APDU_file; - - odr_setprint(m_odr_print, yaz_log_file()); - z_GDU(m_odr_print, &apdu, 0, "decode"); - m_APDU_file = save; - odr_setprint(m_odr_print, save); - } - if (m_APDU_file) + if (m_APDU_yazlog) + { // use YAZ log FILE + FILE *save = m_APDU_file; + + odr_setprint(m_odr_print, yaz_log_file()); + z_GDU(m_odr_print, &apdu, 0, "decode"); + m_APDU_file = save; + odr_setprint(m_odr_print, save); + } + if (m_APDU_file) { - z_GDU(m_odr_print, &apdu, 0, "decode"); - fflush(m_APDU_file); - } + z_GDU(m_odr_print, &apdu, 0, "decode"); + fflush(m_APDU_file); + } return apdu; } } @@ -247,27 +248,27 @@ int Z_Assoc::encode_GDU(Z_GDU *apdu, char **buf, int *len) int r = z_GDU(m_odr_out, &apdu, 0, 0); if (!r) // decoding failed. Get the failed element - element = odr_getelement(m_odr_out); + element = odr_getelement(m_odr_out); if (m_APDU_yazlog || !r) { - if (!r) - yaz_log (YLOG_LOG, "PDU encode failed. Element %s", - element ? element : "unknown"); - FILE *save = m_APDU_file; - FILE *yazf = yaz_log_file(); - odr_setprint(m_odr_print, yazf); // use YAZ log FILE - z_GDU(m_odr_print, &apdu, 0, "encode"); - m_APDU_file = save; - odr_setprint(m_odr_print, save); + if (!r) + yaz_log (YLOG_LOG, "PDU encode failed. Element %s", + element ? element : "unknown"); + FILE *save = m_APDU_file; + FILE *yazf = yaz_log_file(); + odr_setprint(m_odr_print, yazf); // use YAZ log FILE + z_GDU(m_odr_print, &apdu, 0, "encode"); + m_APDU_file = save; + odr_setprint(m_odr_print, save); } if (m_APDU_file) { - if (!r) - fprintf (m_APDU_file, "PDU encode failed. Element %s", - element ? element : "unknown"); - z_GDU(m_odr_print, &apdu, 0, "encode"); - fflush(m_APDU_file); + if (!r) + fprintf (m_APDU_file, "PDU encode failed. Element %s", + element ? element : "unknown"); + z_GDU(m_odr_print, &apdu, 0, "encode"); + fflush(m_APDU_file); } if (!r) // encoding failed return -1; @@ -291,7 +292,7 @@ int Z_Assoc::client(const char *addr) void Z_Assoc::close() { - m_PDU_Observable->close (); + m_PDU_Observable->close_session(); } int Z_Assoc::server(const char *addr) @@ -326,20 +327,20 @@ void Z_Assoc::get_otherInfoAPDU(Z_APDU *apdu, Z_OtherInformation ***oip) switch (apdu->which) { case Z_APDU_initRequest: - *oip = &apdu->u.initRequest->otherInfo; - break; + *oip = &apdu->u.initRequest->otherInfo; + break; case Z_APDU_searchRequest: - *oip = &apdu->u.searchRequest->otherInfo; - break; + *oip = &apdu->u.searchRequest->otherInfo; + break; case Z_APDU_presentRequest: - *oip = &apdu->u.presentRequest->otherInfo; - break; + *oip = &apdu->u.presentRequest->otherInfo; + break; case Z_APDU_sortRequest: - *oip = &apdu->u.sortRequest->otherInfo; - break; + *oip = &apdu->u.sortRequest->otherInfo; + break; case Z_APDU_scanRequest: - *oip = &apdu->u.scanRequest->otherInfo; - break; + *oip = &apdu->u.scanRequest->otherInfo; + break; case Z_APDU_extendedServicesRequest: *oip = &apdu->u.extendedServicesRequest->otherInfo; break; @@ -347,20 +348,20 @@ void Z_Assoc::get_otherInfoAPDU(Z_APDU *apdu, Z_OtherInformation ***oip) *oip = &apdu->u.deleteResultSetRequest->otherInfo; break; case Z_APDU_initResponse: - *oip = &apdu->u.initResponse->otherInfo; - break; + *oip = &apdu->u.initResponse->otherInfo; + break; case Z_APDU_searchResponse: - *oip = &apdu->u.searchResponse->otherInfo; - break; + *oip = &apdu->u.searchResponse->otherInfo; + break; case Z_APDU_presentResponse: - *oip = &apdu->u.presentResponse->otherInfo; - break; + *oip = &apdu->u.presentResponse->otherInfo; + break; case Z_APDU_sortResponse: - *oip = &apdu->u.sortResponse->otherInfo; - break; + *oip = &apdu->u.sortResponse->otherInfo; + break; case Z_APDU_scanResponse: - *oip = &apdu->u.scanResponse->otherInfo; - break; + *oip = &apdu->u.scanResponse->otherInfo; + break; case Z_APDU_extendedServicesResponse: *oip = &apdu->u.extendedServicesResponse->otherInfo; break; @@ -368,56 +369,41 @@ void Z_Assoc::get_otherInfoAPDU(Z_APDU *apdu, Z_OtherInformation ***oip) *oip = &apdu->u.deleteResultSetResponse->otherInfo; break; default: - *oip = 0; - break; + *oip = 0; + break; } } -void Z_Assoc::set_otherInformationString ( +void Z_Assoc::set_otherInformationString( Z_APDU *apdu, - int oidval, int categoryValue, - const char *str) + const Odr_oid *oid, int categoryValue, const char *str) { Z_OtherInformation **otherInformation; get_otherInfoAPDU(apdu, &otherInformation); if (!otherInformation) - return; - set_otherInformationString(otherInformation, oidval, categoryValue, str); -} - -void Z_Assoc::set_otherInformationString ( - Z_OtherInformation **otherInformation, - int oidval, int categoryValue, - const char *str) -{ - int oid[OID_SIZE]; - struct oident ent; - ent.proto = PROTO_Z3950; - ent.oclass = CLASS_USERINFO; - ent.value = (oid_value) oidval; - if (!oid_ent_to_oid (&ent, oid)) - return ; + return; set_otherInformationString(otherInformation, oid, categoryValue, str); } + void Z_Assoc::set_otherInformationString ( Z_OtherInformation **otherInformation, - int *oid, int categoryValue, const char *str) + const Odr_oid *oid, int categoryValue, const char *str) { Z_OtherInformationUnit *oi = - update_otherInformation(otherInformation, 1, oid, categoryValue, 0); + update_otherInformation(otherInformation, 1, oid, categoryValue, 0); if (!oi) - return; + return; oi->information.characterInfo = odr_strdup (odr_encode(), str); } Z_OtherInformationUnit *Z_Assoc::update_otherInformation ( Z_OtherInformation **otherInformationP, int createFlag, - int *oid, int categoryValue, int deleteFlag) + const Odr_oid *oid, int categoryValue, int deleteFlag) { return yaz_oi_update (otherInformationP, - (createFlag ? odr_encode() : 0), - oid, categoryValue, deleteFlag); + (createFlag ? odr_encode() : 0), + oid, categoryValue, deleteFlag); } Z_ReferenceId* Z_Assoc::getRefID(char* str) @@ -433,3 +419,11 @@ Z_ReferenceId* Z_Assoc::getRefID(char* str) return id; } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +