X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_z3950_client.cpp;h=0e79cfe08fac6ca56fc9ad2b2c061f76f845ff4c;hb=637a685d61a9ff0e3f398a59da426979815c4d68;hp=f0323dc90dacdad52e191ee9c2dc6dc3f0affbf4;hpb=2925d7556b673d7557603adc7f5b61057de438cf;p=metaproxy-moved-to-github.git diff --git a/src/filter_z3950_client.cpp b/src/filter_z3950_client.cpp index f0323dc..0e79cfe 100644 --- a/src/filter_z3950_client.cpp +++ b/src/filter_z3950_client.cpp @@ -1,42 +1,63 @@ -/* $Id: filter_z3950_client.cpp,v 1.7 2005-10-30 16:39:18 adam Exp $ - Copyright (c) 2005, Index Data. +/* $Id: filter_z3950_client.cpp,v 1.31 2007-05-09 21:23:09 adam Exp $ + Copyright (c) 2005-2007, Index Data. -%LICENSE% +This file is part of Metaproxy. + +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 +Software Foundation; either version 2, or (at your option) any later +version. + +Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Metaproxy; see the file LICENSE. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. + */ +/* $Id: filter_z3950_client.cpp,v 1.31 2007-05-09 21:23:09 adam Exp $ + Copyright (c) 2005-2007, Index Data. + + See the LICENSE file for details */ #include "config.hpp" -#include #include "filter.hpp" -#include "router.hpp" #include "package.hpp" +#include "util.hpp" +#include "filter_z3950_client.hpp" + +#include +#include +#include +#include #include #include -#include "filter_z3950_client.hpp" - #include #include #include #include -#include -#include -#include +#include +#include +#include -#include +namespace mp = metaproxy_1; +namespace yf = mp::filter; -namespace yf = yp2::filter; - -namespace yp2 { +namespace metaproxy_1 { namespace filter { class Z3950Client::Assoc : public yazpp_1::Z_Assoc{ friend class Rep; - public: Assoc(yazpp_1::SocketManager *socket_manager, yazpp_1::IPDU_Observable *PDU_Observable, - std::string host); + std::string host, int timeout); ~Assoc(); void connectNotify(); void failNotify(); @@ -45,22 +66,29 @@ namespace yp2 { yazpp_1::IPDU_Observer* sessionNotify( yazpp_1::IPDU_Observable *the_PDU_Observable, int fd); - private: - // yp2::Session m_session_id; + yazpp_1::SocketManager *m_socket_manager; yazpp_1::IPDU_Observable *m_PDU_Observable; Package *m_package; bool m_in_use; bool m_waiting; + bool m_destroyed; bool m_connected; + int m_queue_len; + int m_time_elapsed; + int m_time_max; std::string m_host; }; class Z3950Client::Rep { public: + // number of seconds to wait before we give up request + int m_timeout_sec; + std::string m_default_target; + std::string m_force_target; boost::mutex m_mutex; boost::condition m_cond_session_ready; - std::map m_clients; + std::map m_clients; Z3950Client::Assoc *get_assoc(Package &package); void send_and_receive(Package &package, yf::Z3950Client::Assoc *c); @@ -69,13 +97,16 @@ namespace yp2 { } } +using namespace mp; yf::Z3950Client::Assoc::Assoc(yazpp_1::SocketManager *socket_manager, yazpp_1::IPDU_Observable *PDU_Observable, - std::string host) + 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_connected(false), + 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_host(host) { // std::cout << "create assoc " << this << "\n"; @@ -97,37 +128,46 @@ void yf::Z3950Client::Assoc::failNotify() { m_waiting = false; - ODR odr = odr_createmem(ODR_ENCODE); - - Z_APDU *apdu = zget_APDU(odr, Z_APDU_close); - - *apdu->u.close->closeReason = Z_Close_peerAbort; + mp::odr odr; if (m_package) { - m_package->response() = apdu; + Z_GDU *gdu = m_package->request().get(); + 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(); } - - odr_destroy(odr); } void yf::Z3950Client::Assoc::timeoutNotify() { - m_waiting = false; - - ODR odr = odr_createmem(ODR_ENCODE); - - Z_APDU *apdu = zget_APDU(odr, Z_APDU_close); - - *apdu->u.close->closeReason = Z_Close_lackOfActivity; - - if (m_package) + m_time_elapsed++; + if (m_time_elapsed >= m_time_max) { - m_package->response() = apdu; - m_package->session().close(); + 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() = + odr.create_close(apdu, Z_Close_peerAbort, 0); + + m_package->session().close(); + } } - odr_destroy(odr); } void yf::Z3950Client::Assoc::recv_GDU(Z_GDU *gdu, int len) @@ -148,6 +188,7 @@ yazpp_1::IPDU_Observer *yf::Z3950Client::Assoc::sessionNotify( yf::Z3950Client::Z3950Client() : m_p(new yf::Z3950Client::Rep) { + m_p->m_timeout_sec = 30; } yf::Z3950Client::~Z3950Client() { @@ -158,73 +199,108 @@ 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; + std::map::iterator it; - while(true) - { - it = m_clients.find(package.session()); - if (it == m_clients.end()) - break; - - if (!it->second->m_in_use) - { - it->second->m_in_use = true; - return it->second; - } - m_cond_session_ready.wait(lock); - } - - // only deal with Z39.50 Z_GDU *gdu = package.request().get(); - + // only deal with Z39.50 if (!gdu || gdu->which != Z_GDU_Z3950) { package.move(); return 0; } - Z_APDU *apdu = gdu->u.z3950; - + it = m_clients.find(package.session()); + if (it != m_clients.end()) + { + it->second->m_queue_len++; + while(true) + { +#if 0 + // double init .. NOT working yet + if (gdu && gdu->which == Z_GDU_Z3950 && + gdu->u.z3950->which == Z_APDU_initRequest) + { + yazpp_1::SocketManager *s = it->second->m_socket_manager; + delete it->second; // destroy Z_Assoc + delete s; // then manager + m_clients.erase(it); + break; + } +#endif + if (!it->second->m_in_use) + { + it->second->m_in_use = true; + return it->second; + } + m_cond_session_ready.wait(lock); + } + } // new Z39.50 session .. - + Z_APDU *apdu = gdu->u.z3950; // check that it is init. If not, close if (apdu->which != Z_APDU_initRequest) { - ODR odr = odr_createmem(ODR_ENCODE); - Z_APDU *apdu = zget_APDU(odr, Z_APDU_close); - - *apdu->u.close->closeReason = Z_Close_protocolError; - apdu->u.close->diagnosticInformation = - odr_strdup(odr, "no init request for session"); - - package.response() = apdu; + mp::odr odr; + package.response() = odr.create_close(apdu, + Z_Close_protocolError, + "First PDU was not an " + "Initialize Request"); package.session().close(); - odr_destroy(odr); return 0; } - // check virtual host - const char *vhost = - yaz_oi_get_string_oidval(&apdu->u.initRequest->otherInfo, - VAL_PROXY, 1, 0); - if (!vhost) + std::string target = m_force_target; + if (!target.length()) { - ODR odr = odr_createmem(ODR_ENCODE); - Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse); - - apdu->u.initResponse->userInformationField = - zget_init_diagnostics(odr, - YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED, - "Virtual host not given"); - package.response() = apdu; - - package.session().close(); - odr_destroy(odr); - return 0; + target = m_default_target; + std::list vhosts; + mp::util::remove_vhost_otherinfo(&apdu->u.initRequest->otherInfo, + vhosts); + size_t no_vhosts = vhosts.size(); + if (no_vhosts == 1) + { + std::list::const_iterator v_it = vhosts.begin(); + target = *v_it; + } + else if (no_vhosts == 0) + { + if (!target.length()) + { + // no default target. So we don't know where to connect + mp::odr odr; + package.response() = odr.create_initResponse( + apdu, + YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED, + "z3950_client: No virtal host given"); + + package.session().close(); + return 0; + } + } + else if (no_vhosts > 1) + { + mp::odr odr; + package.response() = odr.create_initResponse( + apdu, + YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP, + "z3950_client: Can not cope with multiple vhosts"); + package.session().close(); + return 0; + } } + std::list dblist; + std::string host; + mp::util::split_zurl(target, host, dblist); + if (dblist.size()) + { + ; // z3950_client: Databases in vhost ignored + } + yazpp_1::SocketManager *sm = new yazpp_1::SocketManager; yazpp_1::PDU_Assoc *pdu_as = new yazpp_1::PDU_Assoc(sm); - yf::Z3950Client::Assoc *as = new yf::Z3950Client::Assoc(sm, pdu_as, vhost); + yf::Z3950Client::Assoc *as = new yf::Z3950Client::Assoc(sm, pdu_as, + host.c_str(), + m_timeout_sec); m_clients[package.session()] = as; return as; } @@ -234,16 +310,22 @@ void yf::Z3950Client::Rep::send_and_receive(Package &package, { Z_GDU *gdu = package.request().get(); + if (c->m_destroyed) + return; + if (!gdu || gdu->which != Z_GDU_Z3950) return; + c->m_time_elapsed = 0; c->m_package = &package; c->m_waiting = true; if (!c->m_connected) { c->client(c->m_host.c_str()); + c->timeout(1); // so timeoutNotify gets called once per second - while (c->m_waiting && c->m_socket_manager->processEvent() > 0) + while (!c->m_destroyed && c->m_waiting + && c->m_socket_manager->processEvent() > 0) ; } if (!c->m_connected) @@ -252,26 +334,51 @@ 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); - - while (c->m_waiting && c->m_socket_manager->processEvent() > 0) - ; + + switch(gdu->u.z3950->which) + { + case Z_APDU_triggerResourceControlRequest: + // request only.. + break; + default: + // for the rest: wait for a response PDU + while (!c->m_destroyed && c->m_waiting + && c->m_socket_manager->processEvent() > 0) + ; + break; + } } void yf::Z3950Client::Rep::release_assoc(Package &package) { boost::mutex::scoped_lock lock(m_mutex); - std::map::iterator it; + std::map::iterator it; 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--; + } + 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; @@ -279,10 +386,6 @@ void yf::Z3950Client::Rep::release_assoc(Package &package) delete s; // then manager m_clients.erase(it); } - else - { - it->second->m_in_use = false; - } m_cond_session_ready.notify_all(); } } @@ -297,6 +400,45 @@ void yf::Z3950Client::process(Package &package) const m_p->release_assoc(package); } +void yf::Z3950Client::configure(const xmlNode *ptr) +{ + for (ptr = ptr->children; ptr; ptr = ptr->next) + { + if (ptr->type != XML_ELEMENT_NODE) + continue; + if (!strcmp((const char *) ptr->name, "timeout")) + { + m_p->m_timeout_sec = mp::xml::get_int(ptr->children, 30); + } + else if (!strcmp((const char *) ptr->name, "default_target")) + { + m_p->m_default_target = mp::xml::get_text(ptr); + } + else if (!strcmp((const char *) ptr->name, "force_target")) + { + m_p->m_force_target = mp::xml::get_text(ptr); + } + else + { + throw mp::filter::FilterException("Bad element " + + std::string((const char *) + ptr->name)); + } + } +} + +static mp::filter::Base* filter_creator() +{ + return new mp::filter::Z3950Client; +} + +extern "C" { + struct metaproxy_1_filter_struct metaproxy_1_filter_z3950_client = { + 0, + "z3950_client", + filter_creator + }; +} /* * Local variables: