X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_z3950_client.cpp;h=9975aa6c48de64cfe7a817b9a21569d6cf2d15bd;hb=df8db6d8a539fa6d793aeb541f7c64d625c91d42;hp=db7a9fa1b5a38699a8640cc9589b39cbd621249a;hpb=307dee3f3ec0976642ef0a70aa39ca2eda5c3c0f;p=metaproxy-moved-to-github.git diff --git a/src/filter_z3950_client.cpp b/src/filter_z3950_client.cpp index db7a9fa..9975aa6 100644 --- a/src/filter_z3950_client.cpp +++ b/src/filter_z3950_client.cpp @@ -1,4 +1,4 @@ -/* $Id: filter_z3950_client.cpp,v 1.4 2005-10-25 16:01:14 adam Exp $ +/* $Id: filter_z3950_client.cpp,v 1.20 2006-01-13 15:09:35 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -7,12 +7,17 @@ #include "config.hpp" #include "filter.hpp" -#include "router.hpp" #include "package.hpp" +#include "util.hpp" +#include "filter_z3950_client.hpp" -#include +#include +#include +#include +#include -#include "filter_z3950_client.hpp" +#include +#include #include #include @@ -23,18 +28,15 @@ #include #include -#include - namespace yf = yp2::filter; namespace yp2 { namespace filter { class Z3950Client::Assoc : public yazpp_1::Z_Assoc{ - friend class Pimpl; - public: - Assoc(yp2::Session id, yazpp_1::SocketManager *socket_manager, + friend class Rep; + 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(); @@ -43,37 +45,44 @@ 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::Pimpl { + class Z3950Client::Rep { public: + int m_timeout_sec; boost::mutex m_mutex; - std::list m_clients; + boost::condition m_cond_session_ready; + std::map m_clients; Z3950Client::Assoc *get_assoc(Package &package); void send_and_receive(Package &package, yf::Z3950Client::Assoc *c); - void release_assoc(Package &package, - yf::Z3950Client::Assoc *c); + void release_assoc(Package &package); }; } } +using namespace yp2; -yf::Z3950Client::Assoc::Assoc(yp2::Session id, - yazpp_1::SocketManager *socket_manager, +yf::Z3950Client::Assoc::Assoc(yazpp_1::SocketManager *socket_manager, yazpp_1::IPDU_Observable *PDU_Observable, - std::string host) - : Z_Assoc(PDU_Observable), m_session_id(id), + std::string host, int timeout_sec) + : Z_Assoc(PDU_Observable), m_socket_manager(socket_manager), m_PDU_Observable(PDU_Observable), - m_package(0), 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"; @@ -95,37 +104,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; + yp2::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; + + yp2::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) @@ -144,103 +162,113 @@ yazpp_1::IPDU_Observer *yf::Z3950Client::Assoc::sessionNotify( } -yf::Z3950Client::Z3950Client() { - m_p = new yf::Z3950Client::Pimpl; +yf::Z3950Client::Z3950Client() : m_p(new yf::Z3950Client::Rep) +{ + m_p->m_timeout_sec = 30; } yf::Z3950Client::~Z3950Client() { - delete m_p; } -yf::Z3950Client::Assoc *yf::Z3950Client::Pimpl::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::list::iterator it; - - for (it = m_clients.begin(); it != m_clients.end(); it++) - { - if ((*it)->m_session_id == package.session()) - break; - } - if (it != m_clients.end()) - return *it; - - // only deal with Z39.50 + 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; } - 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 + 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; + yp2::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); + VAL_PROXY, + /* categoryValue */ 1, /* delete */ 1); if (!vhost) { - ODR odr = odr_createmem(ODR_ENCODE); - Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse); + yp2::odr odr; + package.response() = odr.create_initResponse( + apdu, + YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED, + "Virtual host not given"); - 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; } - + 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(package.session(), - sm, pdu_as, - vhost); - m_clients.push_back(as); + yf::Z3950Client::Assoc *as = new yf::Z3950Client::Assoc(sm, pdu_as, vhost, + m_timeout_sec); + m_clients[package.session()] = as; return as; } -void yf::Z3950Client::Pimpl::send_and_receive(Package &package, - yf::Z3950Client::Assoc *c) +void yf::Z3950Client::Rep::send_and_receive(Package &package, + yf::Z3950Client::Assoc *c) { Z_GDU *gdu = package.request().get(); - if (!gdu || gdu->which != Z_GDU_Z3950) + if (c->m_destroyed) return; - // we should lock c! + 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); - 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) @@ -249,38 +277,59 @@ void yf::Z3950Client::Pimpl::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::Pimpl::release_assoc(Package &package, - yf::Z3950Client::Assoc *c) +void yf::Z3950Client::Rep::release_assoc(Package &package) { - if (package.session().is_closed()) + boost::mutex::scoped_lock lock(m_mutex); + std::map::iterator it; + + it = m_clients.find(package.session()); + if (it != m_clients.end()) { - boost::mutex::scoped_lock lock(m_mutex); - std::list::iterator it; - - for (it = m_clients.begin(); it != m_clients.end(); it++) - { - if ((*it)->m_session_id == package.session()) - break; + 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 (it != m_clients.end()) + + 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)->m_socket_manager; - delete *it; // destroy Z_Assoc + 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(); } } @@ -290,10 +339,46 @@ void yf::Z3950Client::process(Package &package) const if (c) { m_p->send_and_receive(package, c); - m_p->release_assoc(package, c); } + 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")) + { + std::string timeout_str = yp2::xml::get_text(ptr); + int timeout_sec = atoi(timeout_str.c_str()); + if (timeout_sec < 2) + throw yp2::filter::FilterException("Bad timeout value " + + timeout_str); + m_p->m_timeout_sec = timeout_sec; + } + else + { + throw yp2::filter::FilterException("Bad element " + + std::string((const char *) + ptr->name)); + } + } +} + +static yp2::filter::Base* filter_creator() +{ + return new yp2::filter::Z3950Client; +} + +extern "C" { + struct yp2_filter_struct yp2_filter_z3950_client = { + 0, + "z3950_client", + filter_creator + }; +} /* * Local variables: