X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-proxy.cpp;h=86090219ab2132f3c9f7a7b84466c730853feede;hb=50f38dcd58cdf62b3380710bdd7f23d6f88c555c;hp=df3615d1ad7e1c9b3f8e529bc756bb879a9114ed;hpb=6104ba97908b1292806a1242b65beb0edbf2314f;p=yazpp-moved-to-github.git diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp index df3615d..8609021 100644 --- a/src/yaz-proxy.cpp +++ b/src/yaz-proxy.cpp @@ -1,10 +1,43 @@ /* - * Copyright (c) 1998-2000, Index Data. + * Copyright (c) 1998-2001, Index Data. * See the file LICENSE for details. - * Sebastian Hammer, Adam Dickmeiss * * $Log: yaz-proxy.cpp,v $ - * Revision 1.14 2000-08-10 08:42:42 adam + * Revision 1.24 2001-04-10 10:48:08 adam + * Fixed problem where proxy could cash bad result sets. + * + * Revision 1.23 2001/03/26 14:43:49 adam + * New threaded PDU association. + * + * Revision 1.22 2000/11/20 11:27:33 adam + * Fixes for connect operation (timeout and notify fix). + * + * Revision 1.21 2000/11/01 14:22:59 adam + * Added fd parameter for method IYaz_PDU_Observer::clone. + * + * Revision 1.20 2000/10/24 12:29:57 adam + * Fixed bug in proxy where a Yaz_ProxyClient could be owned by + * two Yaz_Proxy's (fatal). + * + * Revision 1.19 2000/10/11 11:58:16 adam + * Moved header files to include/yaz++. Switched to libtool and automake. + * Configure script creates yaz++-config script. + * + * Revision 1.18 2000/09/08 10:23:42 adam + * Added skeleton of yaz-z-server. + * + * Revision 1.17 2000/09/05 13:57:28 adam + * Fixed get_otherInfoAPDU to return otherInfo for extended services. + * + * Revision 1.16 2000/09/04 08:29:22 adam + * Fixed memory leak(s). Added re-use of associations, rather than + * re-init, when maximum number of targets are in use. + * + * Revision 1.15 2000/08/31 14:41:55 adam + * Proxy no longer generates cookies (it's up to the client). Proxy + * re-opens if target new op is started before previous operation finishes. + * + * Revision 1.14 2000/08/10 08:42:42 adam * Fixes for {set,get}_APDU_log. * * Revision 1.13 2000/08/07 14:19:59 adam @@ -57,7 +90,7 @@ #include #include -#include +#include Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable) : Yaz_Z_Assoc(the_PDU_Observable) @@ -86,12 +119,12 @@ void Yaz_Proxy::set_proxyTarget(const char *target) m_proxyTarget = (char *) xstrdup (target); } -IYaz_PDU_Observer *Yaz_Proxy::clone(IYaz_PDU_Observable - *the_PDU_Observable) +IYaz_PDU_Observer *Yaz_Proxy::sessionNotify(IYaz_PDU_Observable + *the_PDU_Observable, int fd) { Yaz_Proxy *new_proxy = new Yaz_Proxy(the_PDU_Observable); new_proxy->m_parent = this; - new_proxy->timeout(120); + new_proxy->timeout(500); new_proxy->set_proxyTarget(m_proxyTarget); new_proxy->set_APDU_log(get_APDU_log()); return new_proxy; @@ -140,49 +173,82 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) char *cookie = get_cookie(oi); logf (LOG_LOG, "Yaz_Proxy::get_client cookie=%s", cookie ? cookie : "null"); - if (cookie) + + const char *proxy_host = get_proxy(oi); + if (proxy_host) + set_proxyTarget(proxy_host); + logf (LOG_LOG, "proxy_host = %s", m_proxyTarget ? m_proxyTarget:"none"); + + // no target specified at all? + if (!m_proxyTarget) + return 0; + + if (cookie && *cookie) { + logf (LOG_LOG, "lookup of clients cookie=%s target=%s", + cookie, m_proxyTarget); + Yaz_ProxyClient *cc = 0; + for (c = parent->m_clientPool; c; c = c->m_next) { + logf (LOG_LOG, " found client cookie = %s target=%s seqno=%d", + c->m_cookie, c->get_hostname(), c->m_seqno); assert (c->m_prev); assert (*c->m_prev == c); - if (!strcmp(cookie,c->m_cookie)) + if (!strcmp(cookie,c->m_cookie) && + !strcmp(m_proxyTarget, c->get_hostname())) { - logf (LOG_LOG, "Yaz_Proxy::get_client cached %s", - c->get_hostname()); - c->m_seqno = parent->m_seqno; - return c; + logf (LOG_LOG, "found!"); + cc = c; + } + } + if (cc) + { + // found it in cache + c = cc; + // The following handles "cancel" + // If connection is busy (waiting for PDU) and + // we have an initRequest we can safely do re-open + if (c->m_waiting && apdu->which == Z_APDU_initRequest) + { + logf (LOG_LOG, "reopen target=%s", c->get_hostname()); + c->close(); + 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->m_waiting = 0; + c->timeout(600); } - } + c->m_seqno = parent->m_seqno; + if (c->m_server && c->m_server != this) + c->m_server->m_client = 0; + c->m_server = this; + c->m_seqno = parent->m_seqno; + (parent->m_seqno)++; + yaz_log (LOG_LOG, "get_client 1 %p %p", this, c); + return c; + } } if (!m_client) { - if (apdu->which == Z_APDU_initRequest) - { - logf (LOG_LOG, "got InitRequest"); - - const char *proxy_host = - get_proxy(&apdu->u.initRequest->otherInfo); - if (proxy_host) - set_proxyTarget(proxy_host); - logf (LOG_LOG, "proxy_host = %s", m_proxyTarget ? - m_proxyTarget:"none"); - } - else + if (apdu->which != Z_APDU_initRequest) { logf (LOG_LOG, "no first INIT!"); return 0; } - if (!m_proxyTarget) - return 0; - + logf (LOG_LOG, "got InitRequest"); + + // go through list of clients - and find the lowest/oldest one. 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; @@ -192,11 +258,32 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) 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; + if (c->m_waiting || strcmp(m_proxyTarget, c->get_hostname())) + { + logf (LOG_LOG, "Yaz_Proxy::get_client re-init session %d", + c->m_seqno); + if (c->m_server && c->m_server != this) + delete c->m_server; + c->m_server = 0; + } + else + { + logf (LOG_LOG, "Yaz_Proxy::get_client re-use session %d to %d", + c->m_seqno, parent->m_seqno); + if (cookie) + strcpy (c->m_cookie, cookie); + else + c->m_cookie[0] = '\0'; + c->m_seqno = parent->m_seqno; + if (c->m_server && c->m_server != this) + { + c->m_server->m_client = 0; + delete c->m_server; + } + (parent->m_seqno)++; + yaz_log (LOG_LOG, "get_client 2 %p %p", this, c); + return c; + } } else { @@ -209,7 +296,10 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) parent->m_clientPool = c; c->m_prev = &parent->m_clientPool; } - sprintf (c->m_cookie, "%lx.%d", m_seed, parent->m_seqno); + if (cookie) + strcpy (c->m_cookie, cookie); + else + c->m_cookie[0] = '\0'; logf (LOG_LOG, "Yaz_Proxy::get_client connect to %s", m_proxyTarget); c->m_seqno = parent->m_seqno; c->client(m_proxyTarget); @@ -219,11 +309,12 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) c->m_last_query = 0; c->m_last_resultCount = 0; c->m_sr_transform = 0; - - c->timeout(600); + c->m_waiting = 0; + c->timeout(10); (parent->m_seqno)++; } + yaz_log (LOG_LOG, "get_client 3 %p %p", this, c); return c; } @@ -315,12 +406,6 @@ 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) @@ -339,11 +424,21 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu) return; logf (LOG_LOG, "Yaz_ProxyClient::send_Z_PDU %s", m_client->get_hostname()); + + // delete other info part from PDU before sending to target + Z_OtherInformation **oi; + get_otherInfoAPDU(apdu, &oi); + if (oi) + *oi = 0; + if (m_client->send_Z_PDU(apdu) < 0) { delete m_client; + m_client = 0; delete this; } + else + m_client->m_waiting = 1; } void Yaz_Proxy::connectNotify() @@ -353,14 +448,19 @@ void Yaz_Proxy::connectNotify() void Yaz_Proxy::shutdown() { logf (LOG_LOG, "shutdown (client to proxy)"); - if (m_keepalive) + // only keep if keep_alive flag and cookie is set... + if (m_keepalive && m_client && m_client->m_cookie[0]) { + if (m_client->m_waiting == 2) + abort(); // Tell client (if any) that no server connection is there.. - if (m_client) - m_client->m_server = 0; + m_client->m_server = 0; } - else + else if (m_client) { + yaz_log (LOG_LOG, "deleting %p %p", this, m_client); + if (m_client->m_waiting == 2) + abort(); delete m_client; } delete this; @@ -387,11 +487,13 @@ void Yaz_ProxyClient::failNotify() void Yaz_ProxyClient::connectNotify() { - logf (LOG_LOG, "Yaz_ProxyClient connection accept by %s", get_hostname()); + logf (LOG_LOG, "Yaz_ProxyClient connection accepted by %s", + get_hostname()); + timeout(600); } -IYaz_PDU_Observer *Yaz_ProxyClient::clone(IYaz_PDU_Observable - *the_PDU_Observable) +IYaz_PDU_Observer *Yaz_ProxyClient::sessionNotify(IYaz_PDU_Observable + *the_PDU_Observable, int fd) { return new Yaz_ProxyClient(the_PDU_Observable); } @@ -399,11 +501,10 @@ IYaz_PDU_Observer *Yaz_ProxyClient::clone(IYaz_PDU_Observable Yaz_ProxyClient::~Yaz_ProxyClient() { if (m_prev) - { *m_prev = m_next; - if (m_next) - m_next->m_prev = m_prev; - } + if (m_next) + m_next->m_prev = m_prev; + m_waiting = 2; // for debugging purposes only. delete m_last_query; } @@ -429,13 +530,25 @@ Yaz_ProxyClient::Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable) : m_last_query = 0; m_last_resultCount = 0; m_sr_transform = 0; + m_waiting = 0; } void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu) { + m_waiting = 0; logf (LOG_LOG, "Yaz_ProxyClient::recv_Z_PDU %s", get_hostname()); if (apdu->which == Z_APDU_searchResponse) + { m_last_resultCount = *apdu->u.searchResponse->resultCount; + int status = *apdu->u.searchResponse->searchStatus; + if (! status || ( + apdu->u.searchResponse->records && + apdu->u.searchResponse->records->which != Z_Records_DBOSD)) + { + delete m_last_query; + m_last_query = 0; + } + } if (apdu->which == Z_APDU_presentResponse && m_sr_transform) { m_sr_transform = 0;