X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_frontend_net.cpp;h=a3904330bca176424ae882461a4b998a2a34bc03;hb=f82b19f2b93707657fee804bd1242f2548d51ada;hp=6b2a46eba385327a41a8e5874c6900d967c5d9cd;hpb=834e7cda28e6f15fb39e0f58ce51268ef8b36ac4;p=metaproxy-moved-to-github.git diff --git a/src/filter_frontend_net.cpp b/src/filter_frontend_net.cpp index 6b2a46e..a390433 100644 --- a/src/filter_frontend_net.cpp +++ b/src/filter_frontend_net.cpp @@ -1,3 +1,8 @@ +/* $Id: filter_frontend_net.cpp,v 1.7 2005-10-15 14:09:09 adam Exp $ + Copyright (c) 2005, Index Data. + +%LICENSE% + */ #include "config.hpp" @@ -14,14 +19,12 @@ #include -using namespace yp2; - -class P2_Session : public yazpp_1::Z_Assoc { +class ZAssocServerChild : public yazpp_1::Z_Assoc { public: - ~P2_Session(); - P2_Session(yazpp_1::IPDU_Observable *the_PDU_Observable, - ThreadPoolSocketObserver *m_my_thread, - const Package *package); + ~ZAssocServerChild(); + ZAssocServerChild(yazpp_1::IPDU_Observable *the_PDU_Observable, + yp2::ThreadPoolSocketObserver *m_thread_pool_observer, + const yp2::Package *package); int m_no_requests; private: yazpp_1::IPDU_Observer* sessionNotify( @@ -33,25 +36,25 @@ private: void timeoutNotify(); void connectNotify(); private: - ThreadPoolSocketObserver *m_my_thread; - Session m_session; - Origin m_origin; + yp2::ThreadPoolSocketObserver *m_thread_pool_observer; + yp2::Session m_session; + yp2::Origin m_origin; bool m_delete_flag; - const Package *m_package; + const yp2::Package *m_package; }; -class ThreadPoolPackage : public IThreadPoolMsg { +class ThreadPoolPackage : public yp2::IThreadPoolMsg { public: - ThreadPoolPackage(Package *package, P2_Session *ses) : + ThreadPoolPackage(yp2::Package *package, ZAssocServerChild *ses) : m_session(ses), m_package(package) { }; ~ThreadPoolPackage(); IThreadPoolMsg *handle(); void result(); private: - P2_Session *m_session; - Package *m_package; + ZAssocServerChild *m_session; + yp2::Package *m_package; }; @@ -75,48 +78,48 @@ void ThreadPoolPackage::result() delete this; } -IThreadPoolMsg *ThreadPoolPackage::handle() +yp2::IThreadPoolMsg *ThreadPoolPackage::handle() { m_package->move(); return this; } -P2_Session::P2_Session(yazpp_1::IPDU_Observable *the_PDU_Observable, - ThreadPoolSocketObserver *my_thread_pool, - const Package *package) - : Z_Assoc(the_PDU_Observable) +ZAssocServerChild::ZAssocServerChild(yazpp_1::IPDU_Observable *PDU_Observable, + yp2::ThreadPoolSocketObserver *my_thread_pool, + const yp2::Package *package) + : Z_Assoc(PDU_Observable) { - m_my_thread = my_thread_pool; + m_thread_pool_observer = my_thread_pool; m_no_requests = 0; m_delete_flag = false; m_package = package; } -yazpp_1::IPDU_Observer *P2_Session::sessionNotify(yazpp_1::IPDU_Observable +yazpp_1::IPDU_Observer *ZAssocServerChild::sessionNotify(yazpp_1::IPDU_Observable *the_PDU_Observable, int fd) { return 0; } -P2_Session::~P2_Session() +ZAssocServerChild::~ZAssocServerChild() { } -void P2_Session::recv_GDU(Z_GDU *z_pdu, int len) +void ZAssocServerChild::recv_GDU(Z_GDU *z_pdu, int len) { m_no_requests++; - Package *p = new Package(m_session, m_origin); + yp2::Package *p = new yp2::Package(m_session, m_origin); - ThreadPoolPackage *m = new ThreadPoolPackage(p, this); + ThreadPoolPackage *tp = new ThreadPoolPackage(p, this); p->copy_filter(*m_package); p->request() = yazpp_1::GDU(z_pdu); - m_my_thread->put(m); + m_thread_pool_observer->put(tp); } -void P2_Session::failNotify() +void ZAssocServerChild::failNotify() { // TODO: send Package to signal "close" if (m_session.is_closed()) @@ -125,29 +128,29 @@ void P2_Session::failNotify() m_session.close(); - Package *p = new Package(m_session, m_origin); + yp2::Package *p = new yp2::Package(m_session, m_origin); - ThreadPoolPackage *m = new ThreadPoolPackage(p, this); + ThreadPoolPackage *tp = new ThreadPoolPackage(p, this); p->copy_filter(*m_package); - m_my_thread->put(m); + m_thread_pool_observer->put(tp); } -void P2_Session::timeoutNotify() +void ZAssocServerChild::timeoutNotify() { failNotify(); } -void P2_Session::connectNotify() +void ZAssocServerChild::connectNotify() { } -class P2_Server : public yazpp_1::Z_Assoc { +class ZAssocServer : public yazpp_1::Z_Assoc { public: - ~P2_Server(); - P2_Server(yazpp_1::IPDU_Observable *the_PDU_Observable, - ThreadPoolSocketObserver *m_my_thread, - const Package *package); + ~ZAssocServer(); + ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable, + yp2::ThreadPoolSocketObserver *m_thread_pool_observer, + const yp2::Package *package); private: yazpp_1::IPDU_Observer* sessionNotify( yazpp_1::IPDU_Observable *the_PDU_Observable, @@ -158,53 +161,53 @@ private: void timeoutNotify(); void connectNotify(); private: - ThreadPoolSocketObserver *m_my_thread; - const Package *m_package; + yp2::ThreadPoolSocketObserver *m_thread_pool_observer; + const yp2::Package *m_package; }; -P2_Server::P2_Server(yazpp_1::IPDU_Observable *the_PDU_Observable, - ThreadPoolSocketObserver *my_thread, - const Package *package) - : Z_Assoc(the_PDU_Observable) +ZAssocServer::ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable, + yp2::ThreadPoolSocketObserver *thread_pool_observer, + const yp2::Package *package) + : Z_Assoc(PDU_Observable) { - m_my_thread = my_thread; + m_thread_pool_observer = thread_pool_observer; m_package = package; } -yazpp_1::IPDU_Observer *P2_Server::sessionNotify(yazpp_1::IPDU_Observable +yazpp_1::IPDU_Observer *ZAssocServer::sessionNotify(yazpp_1::IPDU_Observable *the_PDU_Observable, int fd) { - P2_Session *my = new P2_Session(the_PDU_Observable, m_my_thread, - m_package); + ZAssocServerChild *my = + new ZAssocServerChild(the_PDU_Observable, m_thread_pool_observer, + m_package); return my; } -P2_Server::~P2_Server() +ZAssocServer::~ZAssocServer() { } -void P2_Server::recv_GDU(Z_GDU *apdu, int len) +void ZAssocServer::recv_GDU(Z_GDU *apdu, int len) { } -void P2_Server::failNotify() +void ZAssocServer::failNotify() { } -void P2_Server::timeoutNotify() +void ZAssocServer::timeoutNotify() { } -void P2_Server::connectNotify() +void ZAssocServer::connectNotify() { } -FilterFrontendNet::FilterFrontendNet() +yp2::filter::FrontendNet::FrontendNet() { m_no_threads = 5; - m_listen_address = "@:9001"; m_listen_duration = 0; } @@ -242,36 +245,55 @@ void My_Timer_Thread::socketNotify(int event) close(m_fd[1]); } -Package &FilterFrontendNet::process(Package &package) const { +void yp2::filter::FrontendNet::process(Package &package) const { yazpp_1::SocketManager mySocketManager; My_Timer_Thread *tt = 0; if (m_listen_duration) tt = new My_Timer_Thread(&mySocketManager, m_listen_duration); - yazpp_1::PDU_Assoc *my_PDU_Assoc = - new yazpp_1::PDU_Assoc(&mySocketManager); - ThreadPoolSocketObserver threadPool(&mySocketManager, m_no_threads); - P2_Server z(my_PDU_Assoc, &threadPool, &package); - z.server(m_listen_address.c_str()); + ZAssocServer **az = new ZAssocServer *[m_ports.size()]; + // Create ZAssocServer for each port + size_t i; + for (i = 0; iserver(m_ports[i].c_str()); + } while (mySocketManager.processEvent() > 0) { if (tt && tt->timeout()) break; } - return package; + for (i = 0; i &yp2::filter::FrontendNet::ports() { - return m_listen_address; + return m_ports; } -int &FilterFrontendNet::listen_duration() +int &yp2::filter::FrontendNet::listen_duration() { return m_listen_duration; } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * c-file-style: "stroustrup" + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */