/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
* $Log: yaz-proxy.cpp,v $
- * Revision 1.8 1999-05-04 10:53:00 adam
+ * 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
+ * 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
*/
#include <assert.h>
+#include <time.h>
-#include <log.h>
-
-#include <yaz-proxy.h>
+#include <yaz/log.h>
+#include <yaz++/yaz-proxy.h>
Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable) :
Yaz_Z_Assoc(the_PDU_Observable)
m_clientPool = 0;
m_seqno = 1;
m_keepalive = 1;
+ m_proxyTarget = 0;
+ m_max_clients = 50;
+ 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
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;
}
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;
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;
char *cookie = get_cookie(oi);
logf (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");
+
+ // no target specified at all?
+ if (!m_proxyTarget)
+ return 0;
+
if (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");
- 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;
+ (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)
+ if (apdu->which != Z_APDU_initRequest)
{
- logf (LOG_LOG, "got InitRequest");
+ logf (LOG_LOG, "no first INIT!");
+ return 0;
+ }
+ logf (LOG_LOG, "got InitRequest");
- char *proxy_host = get_proxy(&apdu->u.initRequest->otherInfo);
- if (proxy_host)
- c->client(proxy_host);
+ // 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++;
+ 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;
+ 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)
+ delete c->m_server;
+ c->m_server = 0;
+ }
else
- c->client("localhost:9999");
+ {
+ 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;
+ (parent->m_seqno)++;
+ return c;
+ }
}
+ 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;
+ }
+ 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);
+ 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);
+
+ (parent->m_seqno)++;
}
return c;
}
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;
m_client->m_sr_transform = 1;
return new_apdu;
}
- else if (m_client->m_last_resultCount >= *sr->largeSetLowerBound ||
+ else if (m_client->m_last_resultCount > *sr->largeSetLowerBound ||
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 =
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;
}
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;
}
}
m_client->m_server = this;
- Z_OtherInformation **oi;
- get_otherInfoAPDU(apdu, &oi);
- *oi = 0;
if (apdu->which == Z_APDU_initRequest)
{
if (m_client->m_init_flag)
if (!apdu)
return;
- logf (LOG_LOG, "Yaz_ProxyClient::send_Z_PDU");
+ 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;
delete this;
}
+ else
+ m_client->m_waiting = 1;
}
-void Yaz_Proxy::failNotify()
+void Yaz_Proxy::connectNotify()
+{
+}
+
+void Yaz_Proxy::shutdown()
{
- logf (LOG_LOG, "failNotity server");
- if (m_keepalive)
+ logf (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])
{
// Tell client (if any) that no server connection is there..
- if (m_client)
- m_client->m_server = 0;
+ m_client->m_server = 0;
}
else
{
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)
{
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) :
m_last_query = 0;
m_last_resultCount = 0;
m_sr_transform = 0;
+ m_waiting = 0;
}
void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu)
{
- logf (LOG_LOG, "Yaz_ProxyClient::recv_Z_PDU");
+ 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;
if (apdu->which == Z_APDU_presentResponse && m_sr_transform)
projects / yazpp-moved-to-github.git / blobdiff