X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_z3950_client.cpp;h=4b63060a8fddd23d99a6dc80ec523304f350d28b;hb=4f5fe9b621891d0d4eabbd7dbcba65f96f11f528;hp=b988728d789726b481284e2e28567436020144ff;hpb=3b0062a8b4cfc23559bcee50a532609a857f669a;p=metaproxy-moved-to-github.git diff --git a/src/filter_z3950_client.cpp b/src/filter_z3950_client.cpp index b988728..4b63060 100644 --- a/src/filter_z3950_client.cpp +++ b/src/filter_z3950_client.cpp @@ -1,5 +1,5 @@ /* This file is part of Metaproxy. - Copyright (C) 2005-2012 Index Data + Copyright (C) 2005-2013 Index Data Metaproxy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -56,6 +56,7 @@ namespace metaproxy_1 { void timeoutNotify(); void recv_GDU(Z_GDU *gdu, int len); void fixup_nsd(ODR odr, Z_Records *records); + void fixup_nsd(ODR odr, Z_DefaultDiagFormat *nsd); void fixup_init(ODR odr, Z_InitResponse *initrs); yazpp_1::IPDU_Observer* sessionNotify( yazpp_1::IPDU_Observable *the_PDU_Observable, @@ -102,7 +103,7 @@ yf::Z3950Client::Assoc::Assoc(yazpp_1::SocketManager *socket_manager, std::string host, int timeout_sec) : Z_Assoc(PDU_Observable), m_socket_manager(socket_manager), m_PDU_Observable(PDU_Observable), - m_package(0), m_in_use(true), m_waiting(false), + m_package(0), m_in_use(true), m_waiting(false), m_destroyed(false), m_connected(false), m_has_closed(false), m_queue_len(1), m_time_elapsed(0), m_time_max(timeout_sec), m_time_connect_max(10), @@ -135,7 +136,7 @@ void yf::Z3950Client::Assoc::failNotify() Z_APDU *apdu = 0; if (gdu && gdu->which == Z_GDU_Z3950) apdu = gdu->u.z3950; - + m_package->response() = odr.create_close(apdu, Z_Close_peerAbort, 0); m_package->session().close(); } @@ -150,45 +151,60 @@ void yf::Z3950Client::Assoc::timeoutNotify() m_waiting = false; mp::odr odr; - + if (m_package) { Z_GDU *gdu = m_package->request().get(); Z_APDU *apdu = 0; if (gdu && gdu->which == Z_GDU_Z3950) apdu = gdu->u.z3950; - + if (m_connected) m_package->response() = odr.create_close(apdu, Z_Close_lackOfActivity, 0); else - m_package->response() = + m_package->response() = odr.create_close(apdu, Z_Close_peerAbort, 0); - + m_package->session().close(); } } } +void yf::Z3950Client::Assoc::fixup_nsd(ODR odr, Z_DefaultDiagFormat *nsd) +{ + std::string addinfo; + + // should really check for nsd->which.. But union has two members + // containing almost same data + const char *v2Addinfo = nsd->u.v2Addinfo; + // Z_InternationalString *v3Addinfo; + if (v2Addinfo && *v2Addinfo) + { + addinfo.assign(nsd->u.v2Addinfo); + addinfo += " "; + } + addinfo += "(backend=" + m_host + ")"; + nsd->u.v2Addinfo = odr_strdup(odr, addinfo.c_str()); +} + void yf::Z3950Client::Assoc::fixup_nsd(ODR odr, Z_Records *records) { if (records && records->which == Z_Records_NSD) { - Z_DefaultDiagFormat *nsd = records->u.nonSurrogateDiagnostic; - std::string addinfo; - - // should really check for nsd->which.. But union has two members - // containing almost same data - const char *v2Addinfo = nsd->u.v2Addinfo; - // Z_InternationalString *v3Addinfo; - - if (v2Addinfo && *v2Addinfo) + fixup_nsd(odr, records->u.nonSurrogateDiagnostic); + } + if (records && records->which == Z_Records_multipleNSD) + { + Z_DiagRecs *drecs = records->u.multipleNonSurDiagnostics; + int i; + for (i = 0; i < drecs->num_diagRecs; i++) { - addinfo.assign(nsd->u.v2Addinfo); - addinfo += " "; + Z_DiagRec *dr = drecs->diagRecs[i]; + + if (dr->which == Z_DiagRec_defaultFormat) + fixup_nsd(odr, dr->u.defaultFormat); } - addinfo += "(backend=" + m_host + ")"; - nsd->u.v2Addinfo = odr_strdup(odr, addinfo.c_str()); } } @@ -206,7 +222,7 @@ void yf::Z3950Client::Assoc::fixup_init(ODR odr, Z_InitResponse *initrs) if (unit->which == Z_OtherInfo_externallyDefinedInfo && unit->information.externallyDefinedInfo && unit->information.externallyDefinedInfo->which == - Z_External_diag1) + Z_External_diag1) { Z_DiagnosticFormat *diag = unit->information.externallyDefinedInfo->u.diag1; @@ -222,9 +238,10 @@ void yf::Z3950Client::Assoc::fixup_init(ODR odr, Z_InitResponse *initrs) odr, (oaddinfo ? strlen(oaddinfo) : 0) + 20 + m_host.length()); + *naddinfo = '\0'; if (oaddinfo && *oaddinfo) { - strcpy(naddinfo, oaddinfo); + strcat(naddinfo, oaddinfo); strcat(naddinfo, " "); } strcat(naddinfo, "(backend="); @@ -234,7 +251,7 @@ void yf::Z3950Client::Assoc::fixup_init(ODR odr, Z_InitResponse *initrs) r->u.v2Addinfo = naddinfo; } } - } + } } } } @@ -244,7 +261,7 @@ void yf::Z3950Client::Assoc::recv_GDU(Z_GDU *gdu, int len) m_waiting = false; if (m_package) - { + { mp::odr odr; // must be in scope for response() = assignment if (gdu && gdu->which == Z_GDU_Z3950) { @@ -284,19 +301,19 @@ yf::Z3950Client::Z3950Client() : m_p(new yf::Z3950Client::Rep) yf::Z3950Client::~Z3950Client() { } -yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package) +yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package) { // only one thread messes with the clients list at a time boost::mutex::scoped_lock lock(m_mutex); std::map::iterator it; - + Z_GDU *gdu = package.request().get(); - + int max_sockets = package.origin().get_max_sockets(); if (max_sockets == 0) max_sockets = m_max_sockets; - + it = m_clients.find(package.session()); if (it != m_clients.end()) { @@ -334,7 +351,7 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package) if (apdu->which != Z_APDU_initRequest) { mp::odr odr; - + package.response() = odr.create_close(apdu, Z_Close_protocolError, "First PDU was not an " @@ -365,7 +382,7 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package) apdu, YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED, "z3950_client: No vhost given"); - + package.session().close(); return 0; } @@ -381,7 +398,7 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package) return 0; } } - + // see if we have reached max number of clients (max-sockets) while (max_sockets) @@ -406,22 +423,30 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package) if (no_not_in_use == 0) // all in use.. { mp::odr odr; - + package.response() = odr.create_initResponse( - apdu, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR, "max sessions"); + apdu, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR, + "z3950_client: max sessions"); package.session().close(); return 0; } boost::xtime xt; - xtime_get(&xt, boost::TIME_UTC); - + xtime_get(&xt, +#if BOOST_VERSION >= 105000 + boost::TIME_UTC_ +#else + boost::TIME_UTC +#endif + ); + xt.sec += 15; if (!m_cond_session_ready.timed_wait(lock, xt)) { mp::odr odr; - + package.response() = odr.create_initResponse( - apdu, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR, "max sessions"); + apdu, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR, + "z3950_client: max sessions"); package.session().close(); return 0; } @@ -448,7 +473,7 @@ void yf::Z3950Client::Rep::send_and_receive(Package &package, && m_force_close) { mp::odr odr; - + package.request() = odr.create_close( 0, Z_Close_finished, "z3950_client"); c->m_package = 0; // don't inspect response @@ -475,9 +500,9 @@ void yf::Z3950Client::Rep::send_and_receive(Package &package, return; } c->timeout(1); // so timeoutNotify gets called once per second - - while (!c->m_destroyed && c->m_waiting + + while (!c->m_destroyed && c->m_waiting && c->m_socket_manager->processEvent() > 0) ; } @@ -489,7 +514,7 @@ void yf::Z3950Client::Rep::send_and_receive(Package &package, // prepare response c->m_time_elapsed = 0; c->m_waiting = true; - + // relay the package .. int len; c->send_GDU(gdu, &len); @@ -512,7 +537,7 @@ void yf::Z3950Client::Rep::release_assoc(Package &package) { boost::mutex::scoped_lock lock(m_mutex); std::map::iterator it; - + it = m_clients.find(package.session()); if (it != m_clients.end()) { @@ -574,7 +599,7 @@ void yf::Z3950Client::configure(const xmlNode *ptr, bool test_only, } else { - throw mp::filter::FilterException("Bad element " + throw mp::filter::FilterException("Bad element " + std::string((const char *) ptr->name)); }