X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ffilter_frontend_net.cpp;h=71fb5d1fa6c0343bd5b6d3df6d52549273af8356;hb=11dbf51bcfc1565ad3a58f8ecf6b8abc8bfd848a;hp=5b7f59d0dcd05ef90f2a2f67da1cdd40455b8730;hpb=b84218609efb976d5b5270bd9e95a3c421af3a13;p=metaproxy-moved-to-github.git

diff --git a/src/filter_frontend_net.cpp b/src/filter_frontend_net.cpp
index 5b7f59d..71fb5d1 100644
--- a/src/filter_frontend_net.cpp
+++ b/src/filter_frontend_net.cpp
@@ -1,7 +1,14 @@
+/* $Id: filter_frontend_net.cpp,v 1.13 2006-01-09 18:18:07 adam Exp $
+   Copyright (c) 2005, Index Data.
+
+%LICENSE%
+ */
 
 
 #include "config.hpp"
 
+#include "xmlutil.hpp"
+#include "pipe.hpp"
 #include "filter.hpp"
 #include "router.hpp"
 #include "package.hpp"
@@ -14,51 +21,80 @@
 
 #include <iostream>
 
-class ZAssocServerChild : public yazpp_1::Z_Assoc {
-public:
-    ~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(
-        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:
-    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, ZAssocServerChild *ses) :
-	m_session(ses), m_package(package) { };
-    ~ThreadPoolPackage();
-    IThreadPoolMsg *handle();
-    void result();
-    
-private:
-    ZAssocServerChild *m_session;
-    yp2::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--;
 
@@ -73,14 +109,14 @@ void ThreadPoolPackage::result()
     delete this;
 }
 
-yp2::IThreadPoolMsg *ThreadPoolPackage::handle() 
+yp2::IThreadPoolMsg *yp2::ThreadPoolPackage::handle() 
 {
     m_package->move();
     return this;
 }
 
 
-ZAssocServerChild::ZAssocServerChild(yazpp_1::IPDU_Observable *PDU_Observable,
+yp2::ZAssocChild::ZAssocChild(yazpp_1::IPDU_Observable *PDU_Observable,
 				     yp2::ThreadPoolSocketObserver *my_thread_pool,
 				     const yp2::Package *package)
     :  Z_Assoc(PDU_Observable)
@@ -92,29 +128,29 @@ ZAssocServerChild::ZAssocServerChild(yazpp_1::IPDU_Observable *PDU_Observable,
 }
 
 
-yazpp_1::IPDU_Observer *ZAssocServerChild::sessionNotify(yazpp_1::IPDU_Observable
+yazpp_1::IPDU_Observer *yp2::ZAssocChild::sessionNotify(yazpp_1::IPDU_Observable
 						  *the_PDU_Observable, int fd)
 {
     return 0;
 }
 
-ZAssocServerChild::~ZAssocServerChild()
+yp2::ZAssocChild::~ZAssocChild()
 {
 }
 
-void ZAssocServerChild::recv_GDU(Z_GDU *z_pdu, int len)
+void yp2::ZAssocChild::recv_GDU(Z_GDU *z_pdu, int len)
 {
     m_no_requests++;
 
     yp2::Package *p = new yp2::Package(m_session, m_origin);
 
-    ThreadPoolPackage *tp = 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_thread_pool_observer->put(tp);  
 }
 
-void ZAssocServerChild::failNotify()
+void yp2::ZAssocChild::failNotify()
 {
     // TODO: send Package to signal "close"
     if (m_session.is_closed())
@@ -125,43 +161,22 @@ void ZAssocServerChild::failNotify()
 
     yp2::Package *p = new yp2::Package(m_session, m_origin);
 
-    ThreadPoolPackage *tp = new ThreadPoolPackage(p, this);
+    yp2::ThreadPoolPackage *tp = new yp2::ThreadPoolPackage(p, this);
     p->copy_filter(*m_package);
     m_thread_pool_observer->put(tp);  
 }
 
-void ZAssocServerChild::timeoutNotify()
+void yp2::ZAssocChild::timeoutNotify()
 {
     failNotify();
 }
 
-void ZAssocServerChild::connectNotify()
+void yp2::ZAssocChild::connectNotify()
 {
 
 }
 
-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:
-    yp2::ThreadPoolSocketObserver *m_thread_pool_observer;
-    const yp2::Package *m_package;
-};
-
-
-ZAssocServer::ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable,
+yp2::ZAssocServer::ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable,
 			   yp2::ThreadPoolSocketObserver *thread_pool_observer,
 			   const yp2::Package *package)
     :  Z_Assoc(PDU_Observable)
@@ -171,32 +186,32 @@ ZAssocServer::ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable,
 
 }
 
-yazpp_1::IPDU_Observer *ZAssocServer::sessionNotify(yazpp_1::IPDU_Observable
+yazpp_1::IPDU_Observer *yp2::ZAssocServer::sessionNotify(yazpp_1::IPDU_Observable
 						 *the_PDU_Observable, int fd)
 {
-    ZAssocServerChild *my =
-	new ZAssocServerChild(the_PDU_Observable, m_thread_pool_observer,
-			      m_package);
+    yp2::ZAssocChild *my =
+	new yp2::ZAssocChild(the_PDU_Observable, m_thread_pool_observer,
+                             m_package);
     return my;
 }
 
-ZAssocServer::~ZAssocServer()
+yp2::ZAssocServer::~ZAssocServer()
 {
 }
 
-void ZAssocServer::recv_GDU(Z_GDU *apdu, int len)
+void yp2::ZAssocServer::recv_GDU(Z_GDU *apdu, int len)
 {
 }
 
-void ZAssocServer::failNotify()
+void yp2::ZAssocServer::failNotify()
 {
 }
 
-void ZAssocServer::timeoutNotify()
+void yp2::ZAssocServer::timeoutNotify()
 {
 }
 
-void ZAssocServer::connectNotify()
+void yp2::ZAssocServer::connectNotify()
 {
 }
 
@@ -206,41 +221,31 @@ yp2::filter::FrontendNet::FrontendNet()
     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]);
 }
 
 void yp2::filter::FrontendNet::process(Package &package) const {
+    if (m_ports.size() == 0)
+        return;
+
     yazpp_1::SocketManager mySocketManager;
 
     My_Timer_Thread *tt = 0;
@@ -249,17 +254,17 @@ void yp2::filter::FrontendNet::process(Package &package) const {
 
     ThreadPoolSocketObserver threadPool(&mySocketManager, m_no_threads);
 
-    ZAssocServer **az = new ZAssocServer *[m_ports.size()];
+    yp2::ZAssocServer **az = new yp2::ZAssocServer *[m_ports.size()];
 
-    // Create ZAssocServer for each port
+    // Create yp2::ZAssocServer for each port
     size_t i;
     for (i = 0; i<m_ports.size(); i++)
     {
-	// create a PDU assoc object (one per ZAssocServer)
+	// 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 ZAssocServer(as, &threadPool, &package);
+	az[i] = new yp2::ZAssocServer(as, &threadPool, &package);
 	az[i]->server(m_ports[i].c_str());
     }
     while (mySocketManager.processEvent() > 0)
@@ -274,6 +279,33 @@ void yp2::filter::FrontendNet::process(Package &package) const {
     delete tt;
 }
 
+void yp2::filter::FrontendNet::configure(const xmlNode * ptr)
+{
+    if (!ptr || !ptr->children)
+    {
+        throw yp2::filter::FilterException("No ports for Frontend");
+    }
+    std::vector<std::string> 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 = yp2::xml::get_text(ptr);
+            ports.push_back(port);
+            
+        }
+        else
+        {
+            throw yp2::filter::FilterException("Bad element " 
+                                               + std::string((const char *)
+                                                             ptr->name));
+        }
+    }
+    m_ports = ports;
+}
+
 std::vector<std::string> &yp2::filter::FrontendNet::ports()
 {
     return m_ports;
@@ -284,3 +316,24 @@ int &yp2::filter::FrontendNet::listen_duration()
     return m_listen_duration;
 }
 
+static yp2::filter::Base* filter_creator()
+{
+    return new yp2::filter::FrontendNet;
+}
+
+extern "C" {
+    struct yp2_filter_struct yp2_filter_frontend_net = {
+        0,
+        "frontend_net",
+        filter_creator
+    };
+}
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * c-file-style: "stroustrup"
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */