X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-z-assoc.cpp;h=8413ea8a32bb0a7cb679d392ab972bfaa9a1a2ba;hp=e10ac7917f85ec3216bfeaf588d06f4e9dbb9186;hb=4ffb5c5f0c0c64799a89f7961fd553ae8ae4854b;hpb=9ada255ef9d4261a79d9ccae6c1bfedf456087ce diff --git a/src/yaz-z-assoc.cpp b/src/yaz-z-assoc.cpp index e10ac79..8413ea8 100644 --- a/src/yaz-z-assoc.cpp +++ b/src/yaz-z-assoc.cpp @@ -1,69 +1,22 @@ /* - * Copyright (c) 1998-2000, Index Data. + * Copyright (c) 1998-2004, Index Data. * See the file LICENSE for details. * - * $Log: yaz-z-assoc.cpp,v $ - * 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. - * - * Revision 1.1 1999/04/09 11:46:57 adam - * Added object Yaz_Z_Assoc. Much more functional client. - * + * $Id: yaz-z-assoc.cpp,v 1.33 2004-01-24 21:33:27 adam Exp $ */ #include +#include #include -#include +#include #include int Yaz_Z_Assoc::yaz_init_func() { - nmem_init(); +#ifndef WIN32 + signal (SIGPIPE, SIG_IGN); +#endif return 1; } @@ -79,6 +32,7 @@ Yaz_Z_Assoc::Yaz_Z_Assoc(IYaz_PDU_Observable *the_PDU_Observable) m_APDU_file = 0; m_APDU_fname = 0; m_hostname = 0; + m_APDU_yazlog = 0; } void Yaz_Z_Assoc::set_APDU_log(const char *fname) @@ -95,14 +49,23 @@ void Yaz_Z_Assoc::set_APDU_log(const char *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 + 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); } } +int Yaz_Z_Assoc::set_APDU_yazlog(int v) +{ + int old = m_APDU_yazlog; + m_APDU_yazlog = v; + return old; +} + const char *Yaz_Z_Assoc::get_APDU_log() { return m_APDU_fname; @@ -121,11 +84,16 @@ Yaz_Z_Assoc::~Yaz_Z_Assoc() void Yaz_Z_Assoc::recv_PDU(const char *buf, int len) { - logf (m_log, "recv_PDU len=%d", len); - Z_APDU *apdu = decode_Z_PDU (buf, len); + yaz_log (m_log, "recv_PDU len=%d", len); + Z_GDU *apdu = decode_GDU (buf, len); if (apdu) { - recv_Z_PDU (apdu); + recv_GDU (apdu, len); + } + else + { + close(); + failNotify(); } } @@ -143,48 +111,164 @@ Z_APDU *Yaz_Z_Assoc::create_Z_PDU(int type) return apdu; } -int Yaz_Z_Assoc::send_Z_PDU(Z_APDU *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, int *plen) +{ + Z_GDU *gdu = (Z_GDU*) odr_malloc(odr_encode(), sizeof(*gdu)); + gdu->which = Z_GDU_Z3950; + gdu->u.z3950 = apdu; + return send_GDU(gdu, plen); +} + +int Yaz_Z_Assoc::send_GDU(Z_GDU *apdu, int *plen) { char *buf; int len; - if (encode_Z_PDU(apdu, &buf, &len) > 0) + if (encode_GDU(apdu, &buf, &len) > 0) + { + if (plen) + *plen = len; return m_PDU_Observable->send_PDU(buf, len); + } return -1; } -Z_APDU *Yaz_Z_Assoc::decode_Z_PDU(const char *buf, int len) +Z_GDU *Yaz_Z_Assoc::decode_GDU(const char *buf, int len) { - Z_APDU *apdu; + Z_GDU *apdu; odr_reset (m_odr_in); odr_setbuf (m_odr_in, (char*) buf, len, 0); - if (!z_APDU(m_odr_in, &apdu, 0, 0)) + if (!z_GDU(m_odr_in, &apdu, 0, 0)) { - logf(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ", - odr_errmsg(odr_geterror(m_odr_in)), - odr_offset(m_odr_in)); - logf(LOG_LOG, "PDU dump:"); + const char *element = odr_getelement(m_odr_in); + yaz_log(LOG_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"); + yaz_log(LOG_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) - z_APDU(m_odr_print, &apdu, 0, "decode"); + { + z_GDU(m_odr_print, &apdu, 0, "decode"); + fflush(m_APDU_file); + } return apdu; } } -int Yaz_Z_Assoc::encode_Z_PDU(Z_APDU *apdu, char **buf, int *len) +int Yaz_Z_Assoc::encode_GDU(Z_GDU *apdu, char **buf, int *len) { - if (!z_APDU(m_odr_out, &apdu, 0, 0)) + const char *element = 0; + int r = z_GDU(m_odr_out, &apdu, 0, 0); + + if (!r) // decoding failed. Get the failed element + element = odr_getelement(m_odr_out); + + if (m_APDU_yazlog || !r) { - logf (LOG_LOG, "yaz_Z_Assoc::encode_Z_PDU failed"); - return -1; + if (!r) + yaz_log (LOG_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) - z_APDU(m_odr_print, &apdu, 0, "encode"); + { + 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; *buf = odr_getbuf (m_odr_out, len, 0); odr_reset (m_odr_out); return *len; @@ -195,12 +279,12 @@ const char *Yaz_Z_Assoc::get_hostname() return m_hostname; } -void Yaz_Z_Assoc::client(const char *addr) +int 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); + return m_PDU_Observable->connect (this, addr); } void Yaz_Z_Assoc::close() @@ -208,12 +292,12 @@ void Yaz_Z_Assoc::close() m_PDU_Observable->close (); } -void Yaz_Z_Assoc::server(const char *addr) +int 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); + return m_PDU_Observable->listen (this, addr); } ODR Yaz_Z_Assoc::odr_encode() @@ -338,13 +422,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; }