X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-proxy.cpp;h=f97f4857aa08458c0a4ec43b56114f7e6206d542;hb=87be6c609c22d9620c781b95ab74298b63694055;hp=d90d0d3af0d205b46412ec7d181d82190ed05ddd;hpb=bdcac7907b800a337f95d5bb69b2d1800cc6eef9;p=yazpp-moved-to-github.git diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp index d90d0d3..f97f485 100644 --- a/src/yaz-proxy.cpp +++ b/src/yaz-proxy.cpp @@ -4,7 +4,24 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: yaz-proxy.cpp,v $ - * Revision 1.8 1999-05-04 10:53:00 adam + * Revision 1.13 2000-08-07 14:19:59 adam + * Fixed serious bug regarding timeouts. Improved logging for proxy. + * + * Revision 1.12 2000/07/04 13:48:49 adam + * Implemented upper-limit on proxy-to-target sessions. + * + * Revision 1.11 1999/12/06 13:52:45 adam + * Modified for new location of YAZ header files. Experimental threaded + * operation. + * + * Revision 1.10 1999/11/10 10:02:34 adam + * Work on proxy. + * + * Revision 1.9 1999/09/13 12:53:44 adam + * Proxy removes OtherInfo Proxy Address and Session ID. Other + * Otherinfo remains untouched. + * + * Revision 1.8 1999/05/04 10:53:00 adam * Changed the way the PROXY behaves when lost cookie is received. * * Revision 1.7 1999/04/28 13:31:17 adam @@ -34,9 +51,9 @@ */ #include +#include -#include - +#include #include Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable) : @@ -48,10 +65,23 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable) : m_clientPool = 0; m_seqno = 1; m_keepalive = 1; + m_proxyTarget = 0; + m_max_clients = 50; + m_APDU_fname = 0; + m_seed = time(0); } Yaz_Proxy::~Yaz_Proxy() { + xfree (m_proxyTarget); +} + +void Yaz_Proxy::set_proxyTarget(const char *target) +{ + xfree (m_proxyTarget); + m_proxyTarget = 0; + if (target) + m_proxyTarget = (char *) xstrdup (target); } IYaz_PDU_Observer *Yaz_Proxy::clone(IYaz_PDU_Observable @@ -60,6 +90,8 @@ IYaz_PDU_Observer *Yaz_Proxy::clone(IYaz_PDU_Observable Yaz_Proxy *new_proxy = new Yaz_Proxy(the_PDU_Observable); new_proxy->m_parent = this; new_proxy->timeout(120); + new_proxy->set_proxyTarget(m_proxyTarget); + new_proxy->set_APDU_log(get_APDU_log()); return new_proxy; } @@ -74,7 +106,7 @@ char *Yaz_Proxy::get_cookie(Z_OtherInformation **otherInfo) assert (oid_ent_to_oid (&ent, oid)); if (oid_ent_to_oid (&ent, oid) && - (oi = update_otherInformation(otherInfo, 0, oid, 1)) && + (oi = update_otherInformation(otherInfo, 0, oid, 1, 1)) && oi->which == Z_OtherInfo_characterInfo) return oi->information.characterInfo; return 0; @@ -89,7 +121,7 @@ char *Yaz_Proxy::get_proxy(Z_OtherInformation **otherInfo) ent.oclass = CLASS_USERINFO; ent.value = (oid_value) VAL_PROXY; if (oid_ent_to_oid (&ent, oid) && - (oi = update_otherInformation(otherInfo, 0, oid, 1)) && + (oi = update_otherInformation(otherInfo, 0, oid, 1, 1)) && oi->which == Z_OtherInfo_characterInfo) return oi->information.characterInfo; return 0; @@ -114,36 +146,81 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) assert (*c->m_prev == c); if (!strcmp(cookie,c->m_cookie)) { - logf (LOG_LOG, "Yaz_Proxy::get_client cached"); + logf (LOG_LOG, "Yaz_Proxy::get_client cached %s", + c->get_hostname()); + c->m_seqno = parent->m_seqno; return c; } - } - + } } if (!m_client) { - logf (LOG_LOG, "Yaz_Proxy::get_client creating new"); - c = new Yaz_ProxyClient(m_PDU_Observable->clone()); - c->m_next = parent->m_clientPool; - if (c->m_next) - c->m_next->m_prev = &c->m_next; - parent->m_clientPool = c; - c->m_prev = &parent->m_clientPool; - - sprintf (c->m_cookie, "%d", parent->m_seqno); - (parent->m_seqno)++; - if (apdu->which == Z_APDU_initRequest) { logf (LOG_LOG, "got InitRequest"); - char *proxy_host = get_proxy(&apdu->u.initRequest->otherInfo); + const char *proxy_host = + get_proxy(&apdu->u.initRequest->otherInfo); if (proxy_host) - c->client(proxy_host); - else - c->client("localhost:9999"); + set_proxyTarget(proxy_host); + logf (LOG_LOG, "proxy_host = %s", m_proxyTarget ? + m_proxyTarget:"none"); + } + else + { + logf (LOG_LOG, "no first INIT!"); + return 0; + } + if (!m_proxyTarget) + return 0; + + Yaz_ProxyClient *c_min = 0; + int min_seq = -1; + int no_of_clients = 0; + for (c = parent->m_clientPool; c; c = c->m_next) + { + no_of_clients++; + logf (LOG_LOG, "found seqno = %d", c->m_seqno); + if (min_seq < 0 || c->m_seqno < min_seq) + { + min_seq = c->m_seqno; + c_min = c; + } + } + if (no_of_clients >= parent->m_max_clients) + { + c = c_min; + logf (LOG_LOG, "Yaz_Proxy::get_client re-using session %d", + c->m_seqno); + if (c->m_server) + delete c->m_server; + c->m_server = 0; + } + else + { + logf (LOG_LOG, "Yaz_Proxy::get_client making session %d", + parent->m_seqno); + c = new Yaz_ProxyClient(m_PDU_Observable->clone()); + c->m_next = parent->m_clientPool; + if (c->m_next) + c->m_next->m_prev = &c->m_next; + parent->m_clientPool = c; + c->m_prev = &parent->m_clientPool; } + sprintf (c->m_cookie, "%lx.%d", m_seed, parent->m_seqno); + logf (LOG_LOG, "Yaz_Proxy::get_client connect to %s", m_proxyTarget); + c->m_seqno = parent->m_seqno; + c->client(m_proxyTarget); + c->m_init_flag = 0; + + delete c->m_last_query; + c->m_last_query = 0; + c->m_last_resultCount = 0; + c->m_sr_transform = 0; + c->timeout(600); + + (parent->m_seqno)++; } return c; } @@ -165,6 +242,7 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) m_client->m_last_resultCount < *sr->largeSetLowerBound) { // medium Set + logf (LOG_LOG, "Yaz_Proxy::result_set_optimize medium set"); Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentRequest); Z_PresentRequest *pr = new_apdu->u.presentRequest; pr->referenceId = sr->referenceId; @@ -185,6 +263,7 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) m_client->m_last_resultCount == 0) { // large set + logf (LOG_LOG, "Yaz_Proxy::result_set_optimize large set"); Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse); new_apdu->u.searchResponse->referenceId = sr->referenceId; new_apdu->u.searchResponse->resultCount = @@ -195,6 +274,7 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) else { // small set + logf (LOG_LOG, "Yaz_Proxy::result_set_optimize small set"); Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentRequest); Z_PresentRequest *pr = new_apdu->u.presentRequest; pr->referenceId = sr->referenceId; @@ -214,7 +294,7 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) } else { - logf (LOG_LOG, "query doesn't match"); + logf (LOG_LOG, "Yaz_Proxy::result_set_optimize new set"); delete m_client->m_last_query; m_client->m_last_query = this_query; } @@ -233,9 +313,12 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu) } m_client->m_server = this; +#if 0 Z_OtherInformation **oi; get_otherInfoAPDU(apdu, &oi); *oi = 0; +#endif + if (apdu->which == Z_APDU_initRequest) { if (m_client->m_init_flag) @@ -253,7 +336,7 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu) if (!apdu) return; - logf (LOG_LOG, "Yaz_ProxyClient::send_Z_PDU"); + logf (LOG_LOG, "Yaz_ProxyClient::send_Z_PDU %s", m_client->get_hostname()); if (m_client->send_Z_PDU(apdu) < 0) { delete m_client; @@ -261,9 +344,13 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu) } } -void Yaz_Proxy::failNotify() +void Yaz_Proxy::connectNotify() +{ +} + +void Yaz_Proxy::shutdown() { - logf (LOG_LOG, "failNotity server"); + logf (LOG_LOG, "shutdown (client to proxy)"); if (m_keepalive) { // Tell client (if any) that no server connection is there.. @@ -277,13 +364,30 @@ void Yaz_Proxy::failNotify() delete this; } -void Yaz_ProxyClient::failNotify() +void Yaz_ProxyClient::shutdown() { - logf (LOG_LOG, "failNotity client"); + logf (LOG_LOG, "shutdown (proxy to server) %s", get_hostname()); delete m_server; delete this; } +void Yaz_Proxy::failNotify() +{ + logf (LOG_LOG, "connection closed by client"); + shutdown(); +} + +void Yaz_ProxyClient::failNotify() +{ + logf (LOG_LOG, "Yaz_ProxyClient connection closed by %s", get_hostname()); + shutdown(); +} + +void Yaz_ProxyClient::connectNotify() +{ + logf (LOG_LOG, "Yaz_ProxyClient connection accept by %s", get_hostname()); +} + IYaz_PDU_Observer *Yaz_ProxyClient::clone(IYaz_PDU_Observable *the_PDU_Observable) { @@ -303,12 +407,14 @@ Yaz_ProxyClient::~Yaz_ProxyClient() void Yaz_Proxy::timeoutNotify() { - failNotify(); + logf (LOG_LOG, "timeout (client to proxy)"); + shutdown(); } void Yaz_ProxyClient::timeoutNotify() { - failNotify(); + logf (LOG_LOG, "timeout (proxy to target) %s", get_hostname()); + shutdown(); } Yaz_ProxyClient::Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable) : @@ -325,7 +431,7 @@ Yaz_ProxyClient::Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable) : void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu) { - logf (LOG_LOG, "Yaz_ProxyClient::recv_Z_PDU"); + logf (LOG_LOG, "Yaz_ProxyClient::recv_Z_PDU %s", get_hostname()); if (apdu->which == Z_APDU_searchResponse) m_last_resultCount = *apdu->u.searchResponse->resultCount; if (apdu->which == Z_APDU_presentResponse && m_sr_transform)