/* This file is part of Metaproxy.
- Copyright (C) 2005-2008 Index Data
+ Copyright (C) 2005-2011 Index Data
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
#include "config.hpp"
-#include "util.hpp"
+#include <metaproxy/util.hpp>
#include "pipe.hpp"
-#include "filter.hpp"
-#include "package.hpp"
+#include <metaproxy/filter.hpp>
+#include <metaproxy/package.hpp>
#include "thread_pool_observer.hpp"
#include "filter_frontend_net.hpp"
#include <yazpp/z-assoc.h>
#include <yazpp/pdu-assoc.h>
#include <yazpp/socket-manager.h>
+#include <yazpp/limit-connect.h>
#include <yaz/log.h>
#include <iostream>
class My_Timer_Thread;
class ZAssocServer;
namespace filter {
+ class FrontendNet::Port {
+ friend class Rep;
+ friend class FrontendNet;
+ std::string port;
+ std::string route;
+ };
class FrontendNet::Rep {
friend class FrontendNet;
int m_no_threads;
- std::vector<std::string> m_ports;
+ std::vector<Port> m_ports;
int m_listen_duration;
int m_session_timeout;
+ int m_connect_max;
yazpp_1::SocketManager mySocketManager;
-
ZAssocServer **az;
};
}
~ZAssocChild();
ZAssocChild(yazpp_1::IPDU_Observable *the_PDU_Observable,
mp::ThreadPoolSocketObserver *m_thread_pool_observer,
- const mp::Package *package);
+ const mp::Package *package,
+ std::string route);
int m_no_requests;
+ std::string m_route;
private:
yazpp_1::IPDU_Observer* sessionNotify(
yazpp_1::IPDU_Observable *the_PDU_Observable,
class ZAssocServer : public yazpp_1::Z_Assoc {
public:
~ZAssocServer();
- ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable, int timeout);
+ ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable, int timeout,
+ int connect_max, std::string route);
void set_package(const mp::Package *package);
void set_thread_pool(ThreadPoolSocketObserver *m_thread_pool_observer);
private:
mp::ThreadPoolSocketObserver *m_thread_pool_observer;
const mp::Package *m_package;
int m_session_timeout;
+ int m_connect_max;
+ yazpp_1::LimitConnect limit_connect;
+ std::string m_route;
};
}
mp::IThreadPoolMsg *mp::ThreadPoolPackage::handle()
{
- m_package->move();
+ m_package->move(m_assoc_child->m_route);
return this;
}
mp::ZAssocChild::ZAssocChild(yazpp_1::IPDU_Observable *PDU_Observable,
mp::ThreadPoolSocketObserver *my_thread_pool,
- const mp::Package *package)
+ const mp::Package *package,
+ std::string route)
: Z_Assoc(PDU_Observable)
{
m_thread_pool_observer = my_thread_pool;
m_no_requests = 0;
m_delete_flag = false;
m_package = package;
+ m_route = route;
const char *peername = PDU_Observable->getpeername();
if (!peername)
peername = "unknown";
mp::Package *p = new mp::Package(m_session, m_origin);
mp::ThreadPoolPackage *tp = new mp::ThreadPoolPackage(p, this);
- p->copy_filter(*m_package);
+ p->copy_route(*m_package);
p->request() = yazpp_1::GDU(z_pdu);
m_thread_pool_observer->put(tp);
}
// TODO: send Package to signal "close"
if (m_session.is_closed())
{
- delete this;
+ if (m_no_requests == 0)
+ delete this;
return;
}
m_no_requests++;
mp::Package *p = new mp::Package(m_session, m_origin);
mp::ThreadPoolPackage *tp = new mp::ThreadPoolPackage(p, this);
- p->copy_filter(*m_package);
+ p->copy_route(*m_package);
m_thread_pool_observer->put(tp);
}
}
mp::ZAssocServer::ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable,
- int timeout)
- : Z_Assoc(PDU_Observable), m_session_timeout(timeout)
+ int timeout, int connect_max,
+ std::string route)
+ : Z_Assoc(PDU_Observable), m_session_timeout(timeout),
+ m_connect_max(connect_max), m_route(route)
{
m_package = 0;
}
yazpp_1::IPDU_Observer *mp::ZAssocServer::sessionNotify(yazpp_1::IPDU_Observable
*the_PDU_Observable, int fd)
{
+
+ const char *peername = the_PDU_Observable->getpeername();
+ if (peername)
+ {
+ limit_connect.add_connect(peername);
+ limit_connect.cleanup(false);
+ int con_sz = limit_connect.get_total(peername);
+ if (m_connect_max && con_sz > m_connect_max)
+ return 0;
+ }
mp::ZAssocChild *my =
new mp::ZAssocChild(the_PDU_Observable, m_thread_pool_observer,
- m_package);
+ m_package, m_route);
my->timeout(m_session_timeout);
return my;
}
m_p->m_no_threads = 5;
m_p->m_listen_duration = 0;
m_p->m_session_timeout = 300; // 5 minutes
+ m_p->m_connect_max = 0;
m_p->az = 0;
}
delete tt;
}
-void mp::filter::FrontendNet::configure(const xmlNode * ptr, bool test_only)
+void mp::filter::FrontendNet::configure(const xmlNode * ptr, bool test_only,
+ const char *path)
{
if (!ptr || !ptr->children)
{
throw mp::filter::FilterException("No ports for Frontend");
}
- std::vector<std::string> ports;
+ std::vector<Port> 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);
+ Port port;
+ const struct _xmlAttr *attr;
+ for (attr = ptr->properties; attr; attr = attr->next)
+ {
+ if (!strcmp((const char *) attr->name, "route"))
+ port.route = mp::xml::get_text(attr);
+ }
+ port.port = mp::xml::get_text(ptr);
ports.push_back(port);
}
+ timeout_str);
m_p->m_session_timeout = timeout;
}
+ else if (!strcmp((const char *) ptr->name, "connect-max"))
+ {
+ m_p->m_connect_max = mp::xml::get_int(ptr, 0);
+ }
else
{
throw mp::filter::FilterException("Bad element "
void mp::filter::FrontendNet::set_ports(std::vector<std::string> &ports)
{
+ std::vector<Port> nports;
+ size_t i;
+
+ for (i = 0; i < ports.size(); i++)
+ {
+ Port nport;
+
+ nport.port = ports[i];
+
+ nports.push_back(nport);
+ }
+ set_ports(nports);
+}
+
+
+void mp::filter::FrontendNet::set_ports(std::vector<Port> &ports)
+{
m_p->m_ports = ports;
m_p->az = new mp::ZAssocServer *[m_p->m_ports.size()];
// 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()))
+ m_p->m_session_timeout,
+ m_p->m_connect_max,
+ m_p->m_ports[i].route);
+ if (m_p->az[i]->server(m_p->m_ports[i].port.c_str()))
{
throw mp::filter::FilterException("Unable to bind to address "
- + std::string(m_p->m_ports[i]));
+ + std::string(m_p->m_ports[i].port));
}
}
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
- * c-file-style: "stroustrup"
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+
projects / metaproxy-moved-to-github.git / blobdiff