-/* $Id: filter_frontend_net.cpp,v 1.9 2005-11-07 21:57:10 adam Exp $
- Copyright (c) 2005, Index Data.
+/* $Id: filter_frontend_net.cpp,v 1.23 2007-01-25 14:05:54 adam Exp $
+ Copyright (c) 2005-2007, Index Data.
-%LICENSE%
+ See the LICENSE file for details
*/
-
#include "config.hpp"
+#include "util.hpp"
#include "pipe.hpp"
#include "filter.hpp"
-#include "router.hpp"
#include "package.hpp"
#include "thread_pool_observer.hpp"
#include "filter_frontend_net.hpp"
-#include <yaz++/z-assoc.h>
-#include <yaz++/pdu-assoc.h>
-#include <yaz++/socket-manager.h>
+#include <yazpp/z-assoc.h>
+#include <yazpp/pdu-assoc.h>
+#include <yazpp/socket-manager.h>
#include <yaz/log.h>
#include <iostream>
-namespace yp2 {
+namespace mp = metaproxy_1;
+
+namespace metaproxy_1 {
+ namespace filter {
+ class FrontendNet::Rep {
+ friend class FrontendNet;
+ int m_no_threads;
+ std::vector<std::string> m_ports;
+ int m_listen_duration;
+ int m_session_timeout;
+ };
+ }
class My_Timer_Thread : public yazpp_1::ISocketObserver {
private:
yazpp_1::ISocketObservable *m_obs;
public:
~ZAssocChild();
ZAssocChild(yazpp_1::IPDU_Observable *the_PDU_Observable,
- yp2::ThreadPoolSocketObserver *m_thread_pool_observer,
- const yp2::Package *package);
+ mp::ThreadPoolSocketObserver *m_thread_pool_observer,
+ const mp::Package *package);
int m_no_requests;
private:
yazpp_1::IPDU_Observer* sessionNotify(
void timeoutNotify();
void connectNotify();
private:
- yp2::ThreadPoolSocketObserver *m_thread_pool_observer;
- yp2::Session m_session;
- yp2::Origin m_origin;
+ mp::ThreadPoolSocketObserver *m_thread_pool_observer;
+ mp::Session m_session;
+ mp::Origin m_origin;
bool m_delete_flag;
- const yp2::Package *m_package;
+ const mp::Package *m_package;
};
- class ThreadPoolPackage : public yp2::IThreadPoolMsg {
+ class ThreadPoolPackage : public mp::IThreadPoolMsg {
public:
- ThreadPoolPackage(yp2::Package *package, yp2::ZAssocChild *ses) :
+ ThreadPoolPackage(mp::Package *package, mp::ZAssocChild *ses) :
m_session(ses), m_package(package) { };
~ThreadPoolPackage();
IThreadPoolMsg *handle();
void result();
private:
- yp2::ZAssocChild *m_session;
- yp2::Package *m_package;
+ mp::ZAssocChild *m_session;
+ mp::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);
+ mp::ThreadPoolSocketObserver *m_thread_pool_observer,
+ const mp::Package *package,
+ int timeout);
private:
yazpp_1::IPDU_Observer* sessionNotify(
yazpp_1::IPDU_Observable *the_PDU_Observable,
void timeoutNotify();
void connectNotify();
private:
- yp2::ThreadPoolSocketObserver *m_thread_pool_observer;
- const yp2::Package *m_package;
+ mp::ThreadPoolSocketObserver *m_thread_pool_observer;
+ const mp::Package *m_package;
+ int m_session_timeout;
};
}
-yp2::ThreadPoolPackage::~ThreadPoolPackage()
+mp::ThreadPoolPackage::~ThreadPoolPackage()
{
delete m_package;
}
-void yp2::ThreadPoolPackage::result()
+void mp::ThreadPoolPackage::result()
{
m_session->m_no_requests--;
yazpp_1::GDU *gdu = &m_package->response();
+
if (gdu->get())
{
int len;
m_session->send_GDU(gdu->get(), &len);
}
+ else if (!m_package->session().is_closed())
+ {
+ // no response package and yet the session is still open..
+ // means that request is unhandled..
+ yazpp_1::GDU *gdu_req = &m_package->request();
+ Z_GDU *z_gdu = gdu_req->get();
+ if (z_gdu && z_gdu->which == Z_GDU_Z3950)
+ {
+ // For Z39.50, response with a Close and shutdown
+ mp::odr odr;
+ int len;
+ Z_APDU *apdu_response = odr.create_close(
+ z_gdu->u.z3950, Z_Close_systemProblem,
+ "unhandled Z39.50 request");
+
+ m_session->send_Z_PDU(apdu_response, &len);
+ m_package->session().close();
+ }
+ }
+
if (m_session->m_no_requests == 0 && m_package->session().is_closed())
delete m_session;
delete this;
}
-yp2::IThreadPoolMsg *yp2::ThreadPoolPackage::handle()
+mp::IThreadPoolMsg *mp::ThreadPoolPackage::handle()
{
m_package->move();
return this;
}
-yp2::ZAssocChild::ZAssocChild(yazpp_1::IPDU_Observable *PDU_Observable,
- yp2::ThreadPoolSocketObserver *my_thread_pool,
- const yp2::Package *package)
+mp::ZAssocChild::ZAssocChild(yazpp_1::IPDU_Observable *PDU_Observable,
+ mp::ThreadPoolSocketObserver *my_thread_pool,
+ const mp::Package *package)
: Z_Assoc(PDU_Observable)
{
m_thread_pool_observer = my_thread_pool;
m_no_requests = 0;
m_delete_flag = false;
m_package = package;
+ const char *peername = PDU_Observable->getpeername();
+ if (!peername)
+ peername = "unknown";
+ m_origin.set_tcpip_address(std::string(peername), m_session.id());
}
-yazpp_1::IPDU_Observer *yp2::ZAssocChild::sessionNotify(yazpp_1::IPDU_Observable
+yazpp_1::IPDU_Observer *mp::ZAssocChild::sessionNotify(yazpp_1::IPDU_Observable
*the_PDU_Observable, int fd)
{
return 0;
}
-yp2::ZAssocChild::~ZAssocChild()
+mp::ZAssocChild::~ZAssocChild()
{
}
-void yp2::ZAssocChild::recv_GDU(Z_GDU *z_pdu, int len)
+void mp::ZAssocChild::recv_GDU(Z_GDU *z_pdu, int len)
{
m_no_requests++;
- yp2::Package *p = new yp2::Package(m_session, m_origin);
+ mp::Package *p = new mp::Package(m_session, m_origin);
- yp2::ThreadPoolPackage *tp = new yp2::ThreadPoolPackage(p, this);
+ mp::ThreadPoolPackage *tp = new mp::ThreadPoolPackage(p, this);
p->copy_filter(*m_package);
p->request() = yazpp_1::GDU(z_pdu);
m_thread_pool_observer->put(tp);
}
-void yp2::ZAssocChild::failNotify()
+void mp::ZAssocChild::failNotify()
{
// TODO: send Package to signal "close"
if (m_session.is_closed())
m_session.close();
- yp2::Package *p = new yp2::Package(m_session, m_origin);
+ mp::Package *p = new mp::Package(m_session, m_origin);
- yp2::ThreadPoolPackage *tp = new yp2::ThreadPoolPackage(p, this);
+ mp::ThreadPoolPackage *tp = new mp::ThreadPoolPackage(p, this);
p->copy_filter(*m_package);
m_thread_pool_observer->put(tp);
}
-void yp2::ZAssocChild::timeoutNotify()
+void mp::ZAssocChild::timeoutNotify()
{
failNotify();
}
-void yp2::ZAssocChild::connectNotify()
+void mp::ZAssocChild::connectNotify()
{
}
-yp2::ZAssocServer::ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable,
- yp2::ThreadPoolSocketObserver *thread_pool_observer,
- const yp2::Package *package)
- : Z_Assoc(PDU_Observable)
+mp::ZAssocServer::ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable,
+ mp::ThreadPoolSocketObserver *thread_pool_observer,
+ const mp::Package *package,
+ int timeout)
+ : Z_Assoc(PDU_Observable), m_session_timeout(timeout)
{
m_thread_pool_observer = thread_pool_observer;
m_package = package;
}
-yazpp_1::IPDU_Observer *yp2::ZAssocServer::sessionNotify(yazpp_1::IPDU_Observable
+yazpp_1::IPDU_Observer *mp::ZAssocServer::sessionNotify(yazpp_1::IPDU_Observable
*the_PDU_Observable, int fd)
{
- yp2::ZAssocChild *my =
- new yp2::ZAssocChild(the_PDU_Observable, m_thread_pool_observer,
+ mp::ZAssocChild *my =
+ new mp::ZAssocChild(the_PDU_Observable, m_thread_pool_observer,
m_package);
+ my->timeout(m_session_timeout);
return my;
}
-yp2::ZAssocServer::~ZAssocServer()
+mp::ZAssocServer::~ZAssocServer()
{
}
-void yp2::ZAssocServer::recv_GDU(Z_GDU *apdu, int len)
+void mp::ZAssocServer::recv_GDU(Z_GDU *apdu, int len)
{
}
-void yp2::ZAssocServer::failNotify()
+void mp::ZAssocServer::failNotify()
{
}
-void yp2::ZAssocServer::timeoutNotify()
+void mp::ZAssocServer::timeoutNotify()
{
}
-void yp2::ZAssocServer::connectNotify()
+void mp::ZAssocServer::connectNotify()
{
}
-yp2::filter::FrontendNet::FrontendNet()
+mp::filter::FrontendNet::FrontendNet() : m_p(new Rep)
{
- m_no_threads = 5;
- m_listen_duration = 0;
+ m_p->m_no_threads = 5;
+ m_p->m_listen_duration = 0;
+ m_p->m_session_timeout = 300; // 5 minutes
}
+mp::filter::FrontendNet::~FrontendNet()
+{
+}
-bool yp2::My_Timer_Thread::timeout()
+bool mp::My_Timer_Thread::timeout()
{
return m_timeout;
}
-yp2::My_Timer_Thread::My_Timer_Thread(yazpp_1::ISocketObservable *obs,
+mp::My_Timer_Thread::My_Timer_Thread(yazpp_1::ISocketObservable *obs,
int duration) :
m_obs(obs), m_pipe(9123), m_timeout(false)
{
obs->timeoutObserver(this, duration);
}
-void yp2::My_Timer_Thread::socketNotify(int event)
+void mp::My_Timer_Thread::socketNotify(int event)
{
m_timeout = true;
m_obs->deleteObserver(this);
}
-void yp2::filter::FrontendNet::process(Package &package) const {
+void mp::filter::FrontendNet::process(Package &package) const
+{
+ if (m_p->m_ports.size() == 0)
+ return;
+
yazpp_1::SocketManager mySocketManager;
My_Timer_Thread *tt = 0;
- if (m_listen_duration)
- tt = new My_Timer_Thread(&mySocketManager, m_listen_duration);
+ if (m_p->m_listen_duration)
+ tt = new My_Timer_Thread(&mySocketManager, m_p->m_listen_duration);
- ThreadPoolSocketObserver threadPool(&mySocketManager, m_no_threads);
+ ThreadPoolSocketObserver threadPool(&mySocketManager, m_p->m_no_threads);
- yp2::ZAssocServer **az = new yp2::ZAssocServer *[m_ports.size()];
+ mp::ZAssocServer **az = new mp::ZAssocServer *[m_p->m_ports.size()];
- // Create yp2::ZAssocServer for each port
+ // Create mp::ZAssocServer for each port
size_t i;
- for (i = 0; i<m_ports.size(); i++)
+ for (i = 0; i<m_p->m_ports.size(); i++)
{
- // create a PDU assoc object (one per yp2::ZAssocServer)
+ // create a PDU assoc object (one per mp::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());
+ az[i] = new mp::ZAssocServer(as, &threadPool, &package,
+ m_p->m_session_timeout);
+ az[i]->server(m_p->m_ports[i].c_str());
}
while (mySocketManager.processEvent() > 0)
{
if (tt && tt->timeout())
break;
}
- for (i = 0; i<m_ports.size(); i++)
+ for (i = 0; i<m_p->m_ports.size(); i++)
delete az[i];
delete [] az;
delete tt;
}
-std::vector<std::string> &yp2::filter::FrontendNet::ports()
+void mp::filter::FrontendNet::configure(const xmlNode * ptr)
+{
+ if (!ptr || !ptr->children)
+ {
+ throw mp::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 = mp::xml::get_text(ptr);
+ ports.push_back(port);
+
+ }
+ else if (!strcmp((const char *) ptr->name, "threads"))
+ {
+ std::string threads_str = mp::xml::get_text(ptr);
+ int threads = atoi(threads_str.c_str());
+ if (threads < 1)
+ throw mp::filter::FilterException("Bad value for threads: "
+ + threads_str);
+ m_p->m_no_threads = threads;
+ }
+ else if (!strcmp((const char *) ptr->name, "timeout"))
+ {
+ std::string timeout_str = mp::xml::get_text(ptr);
+ int timeout = atoi(timeout_str.c_str());
+ if (timeout < 1)
+ throw mp::filter::FilterException("Bad value for timeout: "
+ + timeout_str);
+ m_p->m_session_timeout = timeout;
+ }
+ else
+ {
+ throw mp::filter::FilterException("Bad element "
+ + std::string((const char *)
+ ptr->name));
+ }
+ }
+ m_p->m_ports = ports;
+}
+
+std::vector<std::string> &mp::filter::FrontendNet::ports()
{
- return m_ports;
+ return m_p->m_ports;
}
-int &yp2::filter::FrontendNet::listen_duration()
+int &mp::filter::FrontendNet::listen_duration()
{
- return m_listen_duration;
+ return m_p->m_listen_duration;
+}
+
+static mp::filter::Base* filter_creator()
+{
+ return new mp::filter::FrontendNet;
+}
+
+extern "C" {
+ struct metaproxy_1_filter_struct metaproxy_1_filter_frontend_net = {
+ 0,
+ "frontend_net",
+ filter_creator
+ };
}
/*
projects / metaproxy-moved-to-github.git / blobdiff