X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_frontend_net.cpp;h=f9142e693877cae2a65c73929fc64f3fda5293fb;hb=d0123337d70b0fb97b578cc57467bb94980f1014;hp=1b87267e72cb0929ca1ce47444597b6ab838f674;hpb=b112dc32edc6bf672a08ed573ec921d0a80a7c79;p=metaproxy-moved-to-github.git diff --git a/src/filter_frontend_net.cpp b/src/filter_frontend_net.cpp index 1b87267..f9142e6 100644 --- a/src/filter_frontend_net.cpp +++ b/src/filter_frontend_net.cpp @@ -1,7 +1,5 @@ -/* $Id: filter_frontend_net.cpp,v 1.25 2008-01-21 16:15:00 adam Exp $ - Copyright (c) 2005-2007, Index Data. - -This file is part of Metaproxy. +/* This file is part of Metaproxy. + Copyright (C) 2005-2009 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 @@ -14,10 +12,9 @@ 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. - */ +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ #include "config.hpp" @@ -37,6 +34,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA namespace mp = metaproxy_1; namespace metaproxy_1 { + class My_Timer_Thread; + class ZAssocServer; namespace filter { class FrontendNet::Rep { friend class FrontendNet; @@ -44,6 +43,9 @@ namespace metaproxy_1 { std::vector m_ports; int m_listen_duration; int m_session_timeout; + yazpp_1::SocketManager mySocketManager; + + ZAssocServer **az; }; } class My_Timer_Thread : public yazpp_1::ISocketObserver { @@ -82,23 +84,22 @@ namespace metaproxy_1 { class ThreadPoolPackage : public mp::IThreadPoolMsg { public: ThreadPoolPackage(mp::Package *package, mp::ZAssocChild *ses) : - m_session(ses), m_package(package) { }; + m_assoc_child(ses), m_package(package) { }; ~ThreadPoolPackage(); IThreadPoolMsg *handle(); void result(); private: - mp::ZAssocChild *m_session; + mp::ZAssocChild *m_assoc_child; mp::Package *m_package; }; class ZAssocServer : public yazpp_1::Z_Assoc { public: ~ZAssocServer(); - ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable, - mp::ThreadPoolSocketObserver *m_thread_pool_observer, - const mp::Package *package, - int timeout); + ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable, int timeout); + void set_package(const mp::Package *package); + void set_thread_pool(ThreadPoolSocketObserver *m_thread_pool_observer); private: yazpp_1::IPDU_Observer* sessionNotify( yazpp_1::IPDU_Observable *the_PDU_Observable, @@ -122,14 +123,14 @@ mp::ThreadPoolPackage::~ThreadPoolPackage() void mp::ThreadPoolPackage::result() { - m_session->m_no_requests--; + m_assoc_child->m_no_requests--; yazpp_1::GDU *gdu = &m_package->response(); if (gdu->get()) { int len; - m_session->send_GDU(gdu->get(), &len); + m_assoc_child->send_GDU(gdu->get(), &len); } else if (!m_package->session().is_closed()) { @@ -146,14 +147,24 @@ void mp::ThreadPoolPackage::result() z_gdu->u.z3950, Z_Close_systemProblem, "unhandled Z39.50 request"); - m_session->send_Z_PDU(apdu_response, &len); - m_package->session().close(); + m_assoc_child->send_Z_PDU(apdu_response, &len); + } + else if (z_gdu && z_gdu->which == Z_GDU_HTTP_Request) + { + // For HTTP, respond with Server Error + int len; + mp::odr odr; + Z_GDU *zgdu_res + = odr.create_HTTP_Response(m_package->session(), + z_gdu->u.HTTP_Request, 500); + m_assoc_child->send_GDU(zgdu_res, &len); } + m_package->session().close(); } - if (m_session->m_no_requests == 0 && m_package->session().is_closed()) + if (m_assoc_child->m_no_requests == 0 && m_package->session().is_closed()) { - m_session->close(); + m_assoc_child->close(); } delete this; } @@ -208,7 +219,8 @@ void mp::ZAssocChild::failNotify() // TODO: send Package to signal "close" if (m_session.is_closed()) { - delete this; + if (m_no_requests == 0) + delete this; return; } m_no_requests++; @@ -233,14 +245,21 @@ void mp::ZAssocChild::connectNotify() } mp::ZAssocServer::ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable, - mp::ThreadPoolSocketObserver *thread_pool_observer, - const mp::Package *package, int timeout) : Z_Assoc(PDU_Observable), m_session_timeout(timeout) { - m_thread_pool_observer = thread_pool_observer; + m_package = 0; +} + + +void mp::ZAssocServer::set_package(const mp::Package *package) +{ m_package = package; +} +void mp::ZAssocServer::set_thread_pool(ThreadPoolSocketObserver *observer) +{ + m_thread_pool_observer = observer; } yazpp_1::IPDU_Observer *mp::ZAssocServer::sessionNotify(yazpp_1::IPDU_Observable @@ -278,10 +297,18 @@ mp::filter::FrontendNet::FrontendNet() : m_p(new Rep) m_p->m_no_threads = 5; m_p->m_listen_duration = 0; m_p->m_session_timeout = 300; // 5 minutes + m_p->az = 0; } mp::filter::FrontendNet::~FrontendNet() { + if (m_p->az) + { + size_t i; + for (i = 0; im_ports.size(); i++) + delete m_p->az[i]; + delete [] m_p->az; + } } bool mp::My_Timer_Thread::timeout() @@ -306,44 +333,31 @@ void mp::My_Timer_Thread::socketNotify(int event) void mp::filter::FrontendNet::process(Package &package) const { - if (m_p->m_ports.size() == 0) + if (m_p->az == 0) return; - - yazpp_1::SocketManager mySocketManager; - + size_t i; My_Timer_Thread *tt = 0; - if (m_p->m_listen_duration) - tt = new My_Timer_Thread(&mySocketManager, m_p->m_listen_duration); - ThreadPoolSocketObserver threadPool(&mySocketManager, m_p->m_no_threads); - - mp::ZAssocServer **az = new mp::ZAssocServer *[m_p->m_ports.size()]; + if (m_p->m_listen_duration) + tt = new My_Timer_Thread(&m_p->mySocketManager, + m_p->m_listen_duration); + + ThreadPoolSocketObserver tp(&m_p->mySocketManager, m_p->m_no_threads); - // Create mp::ZAssocServer for each port - size_t i; for (i = 0; im_ports.size(); i++) { - // create a PDU assoc object (one per mp::ZAssocServer) - yazpp_1::PDU_Assoc *as = new yazpp_1::PDU_Assoc(&mySocketManager); - - // create ZAssoc with PDU Assoc - az[i] = new mp::ZAssocServer(as, &threadPool, &package, - m_p->m_session_timeout); - az[i]->server(m_p->m_ports[i].c_str()); + m_p->az[i]->set_package(&package); + m_p->az[i]->set_thread_pool(&tp); } - while (mySocketManager.processEvent() > 0) + while (m_p->mySocketManager.processEvent() > 0) { if (tt && tt->timeout()) break; } - for (i = 0; im_ports.size(); i++) - delete az[i]; - - delete [] az; delete tt; } -void mp::filter::FrontendNet::configure(const xmlNode * ptr) +void mp::filter::FrontendNet::configure(const xmlNode * ptr, bool test_only) { if (!ptr || !ptr->children) { @@ -385,17 +399,38 @@ void mp::filter::FrontendNet::configure(const xmlNode * ptr) ptr->name)); } } - m_p->m_ports = ports; + if (test_only) + return; + set_ports(ports); } -std::vector &mp::filter::FrontendNet::ports() +void mp::filter::FrontendNet::set_ports(std::vector &ports) { - return m_p->m_ports; + m_p->m_ports = ports; + + m_p->az = new mp::ZAssocServer *[m_p->m_ports.size()]; + + // Create mp::ZAssocServer for each port + size_t i; + for (i = 0; im_ports.size(); i++) + { + // create a PDU assoc object (one per mp::ZAssocServer) + yazpp_1::PDU_Assoc *as = new yazpp_1::PDU_Assoc(&m_p->mySocketManager); + + // create ZAssoc with PDU Assoc + m_p->az[i] = new mp::ZAssocServer(as, + m_p->m_session_timeout); + if (m_p->az[i]->server(m_p->m_ports[i].c_str())) + { + throw mp::filter::FilterException("Unable to bind to address " + + std::string(m_p->m_ports[i])); + } + } } -int &mp::filter::FrontendNet::listen_duration() +void mp::filter::FrontendNet::set_listen_duration(int d) { - return m_p->m_listen_duration; + m_p->m_listen_duration = d; } static mp::filter::Base* filter_creator() @@ -414,8 +449,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 */ +