X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-z-assoc.cpp;h=878213666ded3902a9f2dbf3b5f1cc1843e21644;hp=c3ffcf71468ab2c1756ec0de2b34e5e6dc802369;hb=c1010b52a964b99e1b9bfcf579d767d0b6bb8012;hpb=87be6c609c22d9620c781b95ab74298b63694055 diff --git a/src/yaz-z-assoc.cpp b/src/yaz-z-assoc.cpp index c3ffcf7..8782136 100644 --- a/src/yaz-z-assoc.cpp +++ b/src/yaz-z-assoc.cpp @@ -1,10 +1,47 @@ /* - * Copyright (c) 1998-1999, Index Data. + * Copyright (c) 1998-2001, Index Data. * See the file LICENSE for details. - * Sebastian Hammer, Adam Dickmeiss * * $Log: yaz-z-assoc.cpp,v $ - * Revision 1.8 2000-08-07 14:19:59 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. + * + * Revision 1.14 2000/09/12 16:40:33 heikki + * minor + * + * Revision 1.13 2000/09/08 10:23:42 adam + * Added skeleton of yaz-z-server. + * + * Revision 1.12 2000/09/05 13:57:28 adam + * Fixed get_otherInfoAPDU to return otherInfo for extended services. + * + * Revision 1.11 2000/09/04 08:59:16 adam + * Changed call to logging functions (yaz_ added). + * + * Revision 1.10 2000/09/04 08:29:22 adam + * Fixed memory leak(s). Added re-use of associations, rather than + * re-init, when maximum number of targets are in use. + * + * Revision 1.9 2000/08/10 08:42:42 adam + * Fixes for {set,get}_APDU_log. + * + * Revision 1.8 2000/08/07 14:19:59 adam * Fixed serious bug regarding timeouts. Improved logging for proxy. * * Revision 1.7 2000/05/10 11:36:58 ian @@ -38,18 +75,22 @@ */ #include +#include #include -#include +#include #include int Yaz_Z_Assoc::yaz_init_func() { +#ifndef WIN32 + signal (SIGPIPE, SIG_IGN); +#endif nmem_init(); return 1; } -int Yaz_Z_Assoc::yaz_init_flag = Yaz_Z_Assoc::yaz_init_func(); +int Yaz_Z_Assoc::yaz_init_flag = Yaz_Z_Assoc::yaz_init_func(); Yaz_Z_Assoc::Yaz_Z_Assoc(IYaz_PDU_Observable *the_PDU_Observable) { @@ -66,19 +107,18 @@ Yaz_Z_Assoc::Yaz_Z_Assoc(IYaz_PDU_Observable *the_PDU_Observable) void Yaz_Z_Assoc::set_APDU_log(const char *fname) { if (m_APDU_file && m_APDU_file != stderr) + { fclose (m_APDU_file); - m_APDU_file = 0; + m_APDU_file = 0; + } delete [] m_APDU_fname; m_APDU_fname = 0; - if (fname) + if (fname) { m_APDU_fname = new char[strlen(fname)+1]; strcpy (m_APDU_fname, fname); - } - if (fname) - { - if (*fname) + if (*fname && strcmp(fname, "-")) m_APDU_file = fopen (fname, "a"); else m_APDU_file = stderr; @@ -93,14 +133,12 @@ const char *Yaz_Z_Assoc::get_APDU_log() Yaz_Z_Assoc::~Yaz_Z_Assoc() { - m_PDU_Observable->destroy(); + m_PDU_Observable->destroy(); delete m_PDU_Observable; - odr_destroy (m_odr_print); + odr_destroy (m_odr_print); // note: also runs fclose on m_APDU_file .. odr_destroy (m_odr_out); odr_destroy (m_odr_in); delete [] m_APDU_fname; - if (m_APDU_file && m_APDU_file != stderr) - fclose (m_APDU_file); delete [] m_hostname; } @@ -112,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) @@ -128,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; @@ -150,7 +261,7 @@ Z_APDU *Yaz_Z_Assoc::decode_Z_PDU(const char *buf, int len) odr_errmsg(odr_geterror(m_odr_in)), odr_offset(m_odr_in)); logf(LOG_LOG, "PDU dump:"); - odr_dumpBER(log_file(), buf, len); + odr_dumpBER(yaz_log_file(), buf, len); return 0; } else @@ -163,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; @@ -239,6 +350,12 @@ void Yaz_Z_Assoc::get_otherInfoAPDU(Z_APDU *apdu, Z_OtherInformation ***oip) case Z_APDU_scanRequest: *oip = &apdu->u.scanRequest->otherInfo; break; + case Z_APDU_extendedServicesRequest: + *oip = &apdu->u.extendedServicesRequest->otherInfo; + break; + case Z_APDU_deleteResultSetRequest: + *oip = &apdu->u.deleteResultSetRequest->otherInfo; + break; case Z_APDU_initResponse: *oip = &apdu->u.initResponse->otherInfo; break; @@ -254,6 +371,12 @@ void Yaz_Z_Assoc::get_otherInfoAPDU(Z_APDU *apdu, Z_OtherInformation ***oip) case Z_APDU_scanResponse: *oip = &apdu->u.scanResponse->otherInfo; break; + case Z_APDU_extendedServicesResponse: + *oip = &apdu->u.extendedServicesResponse->otherInfo; + break; + case Z_APDU_deleteResultSetResponse: + *oip = &apdu->u.deleteResultSetResponse->otherInfo; + break; default: *oip = 0; break; @@ -311,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; }