X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_frontend_net.cpp;h=f19e6d41cac4014ead875f8fe3d9a9ee36981a19;hb=b9e82b9adecd1dbd44e54c28d6b0d1336721bfec;hp=1bee3cd8585ef9dc5676c98e74ed74b833766027;hpb=e9530d6289df9b848e4901d7c73f5a2f27706d66;p=metaproxy-moved-to-github.git diff --git a/src/filter_frontend_net.cpp b/src/filter_frontend_net.cpp index 1bee3cd..f19e6d4 100644 --- a/src/filter_frontend_net.cpp +++ b/src/filter_frontend_net.cpp @@ -1,5 +1,5 @@ /* This file is part of Metaproxy. - Copyright (C) 2005-2008 Index Data + Copyright (C) 2005-2011 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 @@ -18,15 +18,16 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "config.hpp" -#include "util.hpp" +#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 @@ -37,14 +38,20 @@ 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; yazpp_1::SocketManager mySocketManager; - ZAssocServer **az; }; } @@ -63,8 +70,10 @@ namespace metaproxy_1 { ~ZAssocChild(); ZAssocChild(yazpp_1::IPDU_Observable *the_PDU_Observable, mp::ThreadPoolSocketObserver *m_thread_pool_observer, - const mp::Package *package); + const mp::Package *package, + std::string route); int m_no_requests; + std::string m_route; private: yazpp_1::IPDU_Observer* sessionNotify( yazpp_1::IPDU_Observable *the_PDU_Observable, @@ -84,20 +93,21 @@ 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, int timeout); + ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable, int timeout, + int connect_max, std::string route); void set_package(const mp::Package *package); void set_thread_pool(ThreadPoolSocketObserver *m_thread_pool_observer); private: @@ -113,6 +123,9 @@ 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; }; } @@ -123,14 +136,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()) { @@ -147,34 +160,46 @@ 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; } 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) + const mp::Package *package, + std::string route) : Z_Assoc(PDU_Observable) { 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"; @@ -209,7 +234,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++; @@ -234,8 +260,10 @@ void mp::ZAssocChild::connectNotify() } mp::ZAssocServer::ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable, - int timeout) - : Z_Assoc(PDU_Observable), m_session_timeout(timeout) + int timeout, int connect_max, + std::string route) + : Z_Assoc(PDU_Observable), m_session_timeout(timeout), + m_connect_max(connect_max), m_route(route) { m_package = 0; } @@ -254,9 +282,19 @@ void mp::ZAssocServer::set_thread_pool(ThreadPoolSocketObserver *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); my->timeout(m_session_timeout); return my; } @@ -286,6 +324,7 @@ 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; } @@ -352,14 +391,21 @@ void mp::filter::FrontendNet::configure(const xmlNode * ptr, bool test_only) { 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); } @@ -381,6 +427,10 @@ void mp::filter::FrontendNet::configure(const xmlNode * ptr, bool test_only) + 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 { throw mp::filter::FilterException("Bad element " @@ -395,6 +445,23 @@ void mp::filter::FrontendNet::configure(const xmlNode * ptr, bool test_only) 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); +} + + +void mp::filter::FrontendNet::set_ports(std::vector &ports) +{ m_p->m_ports = ports; m_p->az = new mp::ZAssocServer *[m_p->m_ports.size()]; @@ -408,11 +475,13 @@ void mp::filter::FrontendNet::set_ports(std::vector &ports) // 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())) + m_p->m_session_timeout, + m_p->m_connect_max, + m_p->m_ports[i].route); + 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])); + + std::string(m_p->m_ports[i].port)); } } } @@ -438,8 +507,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 */ +