/*
- * 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.16 2000-09-04 08:29:22 adam
+ * Revision 1.26 2001-08-13 16:39:12 adam
+ * PDU_Assoc keeps track of children. Using yaz_log instead of logf.
+ *
+ * Revision 1.25 2001/04/25 18:59:30 adam
+ * Added referenceId handling for server.
+ *
+ * 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.
*
#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;
get_otherInfoAPDU(apdu, &oi);
char *cookie = get_cookie(oi);
- logf (LOG_LOG, "Yaz_Proxy::get_client cookie=%s", cookie ? cookie :
+ yaz_log (LOG_LOG, "Yaz_Proxy::get_client cookie=%s", cookie ? cookie :
"null");
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");
+ yaz_log (LOG_LOG, "proxy_host = %s", m_proxyTarget ? m_proxyTarget:"none");
// no target specified at all?
if (!m_proxyTarget)
return 0;
- if (cookie)
+ if (cookie && *cookie)
{
- logf (LOG_LOG, "lookup of clients cookie=%s target=%s",
+ yaz_log (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",
+ yaz_log (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) &&
!strcmp(m_proxyTarget, c->get_hostname()))
{
- logf (LOG_LOG, "found!");
+ yaz_log (LOG_LOG, "found!");
cc = c;
}
}
// 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());
+ yaz_log (LOG_LOG, "reopen target=%s", c->get_hostname());
c->close();
c->client(m_proxyTarget);
c->m_init_flag = 0;
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;
}
}
{
if (apdu->which != Z_APDU_initRequest)
{
- logf (LOG_LOG, "no first INIT!");
+ yaz_log (LOG_LOG, "no first INIT!");
return 0;
}
- logf (LOG_LOG, "got InitRequest");
+ yaz_log (LOG_LOG, "got InitRequest");
// go through list of clients - and find the lowest/oldest one.
Yaz_ProxyClient *c_min = 0;
c = c_min;
if (c->m_waiting || strcmp(m_proxyTarget, c->get_hostname()))
{
- logf (LOG_LOG, "Yaz_Proxy::get_client re-init session %d",
+ yaz_log (LOG_LOG, "Yaz_Proxy::get_client re-init session %d",
c->m_seqno);
- if (c->m_server)
+ 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",
+ yaz_log (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
{
- logf (LOG_LOG, "Yaz_Proxy::get_client making session %d",
+ yaz_log (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;
strcpy (c->m_cookie, cookie);
else
c->m_cookie[0] = '\0';
- logf (LOG_LOG, "Yaz_Proxy::get_client connect to %s", m_proxyTarget);
+ yaz_log (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;
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;
}
m_client->m_last_resultCount < *sr->largeSetLowerBound)
{
// medium Set
- logf (LOG_LOG, "Yaz_Proxy::result_set_optimize medium set");
+ yaz_log (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;
m_client->m_last_resultCount == 0)
{
// large set
- logf (LOG_LOG, "Yaz_Proxy::result_set_optimize large set");
+ yaz_log (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 =
else
{
// small set
- logf (LOG_LOG, "Yaz_Proxy::result_set_optimize small set");
+ yaz_log (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;
}
else
{
- logf (LOG_LOG, "Yaz_Proxy::result_set_optimize new set");
+ yaz_log (LOG_LOG, "Yaz_Proxy::result_set_optimize new set");
delete m_client->m_last_query;
m_client->m_last_query = this_query;
}
void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu)
{
- logf (LOG_LOG, "Yaz_Proxy::recv_Z_PDU");
+ yaz_log (LOG_LOG, "Yaz_Proxy::recv_Z_PDU");
// Determine our client.
m_client = get_client(apdu);
if (!m_client)
if (!apdu)
return;
- logf (LOG_LOG, "Yaz_ProxyClient::send_Z_PDU %s", m_client->get_hostname());
+ yaz_log (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);
- *oi = 0;
+ if (oi)
+ *oi = 0;
if (m_client->send_Z_PDU(apdu) < 0)
{
delete m_client;
+ m_client = 0;
delete this;
}
else
void Yaz_Proxy::shutdown()
{
- logf (LOG_LOG, "shutdown (client to proxy)");
+ yaz_log (LOG_LOG, "shutdown (client to proxy)");
// 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;
}
+ else if (!m_parent)
+ {
+ abort();
+ }
delete this;
}
void Yaz_ProxyClient::shutdown()
{
- logf (LOG_LOG, "shutdown (proxy to server) %s", get_hostname());
+ yaz_log (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");
+ yaz_log (LOG_LOG, "connection closed by client");
shutdown();
}
void Yaz_ProxyClient::failNotify()
{
- logf (LOG_LOG, "Yaz_ProxyClient connection closed by %s", get_hostname());
+ yaz_log (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());
+ yaz_log (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;
}
void Yaz_Proxy::timeoutNotify()
{
- logf (LOG_LOG, "timeout (client to proxy)");
+ yaz_log (LOG_LOG, "timeout (client to proxy)");
shutdown();
}
void Yaz_ProxyClient::timeoutNotify()
{
- logf (LOG_LOG, "timeout (proxy to target) %s", get_hostname());
+ yaz_log (LOG_LOG, "timeout (proxy to target) %s", get_hostname());
shutdown();
}
void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu)
{
m_waiting = 0;
- logf (LOG_LOG, "Yaz_ProxyClient::recv_Z_PDU %s", get_hostname());
+ yaz_log (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;
set_otherInformationString (apdu, VAL_COOKIE, 1, m_cookie);
if (m_server)
{
- logf (LOG_LOG, "Yaz_Proxy::send_Z_PDU");
+ yaz_log (LOG_LOG, "Yaz_Proxy::send_Z_PDU");
m_server->send_Z_PDU(apdu);
}
}
projects / yazpp-moved-to-github.git / blobdiff