X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_z3950_client.cpp;h=fe3049e4e650f80569d71d53d7d5cda4ca6346fe;hb=3ad4016fb41388c1e70327924f781c5eb8ec0c51;hp=d0d04427595889803b216b9322c8c04b344f0451;hpb=4079b7111eea83f5f02f42712ca93ce40897a30f;p=metaproxy-moved-to-github.git diff --git a/src/filter_z3950_client.cpp b/src/filter_z3950_client.cpp index d0d0442..fe3049e 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-2008 Index Data + Copyright (C) 2005-2012 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 @@ -18,10 +18,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "config.hpp" -#include "filter.hpp" -#include "package.hpp" -#include "util.hpp" #include "filter_z3950_client.hpp" +#include +#include #include #include @@ -56,6 +55,7 @@ namespace metaproxy_1 { void failNotify(); void timeoutNotify(); void recv_GDU(Z_GDU *gdu, int len); + void fixup_nsd(ODR odr, Z_Records *records); yazpp_1::IPDU_Observer* sessionNotify( yazpp_1::IPDU_Observable *the_PDU_Observable, int fd); @@ -67,9 +67,11 @@ namespace metaproxy_1 { bool m_waiting; bool m_destroyed; bool m_connected; + bool m_has_closed; int m_queue_len; int m_time_elapsed; int m_time_max; + int m_time_connect_max; std::string m_host; }; @@ -78,6 +80,7 @@ namespace metaproxy_1 { // number of seconds to wait before we give up request int m_timeout_sec; int m_max_sockets; + bool m_force_close; std::string m_default_target; std::string m_force_target; boost::mutex m_mutex; @@ -99,8 +102,9 @@ yf::Z3950Client::Assoc::Assoc(yazpp_1::SocketManager *socket_manager, : 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_destroyed(false), m_connected(false), m_queue_len(1), - m_time_elapsed(0), m_time_max(timeout_sec), + 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), m_host(host) { // std::cout << "create assoc " << this << "\n"; @@ -139,7 +143,8 @@ void yf::Z3950Client::Assoc::failNotify() void yf::Z3950Client::Assoc::timeoutNotify() { m_time_elapsed++; - if (m_time_elapsed >= m_time_max) + if ((m_connected && m_time_elapsed >= m_time_max) + || (!m_connected && m_time_elapsed >= m_time_connect_max)) { m_waiting = false; @@ -164,12 +169,50 @@ void yf::Z3950Client::Assoc::timeoutNotify() } } +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 + // char *v2Addinfo; + // Z_InternationalString *v3Addinfo; + + if (nsd->u.v2Addinfo) + { + addinfo.assign(nsd->u.v2Addinfo); + addinfo += " "; + } + addinfo += "(backend=" + m_host + ")"; + nsd->u.v2Addinfo = odr_strdup(odr, addinfo.c_str()); + } +} + 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) + { + Z_APDU *apdu = gdu->u.z3950; + switch (apdu->which) + { + case Z_APDU_searchResponse: + fixup_nsd(odr, apdu->u.searchResponse->records); + break; + case Z_APDU_presentResponse: + fixup_nsd(odr, apdu->u.presentResponse->records); + break; + } + } m_package->response() = gdu; + } } yazpp_1::IPDU_Observer *yf::Z3950Client::Assoc::sessionNotify( @@ -184,6 +227,7 @@ yf::Z3950Client::Z3950Client() : m_p(new yf::Z3950Client::Rep) { m_p->m_timeout_sec = 30; m_p->m_max_sockets = 0; + m_p->m_force_close = false; } yf::Z3950Client::~Z3950Client() { @@ -197,17 +241,18 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package) std::map::iterator it; Z_GDU *gdu = package.request().get(); - // only deal with Z39.50 - if (!gdu || gdu->which != Z_GDU_Z3950) - { - package.move(); - return 0; - } + + int max_sockets = package.origin().get_max_sockets(); + if (max_sockets == 0) + max_sockets = m_max_sockets; + + std::string host; + it = m_clients.find(package.session()); if (it != m_clients.end()) { it->second->m_queue_len++; - while(true) + while (true) { #if 0 // double init .. NOT working yet @@ -229,6 +274,11 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package) m_cond_session_ready.wait(lock); } } + if (!gdu || gdu->which != Z_GDU_Z3950) + { + package.move(); + return 0; + } // new Z39.50 session .. Z_APDU *apdu = gdu->u.z3950; // check that it is init. If not, close @@ -249,7 +299,7 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package) target = m_default_target; std::list vhosts; mp::util::remove_vhost_otherinfo(&apdu->u.initRequest->otherInfo, - vhosts); + vhosts); size_t no_vhosts = vhosts.size(); if (no_vhosts == 1) { @@ -265,7 +315,7 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package) package.response() = odr.create_initResponse( apdu, YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED, - "z3950_client: No virtal host given"); + "z3950_client: No vhost given"); package.session().close(); return 0; @@ -282,36 +332,53 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package) return 0; } } - + std::list dblist; - std::string host; mp::util::split_zurl(target, host, dblist); if (dblist.size()) { ; // z3950_client: Databases in vhost ignored } + + // see if we have reached max number of clients (max-sockets) - while (m_max_sockets) + while (max_sockets) { + int no_not_in_use = 0; int number = 0; it = m_clients.begin(); for (; it != m_clients.end(); it++) { yf::Z3950Client::Assoc *as = it->second; - if (!strcmp(as->get_hostname(), host.c_str())) + if (!strcmp(as->m_host.c_str(), host.c_str())) + { number++; + if (!as->m_in_use) + no_not_in_use++; + } } - if (number < m_max_sockets) + yaz_log(YLOG_LOG, "Found %d/%d connections for %s", number, max_sockets, + host.c_str()); + if (number < max_sockets) break; + 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"); + package.session().close(); + return 0; + } boost::xtime xt; xtime_get(&xt, boost::TIME_UTC); - + 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"); package.session().close(); @@ -331,21 +398,43 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package) void yf::Z3950Client::Rep::send_and_receive(Package &package, yf::Z3950Client::Assoc *c) { - Z_GDU *gdu = package.request().get(); - if (c->m_destroyed) return; + c->m_package = &package; + + if (package.session().is_closed() && c->m_connected && !c->m_has_closed + && 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 + } + Z_GDU *gdu = package.request().get(); + if (!gdu || gdu->which != Z_GDU_Z3950) return; + if (gdu->u.z3950->which == Z_APDU_close) + c->m_has_closed = true; + + // prepare connect c->m_time_elapsed = 0; - c->m_package = &package; c->m_waiting = true; if (!c->m_connected) { - c->client(c->m_host.c_str()); + if (c->client(c->m_host.c_str())) + { + mp::odr odr; + package.response() = + odr.create_close(gdu->u.z3950, Z_Close_peerAbort, 0); + package.session().close(); + return; + } c->timeout(1); // so timeoutNotify gets called once per second + while (!c->m_destroyed && c->m_waiting && c->m_socket_manager->processEvent() > 0) @@ -364,7 +453,7 @@ void yf::Z3950Client::Rep::send_and_receive(Package &package, int len; c->send_GDU(gdu, &len); - switch(gdu->u.z3950->which) + switch (gdu->u.z3950->which) { case Z_APDU_triggerResourceControlRequest: // request only.. @@ -386,28 +475,20 @@ void yf::Z3950Client::Rep::release_assoc(Package &package) it = m_clients.find(package.session()); if (it != m_clients.end()) { - Z_GDU *gdu = package.request().get(); - if (gdu && gdu->which == Z_GDU_Z3950) - { // only Z39.50 packages lock in get_assoc.. release it - it->second->m_in_use = false; - it->second->m_queue_len--; - } + it->second->m_in_use = false; + it->second->m_queue_len--; if (package.session().is_closed()) { // destroy hint (send_and_receive) it->second->m_destroyed = true; - - // wait until no one is waiting for it. - while (it->second->m_queue_len) - m_cond_session_ready.wait(lock); - - // the Z_Assoc and PDU_Assoc must be destroyed before - // the socket manager.. so pull that out.. first.. - yazpp_1::SocketManager *s = it->second->m_socket_manager; - delete it->second; // destroy Z_Assoc - delete s; // then manager - m_clients.erase(it); + if (it->second->m_queue_len == 0) + { + yazpp_1::SocketManager *s = it->second->m_socket_manager; + delete it->second; // destroy Z_Assoc + delete s; // then manager + m_clients.erase(it); + } } m_cond_session_ready.notify_all(); } @@ -419,11 +500,12 @@ void yf::Z3950Client::process(Package &package) const if (c) { m_p->send_and_receive(package, c); + m_p->release_assoc(package); } - m_p->release_assoc(package); } -void yf::Z3950Client::configure(const xmlNode *ptr, bool test_only) +void yf::Z3950Client::configure(const xmlNode *ptr, bool test_only, + const char *path) { for (ptr = ptr->children; ptr; ptr = ptr->next) { @@ -431,7 +513,7 @@ void yf::Z3950Client::configure(const xmlNode *ptr, bool test_only) continue; if (!strcmp((const char *) ptr->name, "timeout")) { - m_p->m_timeout_sec = mp::xml::get_int(ptr->children, 30); + m_p->m_timeout_sec = mp::xml::get_int(ptr, 30); } else if (!strcmp((const char *) ptr->name, "default_target")) { @@ -443,7 +525,11 @@ void yf::Z3950Client::configure(const xmlNode *ptr, bool test_only) } else if (!strcmp((const char *) ptr->name, "max-sockets")) { - m_p->m_max_sockets = mp::xml::get_int(ptr->children, 0); + m_p->m_max_sockets = mp::xml::get_int(ptr, 0); + } + else if (!strcmp((const char *) ptr->name, "force_close")) + { + m_p->m_force_close = mp::xml::get_bool(ptr, 0); } else { @@ -470,8 +556,9 @@ extern "C" { /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil - * c-file-style: "stroustrup" * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +