/* This file is part of Metaproxy.
- Copyright (C) 2005-2008 Index Data
+ Copyright (C) 2005-2010 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>
std::vector<std::string> m_ports;
int m_listen_duration;
int m_session_timeout;
+ int m_connect_max;
yazpp_1::SocketManager mySocketManager;
-
ZAssocServer **az;
};
}
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, int timeout);
+ ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable, int timeout,
+ int connect_max);
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;
};
}
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_assoc_child->send_Z_PDU(apdu_response, &len);
}
else if (z_gdu && z_gdu->which == Z_GDU_HTTP_Request)
{
Z_GDU *zgdu_res
= odr.create_HTTP_Response(m_package->session(),
z_gdu->u.HTTP_Request, 500);
- m_session->send_GDU(zgdu_res, &len);
+ m_assoc_child->send_GDU(zgdu_res, &len);
}
m_package->session().close();
}
- if (m_session->m_no_requests == 0 && m_package->session().is_closed())
+ if (m_assoc_child->m_no_requests == 0 && m_package->session().is_closed())
{
- m_session->close();
+ m_assoc_child->close();
}
delete this;
}
// 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::ZAssocServer::ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable,
- int timeout)
- : Z_Assoc(PDU_Observable), m_session_timeout(timeout)
+ int timeout, int connect_max)
+ : Z_Assoc(PDU_Observable), m_session_timeout(timeout),
+ m_connect_max(connect_max)
{
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_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;
}
+ 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->children, 0);
+ }
else
{
throw mp::filter::FilterException("Bad element "
// create ZAssoc with PDU Assoc
m_p->az[i] = new mp::ZAssocServer(as,
- m_p->m_session_timeout);
+ m_p->m_session_timeout,
+ m_p->m_connect_max);
if (m_p->az[i]->server(m_p->m_ports[i].c_str()))
{
throw mp::filter::FilterException("Unable to bind to address "
/*
* 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
*/
+