X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_z3950_client.cpp;h=cca4b8aea909d94f5cdd58d751dedd1cd4de360e;hb=cc38849384cc6d7b55c0d785ef44f03708d765ae;hp=190275b92d997af2ad923e171e379e22b2957a88;hpb=7752c2db540a9964268fb4280fd50bce2e495dce;p=metaproxy-moved-to-github.git diff --git a/src/filter_z3950_client.cpp b/src/filter_z3950_client.cpp index 190275b..cca4b8a 100644 --- a/src/filter_z3950_client.cpp +++ b/src/filter_z3950_client.cpp @@ -1,4 +1,4 @@ -/* $Id: filter_z3950_client.cpp,v 1.10 2005-11-03 14:45:16 adam Exp $ +/* $Id: filter_z3950_client.cpp,v 1.16 2006-01-09 13:43:59 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -6,17 +6,20 @@ #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 "util.hpp" -#include "filter_z3950_client.hpp" - #include #include #include @@ -26,15 +29,12 @@ #include #include -#include - namespace yf = yp2::filter; namespace yp2 { 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); @@ -46,14 +46,16 @@ 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_ticks; std::string m_host; }; @@ -77,7 +79,8 @@ yf::Z3950Client::Assoc::Assoc(yazpp_1::SocketManager *socket_manager, std::string host) : 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_ticks(0), m_host(host) { // std::cout << "create assoc " << this << "\n"; @@ -110,14 +113,22 @@ void yf::Z3950Client::Assoc::failNotify() void yf::Z3950Client::Assoc::timeoutNotify() { - m_waiting = false; - - yp2::odr odr; - - if (m_package) + m_ticks++; + if (m_ticks == 30) { - m_package->response() = odr.create_close(Z_Close_lackOfActivity, 0); - m_package->session().close(); + m_waiting = false; + + yp2::odr odr; + + if (m_package) + { + if (m_connected) + m_package->response() = odr.create_close(Z_Close_lackOfActivity, 0); + else + m_package->response() = odr.create_close(Z_Close_peerAbort, 0); + + m_package->session().close(); + } } } @@ -151,39 +162,48 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package) 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 + 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) { yp2::odr odr; package.response() = odr.create_close(Z_Close_protocolError, - "no init request for session"); + "First PDU was not an " + "Initialize Request"); package.session().close(); return 0; } @@ -214,16 +234,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_ticks = 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) @@ -232,14 +258,25 @@ void yf::Z3950Client::Rep::send_and_receive(Package &package, } // prepare response + c->m_ticks = 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) @@ -250,8 +287,22 @@ 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--; + } + 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; @@ -259,10 +310,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(); } } @@ -278,6 +325,19 @@ void yf::Z3950Client::process(Package &package) const } +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: * c-basic-offset: 4