-/* $Id: filter_frontend_net.cpp,v 1.23 2007-01-25 14:05:54 adam Exp $
- Copyright (c) 2005-2007, Index Data.
+/* This file is part of Metaproxy.
+ Copyright (C) 2005-2008 Index Data
- See the LICENSE file for details
- */
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
#include "config.hpp"
namespace mp = metaproxy_1;
namespace metaproxy_1 {
+ class My_Timer_Thread;
+ class ZAssocServer;
namespace filter {
class FrontendNet::Rep {
friend class FrontendNet;
std::vector<std::string> m_ports;
int m_listen_duration;
int m_session_timeout;
+ yazpp_1::SocketManager mySocketManager;
+
+ ZAssocServer **az;
};
}
class My_Timer_Thread : public yazpp_1::ISocketObserver {
class ThreadPoolPackage : public mp::IThreadPoolMsg {
public:
ThreadPoolPackage(mp::Package *package, mp::ZAssocChild *ses) :
- m_session(ses), m_package(package) { };
+ m_assoc_child(ses), m_package(package) { };
~ThreadPoolPackage();
IThreadPoolMsg *handle();
void result();
private:
- mp::ZAssocChild *m_session;
+ mp::ZAssocChild *m_assoc_child;
mp::Package *m_package;
};
class ZAssocServer : public yazpp_1::Z_Assoc {
public:
~ZAssocServer();
- ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable,
- mp::ThreadPoolSocketObserver *m_thread_pool_observer,
- const mp::Package *package,
- int timeout);
+ ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable, int timeout);
+ void set_package(const mp::Package *package);
+ void set_thread_pool(ThreadPoolSocketObserver *m_thread_pool_observer);
private:
yazpp_1::IPDU_Observer* sessionNotify(
yazpp_1::IPDU_Observable *the_PDU_Observable,
void mp::ThreadPoolPackage::result()
{
- m_session->m_no_requests--;
+ m_assoc_child->m_no_requests--;
yazpp_1::GDU *gdu = &m_package->response();
if (gdu->get())
{
int len;
- m_session->send_GDU(gdu->get(), &len);
+ m_assoc_child->send_GDU(gdu->get(), &len);
}
else if (!m_package->session().is_closed())
{
z_gdu->u.z3950, Z_Close_systemProblem,
"unhandled Z39.50 request");
- m_session->send_Z_PDU(apdu_response, &len);
- m_package->session().close();
+ m_assoc_child->send_Z_PDU(apdu_response, &len);
}
+ else if (z_gdu && z_gdu->which == Z_GDU_HTTP_Request)
+ {
+ // For HTTP, respond with Server Error
+ int len;
+ mp::odr odr;
+ Z_GDU *zgdu_res
+ = odr.create_HTTP_Response(m_package->session(),
+ z_gdu->u.HTTP_Request, 500);
+ m_assoc_child->send_GDU(zgdu_res, &len);
+ }
+ m_package->session().close();
}
- if (m_session->m_no_requests == 0 && m_package->session().is_closed())
- delete m_session;
+ if (m_assoc_child->m_no_requests == 0 && m_package->session().is_closed())
+ {
+ m_assoc_child->close();
+ }
delete this;
}
{
// TODO: send Package to signal "close"
if (m_session.is_closed())
+ {
+ if (m_no_requests == 0)
+ delete this;
return;
+ }
m_no_requests++;
m_session.close();
}
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 = 0;
+}
+
+
+void mp::ZAssocServer::set_package(const mp::Package *package)
+{
m_package = package;
+}
+void mp::ZAssocServer::set_thread_pool(ThreadPoolSocketObserver *observer)
+{
+ m_thread_pool_observer = observer;
}
yazpp_1::IPDU_Observer *mp::ZAssocServer::sessionNotify(yazpp_1::IPDU_Observable
m_p->m_no_threads = 5;
m_p->m_listen_duration = 0;
m_p->m_session_timeout = 300; // 5 minutes
+ m_p->az = 0;
}
mp::filter::FrontendNet::~FrontendNet()
{
+ if (m_p->az)
+ {
+ size_t i;
+ for (i = 0; i<m_p->m_ports.size(); i++)
+ delete m_p->az[i];
+ delete [] m_p->az;
+ }
}
bool mp::My_Timer_Thread::timeout()
void mp::filter::FrontendNet::process(Package &package) const
{
- if (m_p->m_ports.size() == 0)
+ if (m_p->az == 0)
return;
-
- yazpp_1::SocketManager mySocketManager;
-
+ size_t i;
My_Timer_Thread *tt = 0;
- if (m_p->m_listen_duration)
- tt = new My_Timer_Thread(&mySocketManager, m_p->m_listen_duration);
- ThreadPoolSocketObserver threadPool(&mySocketManager, m_p->m_no_threads);
-
- mp::ZAssocServer **az = new mp::ZAssocServer *[m_p->m_ports.size()];
+ if (m_p->m_listen_duration)
+ tt = new My_Timer_Thread(&m_p->mySocketManager,
+ m_p->m_listen_duration);
+
+ ThreadPoolSocketObserver tp(&m_p->mySocketManager, m_p->m_no_threads);
- // Create mp::ZAssocServer for each port
- size_t i;
for (i = 0; i<m_p->m_ports.size(); i++)
{
- // 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 mp::ZAssocServer(as, &threadPool, &package,
- m_p->m_session_timeout);
- az[i]->server(m_p->m_ports[i].c_str());
+ m_p->az[i]->set_package(&package);
+ m_p->az[i]->set_thread_pool(&tp);
}
- while (mySocketManager.processEvent() > 0)
+ while (m_p->mySocketManager.processEvent() > 0)
{
if (tt && tt->timeout())
break;
}
- for (i = 0; i<m_p->m_ports.size(); i++)
- delete az[i];
-
- delete [] az;
delete tt;
}
-void mp::filter::FrontendNet::configure(const xmlNode * ptr)
+void mp::filter::FrontendNet::configure(const xmlNode * ptr, bool test_only)
{
if (!ptr || !ptr->children)
{
ptr->name));
}
}
- m_p->m_ports = ports;
+ if (test_only)
+ return;
+ set_ports(ports);
}
-std::vector<std::string> &mp::filter::FrontendNet::ports()
+void mp::filter::FrontendNet::set_ports(std::vector<std::string> &ports)
{
- return m_p->m_ports;
+ m_p->m_ports = ports;
+
+ m_p->az = new mp::ZAssocServer *[m_p->m_ports.size()];
+
+ // Create mp::ZAssocServer for each port
+ size_t i;
+ for (i = 0; i<m_p->m_ports.size(); i++)
+ {
+ // create a PDU assoc object (one per mp::ZAssocServer)
+ yazpp_1::PDU_Assoc *as = new yazpp_1::PDU_Assoc(&m_p->mySocketManager);
+
+ // create ZAssoc with PDU Assoc
+ m_p->az[i] = new mp::ZAssocServer(as,
+ m_p->m_session_timeout);
+ if (m_p->az[i]->server(m_p->m_ports[i].c_str()))
+ {
+ throw mp::filter::FilterException("Unable to bind to address "
+ + std::string(m_p->m_ports[i]));
+ }
+ }
}
-int &mp::filter::FrontendNet::listen_duration()
+void mp::filter::FrontendNet::set_listen_duration(int d)
{
- return m_p->m_listen_duration;
+ m_p->m_listen_duration = d;
}
static mp::filter::Base* filter_creator()