X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_frontend_net.cpp;h=216d74066b8bd974d8f5448e753863e05a867c6b;hb=aff78cecdb2c7292899ae15ee8a5fd41accef2b5;hp=fe5b3ace6b49ecdc0393a694b90182ef5c1652b2;hpb=b70b9ec78f0ab1c3ed3b432de986159129a0e4ed;p=metaproxy-moved-to-github.git diff --git a/src/filter_frontend_net.cpp b/src/filter_frontend_net.cpp index fe5b3ac..216d740 100644 --- a/src/filter_frontend_net.cpp +++ b/src/filter_frontend_net.cpp @@ -1,20 +1,36 @@ -/* $Id: filter_frontend_net.cpp,v 1.23 2007-01-25 14:05:54 adam Exp $ - Copyright (c) 2005-2007, Index Data. +/* This file is part of Metaproxy. + Copyright (C) 2005-2012 Index Data - See the LICENSE file for details - */ +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 this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ #include "config.hpp" -#include "util.hpp" +#include +#include +#include #include "pipe.hpp" -#include "filter.hpp" -#include "package.hpp" +#include +#include #include "thread_pool_observer.hpp" #include "filter_frontend_net.hpp" #include #include #include +#include +#include #include #include @@ -22,13 +38,25 @@ namespace mp = metaproxy_1; namespace metaproxy_1 { + class My_Timer_Thread; + class ZAssocServer; namespace filter { + class FrontendNet::Port { + friend class Rep; + friend class FrontendNet; + std::string port; + std::string route; + }; class FrontendNet::Rep { friend class FrontendNet; int m_no_threads; - std::vector m_ports; + std::vector m_ports; int m_listen_duration; int m_session_timeout; + int m_connect_max; + std::string m_msg_config; + yazpp_1::SocketManager mySocketManager; + ZAssocServer **az; }; } class My_Timer_Thread : public yazpp_1::ISocketObserver { @@ -45,9 +73,12 @@ namespace metaproxy_1 { public: ~ZAssocChild(); ZAssocChild(yazpp_1::IPDU_Observable *the_PDU_Observable, - mp::ThreadPoolSocketObserver *m_thread_pool_observer, - const mp::Package *package); + mp::ThreadPoolSocketObserver *m_thread_pool_observer, + const mp::Package *package, + std::string route, + const char *msg_config); int m_no_requests; + std::string m_route; private: yazpp_1::IPDU_Observer* sessionNotify( yazpp_1::IPDU_Observable *the_PDU_Observable, @@ -63,27 +94,30 @@ namespace metaproxy_1 { mp::Origin m_origin; bool m_delete_flag; const mp::Package *m_package; + const char *m_msg_config; }; class ThreadPoolPackage : public mp::IThreadPoolMsg { public: - ThreadPoolPackage(mp::Package *package, mp::ZAssocChild *ses) : - m_session(ses), m_package(package) { }; + ThreadPoolPackage(mp::Package *package, mp::ZAssocChild *ses, + const char *msg_config); ~ThreadPoolPackage(); IThreadPoolMsg *handle(); - void result(); + void result(const char *t_info); private: - mp::ZAssocChild *m_session; + yaz_timing_t timer; + mp::ZAssocChild *m_assoc_child; mp::Package *m_package; - + const char *m_msg_config; }; 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, + int connect_max, std::string route, + const char *msg_config); + 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, @@ -97,24 +131,40 @@ namespace metaproxy_1 { mp::ThreadPoolSocketObserver *m_thread_pool_observer; const mp::Package *m_package; int m_session_timeout; + int m_connect_max; + yazpp_1::LimitConnect limit_connect; + std::string m_route; + const char *m_msg_config; }; } +mp::ThreadPoolPackage::ThreadPoolPackage(mp::Package *package, + mp::ZAssocChild *ses, + const char *msg_config) : + m_assoc_child(ses), m_package(package), m_msg_config(msg_config) +{ + if (msg_config) + timer = yaz_timing_create(); + else + timer = 0; +} + mp::ThreadPoolPackage::~ThreadPoolPackage() { + yaz_timing_destroy(&timer); // timer may be NULL delete m_package; } -void mp::ThreadPoolPackage::result() +void mp::ThreadPoolPackage::result(const char *t_info) { - 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()) { @@ -131,32 +181,61 @@ 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_assoc_child->m_no_requests == 0 && m_package->session().is_closed()) + { + m_assoc_child->close(); + } + + if (m_msg_config) + { + yaz_timing_stop(timer); + double duration = yaz_timing_get_real(timer); + + std::ostringstream os; + os << m_msg_config << " " + << *m_package << " " + << std::fixed << std::setprecision (6) << duration; + + yaz_log(YLOG_LOG, "%s %s", os.str().c_str(), t_info); } - if (m_session->m_no_requests == 0 && m_package->session().is_closed()) - delete m_session; delete this; } mp::IThreadPoolMsg *mp::ThreadPoolPackage::handle() { - m_package->move(); + m_package->move(m_assoc_child->m_route); return this; } mp::ZAssocChild::ZAssocChild(yazpp_1::IPDU_Observable *PDU_Observable, - mp::ThreadPoolSocketObserver *my_thread_pool, - const mp::Package *package) - : Z_Assoc(PDU_Observable) + mp::ThreadPoolSocketObserver *my_thread_pool, + const mp::Package *package, + std::string route, + const char *msg_config) + : Z_Assoc(PDU_Observable), m_msg_config(msg_config) { m_thread_pool_observer = my_thread_pool; m_no_requests = 0; m_delete_flag = false; m_package = package; + m_route = route; const char *peername = PDU_Observable->getpeername(); if (!peername) peername = "unknown"; @@ -180,8 +259,9 @@ void mp::ZAssocChild::recv_GDU(Z_GDU *z_pdu, int len) mp::Package *p = new mp::Package(m_session, m_origin); - mp::ThreadPoolPackage *tp = new mp::ThreadPoolPackage(p, this); - p->copy_filter(*m_package); + mp::ThreadPoolPackage *tp = new mp::ThreadPoolPackage(p, this, + m_msg_config); + p->copy_route(*m_package); p->request() = yazpp_1::GDU(z_pdu); m_thread_pool_observer->put(tp); } @@ -190,15 +270,20 @@ void mp::ZAssocChild::failNotify() { // TODO: send Package to signal "close" if (m_session.is_closed()) + { + if (m_no_requests == 0) + delete this; return; + } m_no_requests++; m_session.close(); mp::Package *p = new mp::Package(m_session, m_origin); - mp::ThreadPoolPackage *tp = new mp::ThreadPoolPackage(p, this); - p->copy_filter(*m_package); + mp::ThreadPoolPackage *tp = new mp::ThreadPoolPackage(p, this, + m_msg_config); + p->copy_route(*m_package); m_thread_pool_observer->put(tp); } @@ -213,22 +298,41 @@ 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) + int timeout, int connect_max, + std::string route, const char *msg_config) + : Z_Assoc(PDU_Observable), m_session_timeout(timeout), + m_connect_max(connect_max), m_route(route), m_msg_config(msg_config) +{ + m_package = 0; +} + + +void mp::ZAssocServer::set_package(const mp::Package *package) { - m_thread_pool_observer = thread_pool_observer; 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 *the_PDU_Observable, int fd) { + + const char *peername = the_PDU_Observable->getpeername(); + if (peername) + { + limit_connect.add_connect(peername); + limit_connect.cleanup(false); + int con_sz = limit_connect.get_total(peername); + if (m_connect_max && con_sz > m_connect_max) + return 0; + } mp::ZAssocChild *my = new mp::ZAssocChild(the_PDU_Observable, m_thread_pool_observer, - m_package); + m_package, m_route, m_msg_config); my->timeout(m_session_timeout); return my; } @@ -258,10 +362,30 @@ 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->m_connect_max = 0; + 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; + } + m_p->az = 0; +} + +void mp::filter::FrontendNet::stop() const +{ + if (m_p->az) + { + size_t i; + for (i = 0; im_ports.size(); i++) + m_p->az[i]->server(""); + } } bool mp::My_Timer_Thread::timeout() @@ -286,57 +410,52 @@ 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, + const char *path) { if (!ptr || !ptr->children) { throw mp::filter::FilterException("No ports for Frontend"); } - std::vector ports; + std::vector ports; for (ptr = ptr->children; ptr; ptr = ptr->next) { if (ptr->type != XML_ELEMENT_NODE) continue; if (!strcmp((const char *) ptr->name, "port")) { - std::string port = mp::xml::get_text(ptr); + Port port; + const struct _xmlAttr *attr; + for (attr = ptr->properties; attr; attr = attr->next) + { + if (!strcmp((const char *) attr->name, "route")) + port.route = mp::xml::get_text(attr); + } + port.port = mp::xml::get_text(ptr); ports.push_back(port); } @@ -358,6 +477,14 @@ void mp::filter::FrontendNet::configure(const xmlNode * ptr) + timeout_str); m_p->m_session_timeout = timeout; } + else if (!strcmp((const char *) ptr->name, "connect-max")) + { + m_p->m_connect_max = mp::xml::get_int(ptr, 0); + } + else if (!strcmp((const char *) ptr->name, "message")) + { + m_p->m_msg_config = mp::xml::get_text(ptr); + } else { throw mp::filter::FilterException("Bad element " @@ -365,17 +492,59 @@ void mp::filter::FrontendNet::configure(const xmlNode * ptr) ptr->name)); } } - m_p->m_ports = ports; + if (test_only) + return; + set_ports(ports); +} + +void mp::filter::FrontendNet::set_ports(std::vector &ports) +{ + std::vector nports; + size_t i; + + for (i = 0; i < ports.size(); i++) + { + Port nport; + + nport.port = ports[i]; + + nports.push_back(nport); + } + set_ports(nports); } -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, + m_p->m_connect_max, + m_p->m_ports[i].route, + m_p->m_msg_config.length() > 0 ? + m_p->m_msg_config.c_str() : 0); + if (m_p->az[i]->server(m_p->m_ports[i].port.c_str())) + { + throw mp::filter::FilterException("Unable to bind to address " + + std::string(m_p->m_ports[i].port)); + } + } } -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() @@ -394,8 +563,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 */ +