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,
+ ~ZAssocServerChild();
+ ZAssocServerChild(yazpp_1::IPDU_Observable *the_PDU_Observable,
+ ThreadPoolSocketObserver *m_thread_pool_observer,
const Package *package);
int m_no_requests;
private:
void timeoutNotify();
void connectNotify();
private:
- ThreadPoolSocketObserver *m_my_thread;
+ ThreadPoolSocketObserver *m_thread_pool_observer;
Session m_session;
Origin m_origin;
bool m_delete_flag;
class ThreadPoolPackage : public IThreadPoolMsg {
public:
- ThreadPoolPackage(Package *package, P2_Session *ses) :
+ ThreadPoolPackage(Package *package, ZAssocServerChild *ses) :
m_session(ses), m_package(package) { };
~ThreadPoolPackage();
IThreadPoolMsg *handle();
void result();
private:
- P2_Session *m_session;
+ ZAssocServerChild *m_session;
Package *m_package;
};
}
-P2_Session::P2_Session(yazpp_1::IPDU_Observable *the_PDU_Observable,
+ZAssocServerChild::ZAssocServerChild(yazpp_1::IPDU_Observable *the_PDU_Observable,
ThreadPoolSocketObserver *my_thread_pool,
const Package *package)
: Z_Assoc(the_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);
- 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())
Package *p = new 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,
+ ~ZAssocServer();
+ ZAssocServer(yazpp_1::IPDU_Observable *the_PDU_Observable,
+ ThreadPoolSocketObserver *m_thread_pool_observer,
const Package *package);
private:
yazpp_1::IPDU_Observer* sessionNotify(
void timeoutNotify();
void connectNotify();
private:
- ThreadPoolSocketObserver *m_my_thread;
+ ThreadPoolSocketObserver *m_thread_pool_observer;
const Package *m_package;
};
-P2_Server::P2_Server(yazpp_1::IPDU_Observable *the_PDU_Observable,
- ThreadPoolSocketObserver *my_thread,
+ZAssocServer::ZAssocServer(yazpp_1::IPDU_Observable *the_PDU_Observable,
+ ThreadPoolSocketObserver *thread_pool_observer,
const Package *package)
: Z_Assoc(the_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()
{
m_no_threads = 5;
- m_listen_address = "@:9001";
m_listen_duration = 0;
}
close(m_fd[1]);
}
-Package &FilterFrontendNet::process(Package &package) const {
+void FilterFrontendNet::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; 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;
}
- 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> &FilterFrontendNet::ports()
{
- return m_listen_address;
+ return m_ports;
}
int &FilterFrontendNet::listen_duration()