X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_z3950_client.cpp;h=6d51c9e2a04b6cb7cb1c9425c7390a44b6af4442;hb=77dee8966dd1304a0fb8540c3fc68d02dc6ce84a;hp=18d5c589e0445555d9172ce93769aa6b7a538bc7;hpb=ced440c14eaf1e9408f994ef1e7be2deb8a7db0b;p=metaproxy-moved-to-github.git diff --git a/src/filter_z3950_client.cpp b/src/filter_z3950_client.cpp index 18d5c58..6d51c9e 100644 --- a/src/filter_z3950_client.cpp +++ b/src/filter_z3950_client.cpp @@ -1,4 +1,4 @@ -/* $Id: filter_z3950_client.cpp,v 1.1 2005-10-16 16:05:44 adam Exp $ +/* $Id: filter_z3950_client.cpp,v 1.11 2005-11-10 23:10:42 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -9,10 +9,16 @@ #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,16 +29,13 @@ #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); ~Assoc(); @@ -43,42 +46,45 @@ 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_connected; std::string m_host; }; - class Z3950Client::Pimpl { + class Z3950Client::Rep { public: 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); }; } } +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), + : 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_connected(false), m_host(host) { + // std::cout << "create assoc " << this << "\n"; } yf::Z3950Client::Assoc::~Assoc() { - delete m_socket_manager; + // std::cout << "destroy assoc " << this << "\n"; } void yf::Z3950Client::Assoc::connectNotify() @@ -92,37 +98,26 @@ 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; + m_package->response() = odr.create_close(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; + yp2::odr odr; if (m_package) { - m_package->response() = apdu; + m_package->response() = odr.create_close(Z_Close_lackOfActivity, 0); m_package->session().close(); } - odr_destroy(odr); } void yf::Z3950Client::Assoc::recv_GDU(Z_GDU *gdu, int len) @@ -141,53 +136,54 @@ 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) +{ } 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) { - Z_GDU *gdu = package.request().get(); + // only one thread messes with the clients list at a time + boost::mutex::scoped_lock lock(m_mutex); + + 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(); + if (!gdu || gdu->which != Z_GDU_Z3950) { package.move(); return 0; } - - // only one thread messes with the clients list at a time - boost::mutex::scoped_lock lock(m_mutex); - Z_APDU *apdu = gdu->u.z3950; - 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; - - // new session .. + // new Z39.50 session .. // 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; - package.response() = apdu; + yp2::odr odr; + package.response() = odr.create_close(Z_Close_protocolError, + "no init request for session"); package.session().close(); - odr_destroy(odr); return 0; } // check virtual host @@ -196,33 +192,29 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Pimpl::get_assoc(Package &package) VAL_PROXY, 1, 0); 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( + 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_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) { - // we should lock c! + Z_GDU *gdu = package.request().get(); + + if (!gdu || gdu->which != Z_GDU_Z3950) + return; c->m_package = &package; c->m_waiting = true; @@ -243,18 +235,45 @@ void yf::Z3950Client::Pimpl::send_and_receive(Package &package, // relay the package .. int len; - c->send_GDU(package.request().get(), &len); + c->send_GDU(gdu, &len); while (c->m_waiting && c->m_socket_manager->processEvent() > 0) ; } +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()) + { + if (package.session().is_closed()) + { + // 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); + } + else + { + it->second->m_in_use = false; + } + m_cond_session_ready.notify_all(); + } +} + void yf::Z3950Client::process(Package &package) const { yf::Z3950Client::Assoc *c = m_p->get_assoc(package); - if (!c) - return; - m_p->send_and_receive(package, c); + if (c) + { + m_p->send_and_receive(package, c); + } + m_p->release_assoc(package); }