X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_frontend_net.cpp;h=68f28ba88dacc0efa6e41a9edf162f86c22df03f;hb=77dee8966dd1304a0fb8540c3fc68d02dc6ce84a;hp=ed9a4759025b9ed14b6482e13a5582bf8384ec63;hpb=57c1c4822f1de4d983c1aee3bc6059ad2600d991;p=metaproxy-moved-to-github.git

diff --git a/src/filter_frontend_net.cpp b/src/filter_frontend_net.cpp
index ed9a475..68f28ba 100644
--- a/src/filter_frontend_net.cpp
+++ b/src/filter_frontend_net.cpp
@@ -1,7 +1,13 @@
+/* $Id: filter_frontend_net.cpp,v 1.9 2005-11-07 21:57:10 adam Exp $
+   Copyright (c) 2005, Index Data.
+
+%LICENSE%
+ */
 
 
 #include "config.hpp"
 
+#include "pipe.hpp"
 #include "filter.hpp"
 #include "router.hpp"
 #include "package.hpp"
@@ -14,53 +20,80 @@
 
 #include <iostream>
 
-using namespace yp2;
-
-class P2_Session : public yazpp_1::Z_Assoc {
-public:
-    ~P2_Session();
-    P2_Session(yazpp_1::IPDU_Observable *the_PDU_Observable,
-	       ThreadPoolSocketObserver *m_my_thread,
-	       const Package *package);
-    int m_no_requests;
-private:
-    yazpp_1::IPDU_Observer* sessionNotify(
-        yazpp_1::IPDU_Observable *the_PDU_Observable,
-        int fd);
-    void recv_GDU(Z_GDU *apdu, int len);
-    
-    void failNotify();
-    void timeoutNotify();
+namespace yp2 {
+    class My_Timer_Thread : public yazpp_1::ISocketObserver {
+    private:
+        yazpp_1::ISocketObservable *m_obs;
+        Pipe m_pipe;
+        bool m_timeout;
+    public:
+        My_Timer_Thread(yazpp_1::ISocketObservable *obs, int duration);
+        void socketNotify(int event);
+        bool timeout();
+    };
+    class ZAssocChild : public yazpp_1::Z_Assoc {
+    public:
+        ~ZAssocChild();
+        ZAssocChild(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(
+            yazpp_1::IPDU_Observable *the_PDU_Observable,
+            int fd);
+        void recv_GDU(Z_GDU *apdu, int len);
+        
+        void failNotify();
+        void timeoutNotify();
+        void connectNotify();
+    private:
+        yp2::ThreadPoolSocketObserver *m_thread_pool_observer;
+        yp2::Session m_session;
+        yp2::Origin m_origin;
+        bool m_delete_flag;
+        const yp2::Package *m_package;
+    };
+    class ThreadPoolPackage : public yp2::IThreadPoolMsg {
+    public:
+        ThreadPoolPackage(yp2::Package *package, yp2::ZAssocChild *ses) :
+            m_session(ses), m_package(package) { };
+        ~ThreadPoolPackage();
+        IThreadPoolMsg *handle();
+        void result();
+        
+    private:
+        yp2::ZAssocChild *m_session;
+        yp2::Package *m_package;
+        
+    };
+    class ZAssocServer : public yazpp_1::Z_Assoc {
+    public:
+        ~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,
+            int fd);
+        void recv_GDU(Z_GDU *apdu, int len);
+        
+        void failNotify();
+        void timeoutNotify();
     void connectNotify();
-private:
-    ThreadPoolSocketObserver *m_my_thread;
-    Session m_session;
-    Origin m_origin;
-    bool m_delete_flag;
-    const Package *m_package;
-};
-
-
-class ThreadPoolPackage : public IThreadPoolMsg {
-public:
-    ThreadPoolPackage(Package *package, P2_Session *ses) :
-	m_session(ses), m_package(package) { };
-    ~ThreadPoolPackage();
-    IThreadPoolMsg *handle();
-    void result();
-    
-private:
-    P2_Session *m_session;
-    Package *m_package;
-    
-};
-
-ThreadPoolPackage::~ThreadPoolPackage()
+    private:
+        yp2::ThreadPoolSocketObserver *m_thread_pool_observer;
+        const yp2::Package *m_package;
+    };
+}
+
+yp2::ThreadPoolPackage::~ThreadPoolPackage()
 {
     delete m_package;
 }
 
-void ThreadPoolPackage::result()
+void yp2::ThreadPoolPackage::result()
 {
     m_session->m_no_requests--;
 
@@ -70,201 +103,193 @@ void ThreadPoolPackage::result()
 	int len;
 	m_session->send_GDU(gdu->get(), &len);
     }
+    if (m_session->m_no_requests == 0 && m_package->session().is_closed())
+	delete m_session;
+    delete this;
 }
 
-IThreadPoolMsg *ThreadPoolPackage::handle() 
+yp2::IThreadPoolMsg *yp2::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)
+yp2::ZAssocChild::ZAssocChild(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 *yp2::ZAssocChild::sessionNotify(yazpp_1::IPDU_Observable
 						  *the_PDU_Observable, int fd)
 {
     return 0;
 }
 
-P2_Session::~P2_Session()
+yp2::ZAssocChild::~ZAssocChild()
 {
 }
 
-void P2_Session::recv_GDU(Z_GDU *z_pdu, int len)
+void yp2::ZAssocChild::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);
+    yp2::ThreadPoolPackage *tp = new yp2::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 yp2::ZAssocChild::failNotify()
 {
     // TODO: send Package to signal "close"
-    m_delete_flag = true;
-    if (m_no_requests == 0)
-        delete this;
-    
+    if (m_session.is_closed())
+	return;
+    m_no_requests++;
+
+    m_session.close();
+
+    yp2::Package *p = new yp2::Package(m_session, m_origin);
+
+    yp2::ThreadPoolPackage *tp = new yp2::ThreadPoolPackage(p, this);
+    p->copy_filter(*m_package);
+    m_thread_pool_observer->put(tp);  
 }
 
-void P2_Session::timeoutNotify()
+void yp2::ZAssocChild::timeoutNotify()
 {
-    // TODO: send Package to signal "close"
-    m_delete_flag = true;
-    if (m_no_requests == 0)
-        delete this;
+    failNotify();
 }
 
-void P2_Session::connectNotify()
+void yp2::ZAssocChild::connectNotify()
 {
 
 }
 
-class P2_Server : public yazpp_1::Z_Assoc {
-public:
-    ~P2_Server();
-    P2_Server(yazpp_1::IPDU_Observable *the_PDU_Observable,
-              ThreadPoolSocketObserver *m_my_thread,
-	      const Package *package);
-private:
-    yazpp_1::IPDU_Observer* sessionNotify(
-        yazpp_1::IPDU_Observable *the_PDU_Observable,
-        int fd);
-    void recv_GDU(Z_GDU *apdu, int len);
-    
-    void failNotify();
-    void timeoutNotify();
-    void connectNotify();
-private:
-    ThreadPoolSocketObserver *m_my_thread;
-    const 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)
+yp2::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 *yp2::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);
+    yp2::ZAssocChild *my =
+	new yp2::ZAssocChild(the_PDU_Observable, m_thread_pool_observer,
+                             m_package);
     return my;
 }
 
-P2_Server::~P2_Server()
+yp2::ZAssocServer::~ZAssocServer()
 {
 }
 
-void P2_Server::recv_GDU(Z_GDU *apdu, int len)
+void yp2::ZAssocServer::recv_GDU(Z_GDU *apdu, int len)
 {
 }
 
-void P2_Server::failNotify()
+void yp2::ZAssocServer::failNotify()
 {
 }
 
-void P2_Server::timeoutNotify()
+void yp2::ZAssocServer::timeoutNotify()
 {
 }
 
-void P2_Server::connectNotify()
+void yp2::ZAssocServer::connectNotify()
 {
 }
 
-FilterFrontendNet::FilterFrontendNet()
+yp2::filter::FrontendNet::FrontendNet()
 {
     m_no_threads = 5;
-    m_listen_address = "@:9001";
     m_listen_duration = 0;
 }
 
-class My_Timer_Thread : public yazpp_1::ISocketObserver {
-private:
-    yazpp_1::ISocketObservable *m_obs;
-    int m_fd[2];
-    bool m_timeout;
-public:
-    My_Timer_Thread(yazpp_1::ISocketObservable *obs, int duration);
-    void socketNotify(int event);
-    bool timeout();
-};
-
-bool My_Timer_Thread::timeout()
+
+bool yp2::My_Timer_Thread::timeout()
 {
     return m_timeout;
 }
 
-My_Timer_Thread::My_Timer_Thread(yazpp_1::ISocketObservable *obs,
+yp2::My_Timer_Thread::My_Timer_Thread(yazpp_1::ISocketObservable *obs,
 				 int duration) : 
-    m_obs(obs), m_timeout(false)
+    m_obs(obs), m_pipe(9123), m_timeout(false)
 {
-    pipe(m_fd);
-    obs->addObserver(m_fd[0], this);
+    obs->addObserver(m_pipe.read_fd(), this);
     obs->maskObserver(this, yazpp_1::SOCKET_OBSERVE_READ);
     obs->timeoutObserver(this, duration);
 }
 
-void My_Timer_Thread::socketNotify(int event)
+void yp2::My_Timer_Thread::socketNotify(int event)
 {
     m_timeout = true;
     m_obs->deleteObserver(this);
-    close(m_fd[0]);
-    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());
+    yp2::ZAssocServer **az = new yp2::ZAssocServer *[m_ports.size()];
 
+    // Create yp2::ZAssocServer for each port
+    size_t i;
+    for (i = 0; i<m_ports.size(); i++)
+    {
+	// create a PDU assoc object (one per yp2::ZAssocServer)
+	yazpp_1::PDU_Assoc *as = new yazpp_1::PDU_Assoc(&mySocketManager);
+
+	// create ZAssoc with PDU Assoc
+	az[i] = new yp2::ZAssocServer(as, &threadPool, &package);
+	az[i]->server(m_ports[i].c_str());
+    }
     while (mySocketManager.processEvent() > 0)
     {
 	if (tt && tt->timeout())
 	    break;
     }
-    return package;
+    for (i = 0; i<m_ports.size(); i++)
+	delete az[i];
+
+    delete [] az;
+    delete tt;
 }
 
-std::string &FilterFrontendNet::listen_address()
+std::vector<std::string> &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
+ */