projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added default constructor for Package class
[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
6b2a46e
..
ba81508
100644
(file)
--- a/
src/filter_frontend_net.cpp
+++ b/
src/filter_frontend_net.cpp
@@
-16,11
+16,11
@@
using namespace yp2;
using namespace yp2;
-class P2_Session : public yazpp_1::Z_Assoc {
+class ZAssocServerChild : public yazpp_1::Z_Assoc {
public:
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:
const Package *package);
int m_no_requests;
private:
@@
-33,7
+33,7
@@
private:
void timeoutNotify();
void connectNotify();
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;
Session m_session;
Origin m_origin;
bool m_delete_flag;
@@
-43,14
+43,14
@@
private:
class ThreadPoolPackage : public IThreadPoolMsg {
public:
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:
m_session(ses), m_package(package) { };
~ThreadPoolPackage();
IThreadPoolMsg *handle();
void result();
private:
- P2_Session *m_session;
+ ZAssocServerChild *m_session;
Package *m_package;
};
Package *m_package;
};
@@
-82,41
+82,41
@@
IThreadPoolMsg *ThreadPoolPackage::handle()
}
}
-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)
{
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;
}
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;
}
*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);
{
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);
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())
{
// TODO: send Package to signal "close"
if (m_session.is_closed())
@@
-127,26
+127,26
@@
void P2_Session::failNotify()
Package *p = new Package(m_session, m_origin);
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->copy_filter(*m_package);
- m_my_thread->put(m);
+ m_thread_pool_observer->put(tp);
}
}
-void P2_Session::timeoutNotify()
+void ZAssocServerChild::timeoutNotify()
{
failNotify();
}
{
failNotify();
}
-void P2_Session::connectNotify()
+void ZAssocServerChild::connectNotify()
{
}
{
}
-class P2_Server : public yazpp_1::Z_Assoc {
+class ZAssocServer : public yazpp_1::Z_Assoc {
public:
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(
const Package *package);
private:
yazpp_1::IPDU_Observer* sessionNotify(
@@
-158,46
+158,46
@@
private:
void timeoutNotify();
void connectNotify();
private:
void timeoutNotify();
void connectNotify();
private:
- ThreadPoolSocketObserver *m_my_thread;
+ ThreadPoolSocketObserver *m_thread_pool_observer;
const Package *m_package;
};
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)
{
const Package *package)
: Z_Assoc(the_PDU_Observable)
{
- m_my_thread = my_thread;
+ m_thread_pool_observer = thread_pool_observer;
m_package = package;
}
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)
{
*the_PDU_Observable, int fd)
{
- P2_Session *my = new P2_Session(the_PDU_Observable, m_my_thread,
+ ZAssocServerChild *my = new ZAssocServerChild(the_PDU_Observable, m_thread_pool_observer,
m_package);
return my;
}
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()
{
}
{
}
@@
-242,7
+242,7
@@
void My_Timer_Thread::socketNotify(int event)
close(m_fd[1]);
}
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;
yazpp_1::SocketManager mySocketManager;
My_Timer_Thread *tt = 0;
@@
-254,7
+254,7
@@
Package &FilterFrontendNet::process(Package &package) const {
ThreadPoolSocketObserver threadPool(&mySocketManager, m_no_threads);
ThreadPoolSocketObserver threadPool(&mySocketManager, m_no_threads);
- P2_Server z(my_PDU_Assoc, &threadPool, &package);
+ ZAssocServer z(my_PDU_Assoc, &threadPool, &package);
z.server(m_listen_address.c_str());
while (mySocketManager.processEvent() > 0)
z.server(m_listen_address.c_str());
while (mySocketManager.processEvent() > 0)
@@
-262,7
+262,7
@@
Package &FilterFrontendNet::process(Package &package) const {
if (tt && tt->timeout())
break;
}
if (tt && tt->timeout())
break;
}
- return package;
+ delete tt;
}
std::string &FilterFrontendNet::listen_address()
}
std::string &FilterFrontendNet::listen_address()