X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffilter_frontend_net.cpp;h=931341194acc5f932a65bf03cb7562062dc182bc;hb=f3e215cc00b02e3d92016f095295af2ba4649e2f;hp=3246eec922ac4cdac2609b797bb6995c0ec76b13;hpb=15f9d3c217f4c1b3d4bf40743014523ea8ffdc5a;p=metaproxy-moved-to-github.git diff --git a/src/filter_frontend_net.cpp b/src/filter_frontend_net.cpp index 3246eec..9313411 100644 --- a/src/filter_frontend_net.cpp +++ b/src/filter_frontend_net.cpp @@ -1,5 +1,5 @@ /* This file is part of Metaproxy. - Copyright (C) 2005-2012 Index Data + Copyright (C) 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 @@ -32,7 +32,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include #include "gduutil.hpp" +#include #include @@ -46,6 +48,8 @@ namespace metaproxy_1 { friend class FrontendNet; std::string port; std::string route; + std::string cert_fname; + int max_recv_bytes; }; class FrontendNet::Rep { friend class FrontendNet; @@ -64,7 +68,7 @@ namespace metaproxy_1 { double m_duration_max; double m_duration_min; double m_duration_total; - bool m_stop; + int m_stop_signo; public: Rep(); ~Rep(); @@ -120,7 +124,7 @@ namespace metaproxy_1 { ZAssocChild *m_assoc_child; mp::Package *m_package; Rep *m_p; - }; + }; class FrontendNet::ZAssocServer : public yazpp_1::Z_Assoc { public: ~ZAssocServer(); @@ -134,7 +138,7 @@ namespace metaproxy_1 { yazpp_1::IPDU_Observable *the_PDU_Observable, int fd); void recv_GDU(Z_GDU *apdu, int len); - + void failNotify(); void timeoutNotify(); void connectNotify(); @@ -182,7 +186,7 @@ void yf::FrontendNet::ThreadPoolPackage::result(const char *t_info) yaz_timing_stop(timer); double duration = yaz_timing_get_real(timer); - + size_t ent = 0; while (m_p->m_duration_lim[ent] != 0.0 && duration > m_p->m_duration_lim[ent]) ent++; @@ -192,24 +196,24 @@ void yf::FrontendNet::ThreadPoolPackage::result(const char *t_info) if (m_p->m_duration_max < duration) m_p->m_duration_max = duration; - + if (m_p->m_duration_min == 0.0 || m_p->m_duration_min > duration) m_p->m_duration_min = duration; - + if (m_p->m_msg_config.length()) { Z_GDU *z_gdu = gdu->get(); - + std::ostringstream os; os << m_p->m_msg_config << " " << *m_package << " " << std::fixed << std::setprecision (6) << duration << " "; - - if (z_gdu) + + if (z_gdu) os << *z_gdu; else os << "-"; - + yaz_log(YLOG_LOG, "%s %s", os.str().c_str(), t_info); } } @@ -225,7 +229,7 @@ void yf::FrontendNet::ThreadPoolPackage::result(const char *t_info) mp::odr odr; int len; Z_APDU *apdu_response = odr.create_close( - z_gdu->u.z3950, Z_Close_systemProblem, + z_gdu->u.z3950, Z_Close_systemProblem, "unhandled Z39.50 request"); m_assoc_child->send_Z_PDU(apdu_response, &len); @@ -235,8 +239,8 @@ void yf::FrontendNet::ThreadPoolPackage::result(const char *t_info) // For HTTP, respond with Server Error int len; mp::odr odr; - Z_GDU *zgdu_res - = odr.create_HTTP_Response(m_package->session(), + 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); } @@ -247,12 +251,12 @@ void yf::FrontendNet::ThreadPoolPackage::result(const char *t_info) { m_assoc_child->close(); } - + delete this; } -mp::IThreadPoolMsg *yf::FrontendNet::ThreadPoolPackage::handle() +mp::IThreadPoolMsg *yf::FrontendNet::ThreadPoolPackage::handle() { m_package->move(m_assoc_child->m_route); return this; @@ -273,6 +277,12 @@ yf::FrontendNet::ZAssocChild::ZAssocChild( const char *peername = PDU_Observable->getpeername(); if (!peername) peername = "unknown"; + else + { + const char *cp = strchr(peername, ':'); + if (cp) + peername = cp + 1; + } m_origin.set_tcpip_address(std::string(peername), m_session.id()); timeout(m_p->m_session_timeout); } @@ -290,19 +300,19 @@ yf::FrontendNet::ZAssocChild::~ZAssocChild() void yf::FrontendNet::ZAssocChild::report(Z_HTTP_Request *hreq) { mp::odr o; - + Z_GDU *gdu_res = o.create_HTTP_Response(m_session, hreq, 200); - + Z_HTTP_Response *hres = gdu_res->u.HTTP_Response; - + mp::wrbuf w; size_t i; int number_total = 0; - + for (i = 0; m_p->m_duration_lim[i] != 0.0; i++) number_total += m_p->m_duration_freq[i]; number_total += m_p->m_duration_freq[i]; - + wrbuf_puts(w, "\n"); wrbuf_puts(w, "\n"); wrbuf_printf(w, " \n", number_total); @@ -315,7 +325,7 @@ void yf::FrontendNet::ZAssocChild::report(Z_HTTP_Request *hreq) i > 0 ? m_p->m_duration_lim[i - 1] : 0.0, m_p->m_duration_lim[i], m_p->m_duration_freq[i]); } - + if (m_p->m_duration_freq[i] > 0) wrbuf_printf( w, " \n", @@ -333,21 +343,21 @@ void yf::FrontendNet::ZAssocChild::report(Z_HTTP_Request *hreq) wrbuf_printf( w, " \n", m_p->m_duration_total / number_total); - + wrbuf_puts(w, " \n"); - + int thread_busy; int thread_total; m_thread_pool_observer->get_thread_info(thread_busy, thread_total); - + wrbuf_printf(w, " \n", thread_busy, thread_total); - + wrbuf_puts(w, "\n"); - + hres->content_len = w.len(); hres->content_buf = (char *) w.buf(); - + int len; send_GDU(gdu_res, &len); } @@ -362,6 +372,10 @@ void yf::FrontendNet::ZAssocChild::recv_GDU(Z_GDU *z_pdu, int len) { Z_HTTP_Request *hreq = z_pdu->u.HTTP_Request; + const char *f = z_HTTP_header_lookup(hreq->headers, "X-Forwarded-For"); + if (f) + p->origin().set_tcpip_address(std::string(f), m_session.id()); + if (m_p->m_stat_req.length() && !strcmp(hreq->path, m_p->m_stat_req.c_str())) { @@ -376,17 +390,17 @@ void yf::FrontendNet::ZAssocChild::recv_GDU(Z_GDU *z_pdu, int len) if (m_p->m_msg_config.length()) { - if (z_pdu) + if (z_pdu) { std::ostringstream os; os << m_p->m_msg_config << " " << *p << " " - << "0.000000" << " " + << "0.000000" << " " << *z_pdu; yaz_log(YLOG_LOG, "%s", os.str().c_str()); } } - m_thread_pool_observer->put(tp); + m_thread_pool_observer->put(tp); } void yf::FrontendNet::ZAssocChild::failNotify() @@ -424,7 +438,7 @@ yf::FrontendNet::ZAssocServer::ZAssocServer( yazpp_1::IPDU_Observable *PDU_Observable, std::string route, Rep *rep) - : + : Z_Assoc(PDU_Observable), m_route(route), m_p(rep) { m_package = 0; @@ -437,7 +451,7 @@ void yf::FrontendNet::ZAssocServer::set_package(const mp::Package *package) } void yf::FrontendNet::ZAssocServer::set_thread_pool( - ThreadPoolSocketObserver *observer) + mp::ThreadPoolSocketObserver *observer) { m_thread_pool_observer = observer; } @@ -520,7 +534,7 @@ yf::FrontendNet::Rep::Rep() m_duration_max = 0.0; m_duration_min = 0.0; m_duration_total = 0.0; - m_stop = false; + m_stop_signo = 0; } yf::FrontendNet::Rep::~Rep() @@ -539,9 +553,9 @@ yf::FrontendNet::~FrontendNet() { } -void yf::FrontendNet::stop() const +void yf::FrontendNet::stop(int signo) const { - m_p->m_stop = true; + m_p->m_stop_signo = signo; } bool yf::FrontendNet::My_Timer_Thread::timeout() @@ -551,7 +565,7 @@ bool yf::FrontendNet::My_Timer_Thread::timeout() yf::FrontendNet::My_Timer_Thread::My_Timer_Thread( yazpp_1::ISocketObservable *obs, - int duration) : + int duration) : m_obs(obs), m_pipe(9123), m_timeout(false) { obs->addObserver(m_pipe.read_fd(), this); @@ -565,7 +579,7 @@ void yf::FrontendNet::My_Timer_Thread::socketNotify(int event) m_obs->deleteObserver(this); } -void yf::FrontendNet::process(Package &package) const +void yf::FrontendNet::process(mp::Package &package) const { if (m_p->az == 0) return; @@ -575,7 +589,7 @@ void yf::FrontendNet::process(Package &package) const 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); for (i = 0; im_ports.size(); i++) @@ -585,14 +599,21 @@ void yf::FrontendNet::process(Package &package) const } while (m_p->mySocketManager.processEvent() > 0) { - if (m_p->m_stop) + if (m_p->m_stop_signo == SIGTERM) { - m_p->m_stop = false; + yaz_log(YLOG_LOG, "metaproxy received SIGTERM"); + break; /* stop right away */ + } + if (m_p->m_stop_signo == SIGUSR1) + { /* just stop listeners and cont till all sessions are done*/ + yaz_log(YLOG_LOG, "metaproxy received SIGUSR1"); + m_p->m_stop_signo = 0; if (m_p->az) { size_t i; for (i = 0; i < m_p->m_ports.size(); i++) m_p->az[i]->server(""); + yaz_daemon_stop(); } } int no = m_p->mySocketManager.getNumberOfObservers(); @@ -619,22 +640,30 @@ void yf::FrontendNet::configure(const xmlNode * ptr, bool test_only, if (!strcmp((const char *) ptr->name, "port")) { 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); + + const char *names[5] = {"route", "max_recv_bytes", "port", + "cert_fname", 0}; + std::string values[4]; + + mp::xml::parse_attr(ptr, names, values); + port.route = values[0]; + if (values[1].length() > 0) + port.max_recv_bytes = atoi(values[1].c_str()); + else + port.max_recv_bytes = 0; + if (values[2].length() > 0) + port.port = values[2]; + else + port.port = mp::xml::get_text(ptr); + port.cert_fname = values[3]; 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 yf::FilterException("Bad value for threads: " + throw yf::FilterException("Bad value for threads: " + threads_str); m_p->m_no_threads = threads; } @@ -643,7 +672,7 @@ void yf::FrontendNet::configure(const xmlNode * ptr, bool test_only, std::string timeout_str = mp::xml::get_text(ptr); int timeout = atoi(timeout_str.c_str()); if (timeout < 1) - throw yf::FilterException("Bad value for timeout: " + throw yf::FilterException("Bad value for timeout: " + timeout_str); m_p->m_session_timeout = timeout; } @@ -661,7 +690,7 @@ void yf::FrontendNet::configure(const xmlNode * ptr, bool test_only, } else { - throw yf::FilterException("Bad element " + throw yf::FilterException("Bad element " + std::string((const char *) ptr->name)); } @@ -691,24 +720,31 @@ void yf::FrontendNet::set_ports(std::vector &ports) void yf::FrontendNet::set_ports(std::vector &ports) { m_p->m_ports = ports; - + m_p->az = new yf::FrontendNet::ZAssocServer *[m_p->m_ports.size()]; - + // Create yf::FrontendNet::ZAssocServer for each port size_t i; for (i = 0; im_ports.size(); i++) { // create a PDU assoc object (one per yf::FrontendNet::ZAssocServer) yazpp_1::PDU_Assoc *as = new yazpp_1::PDU_Assoc(&m_p->mySocketManager); - + + if (m_p->m_ports[i].cert_fname.length()) + as->set_cert_fname(m_p->m_ports[i].cert_fname.c_str()); // create ZAssoc with PDU Assoc m_p->az[i] = new yf::FrontendNet::ZAssocServer( as, m_p->m_ports[i].route, m_p.get()); if (m_p->az[i]->server(m_p->m_ports[i].port.c_str())) { - throw yf::FilterException("Unable to bind to address " + throw yf::FilterException("Unable to bind to address " + std::string(m_p->m_ports[i].port)); } + COMSTACK cs = as->get_comstack(); + + if (cs && m_p->m_ports[i].max_recv_bytes) + cs_set_max_recv_bytes(cs, m_p->m_ports[i].max_recv_bytes); + } }