Properly lock Z39.50 sessions

[metaproxy-moved-to-github.git] / src / filter_frontend_net.cpp

diff --git a/src/filter_frontend_net.cpp b/src/filter_frontend_net.cpp
index ba81508..a390433 100644 (file)
--- 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 <iostream>
 
-using namespace yp2;
-
 class ZAssocServerChild : public yazpp_1::Z_Assoc {
 public:
     ~ZAssocServerChild();
     ZAssocServerChild(yazpp_1::IPDU_Observable *the_PDU_Observable,
-              ThreadPoolSocketObserver *m_thread_pool_observer,
-              const Package *package);
+              yp2::ThreadPoolSocketObserver *m_thread_pool_observer,
+              const yp2::Package *package);
     int m_no_requests;
 private:
     yazpp_1::IPDU_Observer* sessionNotify(
@@ -33,17 +36,17 @@ private:
     void timeoutNotify();
     void connectNotify();
 private:
-    ThreadPoolSocketObserver *m_thread_pool_observer;
-    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, ZAssocServerChild *ses) :
+    ThreadPoolPackage(yp2::Package *package, ZAssocServerChild *ses) :
        m_session(ses), m_package(package) { };
     ~ThreadPoolPackage();
     IThreadPoolMsg *handle();
@@ -51,7 +54,7 @@ public:
     
 private:
     ZAssocServerChild *m_session;
-    Package *m_package;
+    yp2::Package *m_package;
     
 };
 
@@ -75,17 +78,17 @@ void ThreadPoolPackage::result()
     delete this;
 }
 
-IThreadPoolMsg *ThreadPoolPackage::handle() 
+yp2::IThreadPoolMsg *ThreadPoolPackage::handle() 
 {
     m_package->move();
     return this;
 }
 
 
-ZAssocServerChild::ZAssocServerChild(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_thread_pool_observer = my_thread_pool;
     m_no_requests = 0;
@@ -108,7 +111,7 @@ 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 *tp = new ThreadPoolPackage(p, this);
     p->copy_filter(*m_package);
@@ -125,7 +128,7 @@ void ZAssocServerChild::failNotify()
 
     m_session.close();
 
-    Package *p = new Package(m_session, m_origin);
+    yp2::Package *p = new yp2::Package(m_session, m_origin);
 
     ThreadPoolPackage *tp = new ThreadPoolPackage(p, this);
     p->copy_filter(*m_package);
@@ -145,9 +148,9 @@ void ZAssocServerChild::connectNotify()
 class ZAssocServer : public yazpp_1::Z_Assoc {
 public:
     ~ZAssocServer();
-    ZAssocServer(yazpp_1::IPDU_Observable *the_PDU_Observable,
-              ThreadPoolSocketObserver *m_thread_pool_observer,
-             const Package *package);
+    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,15 +161,15 @@ private:
     void timeoutNotify();
     void connectNotify();
 private:
-    ThreadPoolSocketObserver *m_thread_pool_observer;
-    const Package *m_package;
+    yp2::ThreadPoolSocketObserver *m_thread_pool_observer;
+    const yp2::Package *m_package;
 };
 
 
-ZAssocServer::ZAssocServer(yazpp_1::IPDU_Observable *the_PDU_Observable,
-                     ThreadPoolSocketObserver *thread_pool_observer,
-                    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_thread_pool_observer = thread_pool_observer;
     m_package = package;
@@ -176,8 +179,9 @@ ZAssocServer::ZAssocServer(yazpp_1::IPDU_Observable *the_PDU_Observable,
 yazpp_1::IPDU_Observer *ZAssocServer::sessionNotify(yazpp_1::IPDU_Observable
                                                 *the_PDU_Observable, int fd)
 {
-    ZAssocServerChild *my = new ZAssocServerChild(the_PDU_Observable, m_thread_pool_observer,
-                                   m_package);
+    ZAssocServerChild *my =
+       new ZAssocServerChild(the_PDU_Observable, m_thread_pool_observer,
+                             m_package);
     return my;
 }
 
@@ -201,10 +205,9 @@ 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]);
 }
 
-void 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);
 
-    ZAssocServer 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; i<m_ports.size(); i++)
+    {
+       // create a PDU assoc object (one per 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]->server(m_ports[i].c_str());
+    }
     while (mySocketManager.processEvent() > 0)
     {
        if (tt && tt->timeout())
            break;
     }
+    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
+ */