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=4d16b08e4e614218065167f320eef0a2d7bd8eea;hb=c1010b52a964b99e1b9bfcf579d767d0b6bb8012;hpb=3109185a2036377894be1dd303d899a305b44281 diff --git a/src/yaz-z-assoc.cpp b/src/yaz-z-assoc.cpp index 4d16b08..8782136 100644 --- a/src/yaz-z-assoc.cpp +++ b/src/yaz-z-assoc.cpp @@ -1,10 +1,71 @@ /* - * 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.2 1999-04-20 10:30:05 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 + * Added default parameters for refid to request functions. + * Added default parameter for result set name to search and present request. + * Commented out forced logging of PDU contents. + * Added send_deleteResultSetRequest + * + * Revision 1.6 1999/12/06 13:52:45 adam + * Modified for new location of YAZ header files. Experimental threaded + * operation. + * + * Revision 1.5 1999/11/10 10:02:34 adam + * Work on proxy. + * + * Revision 1.4 1999/09/13 12:53:44 adam + * Proxy removes OtherInfo Proxy Address and Session ID. Other + * Otherinfo remains untouched. + * + * Revision 1.3 1999/04/21 12:09:01 adam + * Many improvements. Modified to proxy server to work with "sessions" + * based on cookies. + * + * Revision 1.2 1999/04/20 10:30:05 adam * Implemented various stuff for client and proxy. Updated calls * to ODR to reflect new name parameter. * @@ -14,19 +75,22 @@ */ #include +#include -#include -#include +#include +#include +#include int Yaz_Z_Assoc::yaz_init_func() { - logf (LOG_LOG, "nmem_init"); +#ifndef WIN32 + signal (SIGPIPE, SIG_IGN); +#endif nmem_init(); - logf (LOG_LOG, "done"); 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) { @@ -34,35 +98,151 @@ Yaz_Z_Assoc::Yaz_Z_Assoc(IYaz_PDU_Observable *the_PDU_Observable) m_odr_in = odr_createmem (ODR_DECODE); m_odr_out = odr_createmem (ODR_ENCODE); m_odr_print = odr_createmem (ODR_PRINT); + m_log = LOG_DEBUG; + m_APDU_file = 0; + m_APDU_fname = 0; + m_hostname = 0; +} + +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; + } + delete [] m_APDU_fname; + m_APDU_fname = 0; + + if (fname) + { + m_APDU_fname = new char[strlen(fname)+1]; + strcpy (m_APDU_fname, fname); + if (*fname && strcmp(fname, "-")) + m_APDU_file = fopen (fname, "a"); + else + m_APDU_file = stderr; + odr_setprint(m_odr_print, m_APDU_file); + } +} + +const char *Yaz_Z_Assoc::get_APDU_log() +{ + return m_APDU_fname; } 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; + delete [] m_hostname; } void Yaz_Z_Assoc::recv_PDU(const char *buf, int len) { - logf (LOG_LOG, "recv_PDU len=%d", len); + logf (m_log, "recv_PDU len=%d", len); Z_APDU *apdu = decode_Z_PDU (buf, len); if (apdu) + { recv_Z_PDU (apdu); + } + else + { + close(); + } } Z_APDU *Yaz_Z_Assoc::create_Z_PDU(int type) { - return zget_APDU(m_odr_out, 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; + } + 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; int len; - logf (LOG_LOG, "Yaz_Z_Assoc:send_Z_PDU"); if (encode_Z_PDU(apdu, &buf, &len) > 0) return m_PDU_Observable->send_PDU(buf, len); return -1; @@ -81,18 +261,21 @@ 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 { - logf (LOG_LOG, "decoded ok"); + if (m_APDU_file) + z_APDU(m_odr_print, &apdu, 0, "decode"); return apdu; } } 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"); @@ -103,23 +286,16 @@ int Yaz_Z_Assoc::encode_Z_PDU(Z_APDU *apdu, char **buf, int *len) return *len; } -void Yaz_Z_Assoc::connectNotify() +const char *Yaz_Z_Assoc::get_hostname() { - logf (LOG_LOG, "connectNotify"); -} - -void Yaz_Z_Assoc::failNotify() -{ - logf (LOG_LOG, "failNotify"); -} - -void Yaz_Z_Assoc::timeoutNotify() -{ - logf (LOG_LOG, "timeoutNotify"); + return m_hostname; } void Yaz_Z_Assoc::client(const char *addr) { + delete [] m_hostname; + m_hostname = new char[strlen(addr)+1]; + strcpy (m_hostname, addr); m_PDU_Observable->connect (this, addr); } @@ -130,6 +306,9 @@ void Yaz_Z_Assoc::close() void Yaz_Z_Assoc::server(const char *addr) { + delete [] m_hostname; + m_hostname = new char[strlen(addr)+1]; + strcpy (m_hostname, addr); m_PDU_Observable->listen (this, addr); } @@ -147,63 +326,120 @@ ODR Yaz_Z_Assoc::odr_print() return m_odr_print; } -Z_OtherInformationUnit *Yaz_Z_Assoc::update_otherInformation ( - Z_OtherInformation **otherInformationP, int createFlag, - int *oid, int categoryValue) +void Yaz_Z_Assoc::timeout(int timeout) { - int i; - Z_OtherInformation *otherInformation = *otherInformationP; - if (!otherInformation) - { - if (!createFlag) - return 0; - otherInformation = *otherInformationP = (Z_OtherInformation *) - odr_malloc (odr_encode(), sizeof(*otherInformation)); - otherInformation->num_elements = 0; - otherInformation->list = (Z_OtherInformationUnit **) - odr_malloc (odr_encode(), 8*sizeof(*otherInformation)); - for (i = 0; i<8; i++) - otherInformation->list[i] = 0; - } - for (i = 0; inum_elements; i++) + m_PDU_Observable->idleTime(timeout); +} + +void Yaz_Z_Assoc::get_otherInfoAPDU(Z_APDU *apdu, Z_OtherInformation ***oip) +{ + switch (apdu->which) { - assert (otherInformation->list[i]); - if (!oid) - { - if (!otherInformation->list[i]->category) - return otherInformation->list[i]; - } - else - { - if (otherInformation->list[i]->category && - categoryValue == - *otherInformation->list[i]->category->categoryValue && - !oid_oidcmp (oid, otherInformation->list[i]->category-> - categoryTypeId)) - return otherInformation->list[i]; - } + case Z_APDU_initRequest: + *oip = &apdu->u.initRequest->otherInfo; + break; + case Z_APDU_searchRequest: + *oip = &apdu->u.searchRequest->otherInfo; + break; + case Z_APDU_presentRequest: + *oip = &apdu->u.presentRequest->otherInfo; + break; + case Z_APDU_sortRequest: + *oip = &apdu->u.sortRequest->otherInfo; + break; + 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; + case Z_APDU_searchResponse: + *oip = &apdu->u.searchResponse->otherInfo; + break; + case Z_APDU_presentResponse: + *oip = &apdu->u.presentResponse->otherInfo; + break; + case Z_APDU_sortResponse: + *oip = &apdu->u.sortResponse->otherInfo; + break; + 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; } - if (!createFlag) - return 0; - otherInformation->list[i] = (Z_OtherInformationUnit*) - odr_malloc (odr_encode(), sizeof(Z_OtherInformationUnit)); - if (oid) +} + +void Yaz_Z_Assoc::set_otherInformationString ( + Z_APDU *apdu, + int oidval, int categoryValue, + const char *str) +{ + Z_OtherInformation **otherInformation; + get_otherInfoAPDU(apdu, &otherInformation); + if (!otherInformation) + return; + set_otherInformationString(otherInformation, oidval, categoryValue, str); +} + +void Yaz_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 ; + set_otherInformationString(otherInformation, oid, categoryValue, str); +} + +void Yaz_Z_Assoc::set_otherInformationString ( + Z_OtherInformation **otherInformation, + int *oid, int categoryValue, const char *str) +{ + Z_OtherInformationUnit *oi = + update_otherInformation(otherInformation, 1, oid, categoryValue, 0); + if (!oi) + return; + oi->information.characterInfo = odr_strdup (odr_encode(), str); +} + +Z_OtherInformationUnit *Yaz_Z_Assoc::update_otherInformation ( + Z_OtherInformation **otherInformationP, int createFlag, + int *oid, int categoryValue, int deleteFlag) +{ + return yaz_oi_update (otherInformationP, + (createFlag ? odr_encode() : 0), + oid, categoryValue, deleteFlag); +} + +Z_ReferenceId* Yaz_Z_Assoc::getRefID(char* str) +{ + Z_ReferenceId* id = NULL; + + if (str) { - otherInformation->list[i]->category = (Z_InfoCategory*) - odr_malloc (odr_encode(), sizeof(Z_InfoCategory)); - otherInformation->list[i]->category->categoryTypeId = (int*) - odr_oiddup (odr_encode(), oid); - otherInformation->list[i]->category->categoryValue = (int*) - odr_malloc (odr_encode(), sizeof(int)); - *otherInformation->list[i]->category->categoryValue = - categoryValue; + id = (Z_ReferenceId*) odr_malloc (m_odr_out, sizeof(*id)); + id->size = id->len = strlen(str); + id->buf = (unsigned char *) str; } - else - otherInformation->list[i]->category = 0; - otherInformation->list[i]->which = Z_OtherInfo_characterInfo; - otherInformation->list[i]->information.characterInfo = 0; - - otherInformation->num_elements = i+1; - return otherInformation->list[i]; + return id; }