/*
- * 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.15 2000-08-31 14:41:55 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.
*
#include <time.h>
#include <yaz/log.h>
-#include <yaz-proxy.h>
+#include <yaz++/yaz-proxy.h>
Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable) :
Yaz_Z_Assoc(the_PDU_Observable)
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;
if (!m_proxyTarget)
return 0;
- if (cookie)
+ if (cookie && *cookie)
{
logf (LOG_LOG, "lookup of clients cookie=%s target=%s",
cookie, m_proxyTarget);
for (c = parent->m_clientPool; c; c = c->m_next)
{
- logf (LOG_LOG, " found client cookie = %s target=%s",
- c->m_cookie, c->get_hostname());
+ 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 (cc)
{
+ // found it in cache
c = cc;
- if (c->m_waiting)
+ // 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->m_last_resultCount = 0;
c->m_sr_transform = 0;
c->m_waiting = 0;
- c->timeout(600);
+ 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;
}
}
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;
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
{
c->m_last_resultCount = 0;
c->m_sr_transform = 0;
c->m_waiting = 0;
- c->timeout(600);
+ c->timeout(10);
(parent->m_seqno)++;
}
+ yaz_log (LOG_LOG, "get_client 3 %p %p", this, c);
return c;
}
return;
}
m_client->m_server = this;
-#if 0
- Z_OtherInformation **oi;
- get_otherInfoAPDU(apdu, &oi);
- *oi = 0;
-#endif
if (apdu->which == Z_APDU_initRequest)
{
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
// 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..
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;
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);
}
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;
}
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;
projects / yazpp-moved-to-github.git / blobdiff