X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffilter_frontend_net.cpp;h=7457fae60a41ead79c533cb5a48d560c4f12096c;hb=1cdd720a9a3ba872aa092c80b28413d8b2579eed;hp=1a91c076be66f2aab18b8f3ec86977d7564256c1;hpb=4cd9e521c5e96e3fcc5dcec6192571b54a1351c4;p=metaproxy-moved-to-github.git diff --git a/src/filter_frontend_net.cpp b/src/filter_frontend_net.cpp index 1a91c07..7457fae 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-2009 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,10 +18,10 @@ 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 @@ -38,10 +38,16 @@ 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; @@ -64,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, @@ -99,7 +107,7 @@ namespace metaproxy_1 { public: ~ZAssocServer(); ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable, int timeout, - int connect_max); + int connect_max, std::string route); void set_package(const mp::Package *package); void set_thread_pool(ThreadPoolSocketObserver *m_thread_pool_observer); private: @@ -117,6 +125,7 @@ namespace metaproxy_1 { int m_session_timeout; int m_connect_max; yazpp_1::LimitConnect limit_connect; + std::string m_route; }; } @@ -175,20 +184,22 @@ void mp::ThreadPoolPackage::result() 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"; @@ -213,7 +224,7 @@ 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); + p->copy_route(*m_package); p->request() = yazpp_1::GDU(z_pdu); m_thread_pool_observer->put(tp); } @@ -234,7 +245,7 @@ void mp::ZAssocChild::failNotify() mp::Package *p = new mp::Package(m_session, m_origin); mp::ThreadPoolPackage *tp = new mp::ThreadPoolPackage(p, this); - p->copy_filter(*m_package); + p->copy_route(*m_package); m_thread_pool_observer->put(tp); } @@ -249,9 +260,10 @@ void mp::ZAssocChild::connectNotify() } mp::ZAssocServer::ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable, - int timeout, int connect_max) + int timeout, int connect_max, + std::string route) : Z_Assoc(PDU_Observable), m_session_timeout(timeout), - m_connect_max(connect_max) + m_connect_max(connect_max), m_route(route) { m_package = 0; } @@ -282,7 +294,7 @@ yazpp_1::IPDU_Observer *mp::ZAssocServer::sessionNotify(yazpp_1::IPDU_Observable } 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; } @@ -312,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; } @@ -372,20 +385,28 @@ void mp::filter::FrontendNet::process(Package &package) const delete tt; } -void mp::filter::FrontendNet::configure(const xmlNode * ptr, bool test_only) +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); } @@ -409,7 +430,7 @@ void mp::filter::FrontendNet::configure(const xmlNode * ptr, bool test_only) } else if (!strcmp((const char *) ptr->name, "connect-max")) { - m_p->m_connect_max = mp::xml::get_int(ptr->children, 0); + m_p->m_connect_max = mp::xml::get_int(ptr, 0); } else { @@ -425,6 +446,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()]; @@ -439,11 +477,12 @@ 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, - m_p->m_connect_max); - if (m_p->az[i]->server(m_p->m_ports[i].c_str())) + 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)); } } }