* Copyright (c) 1998-2001, Index Data.
* See the file LICENSE for details.
*
- * $Id: yaz-proxy.cpp,v 1.30 2001-11-06 20:33:32 adam Exp $
+ * $Id: yaz-proxy.cpp,v 1.32 2002-08-28 13:01:41 adam Exp $
*/
#include <assert.h>
m_seqno = 1;
m_keepalive = 1;
m_proxyTarget = 0;
+ m_proxy_authentication = 0;
m_max_clients = 50;
m_seed = time(0);
m_optimize = xstrdup ("1");
Yaz_Proxy::~Yaz_Proxy()
{
xfree (m_proxyTarget);
+ xfree (m_proxy_authentication);
xfree (m_optimize);
}
-void Yaz_Proxy::set_proxyTarget(const char *target)
+void Yaz_Proxy::set_proxy_target(const char *target)
{
xfree (m_proxyTarget);
m_proxyTarget = 0;
m_proxyTarget = (char *) xstrdup (target);
}
+void Yaz_Proxy::set_proxy_authentication (const char *auth)
+{
+ xfree (m_proxy_authentication);
+ m_proxy_authentication = 0;
+ if (auth)
+ m_proxy_authentication = (char *) xstrdup (auth);
+}
+
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(500);
- new_proxy->set_proxyTarget(m_proxyTarget);
+ new_proxy->set_proxy_target(m_proxyTarget);
new_proxy->set_APDU_log(get_APDU_log());
+ new_proxy->set_proxy_authentication(m_proxy_authentication);
+ yaz_log (LOG_LOG, "New session p=%p", new_proxy);
return new_proxy;
}
const char *proxy_host = get_proxy(oi);
if (proxy_host)
- set_proxyTarget(proxy_host);
+ set_proxy_target(proxy_host);
// no target specified at all?
if (!m_proxyTarget)
c->close();
c->client(m_proxyTarget);
c->m_init_flag = 0;
-
- delete c->m_last_query;
- c->m_last_query = 0;
+
+ c->m_last_ok = 0;
c->m_last_resultCount = 0;
c->m_sr_transform = 0;
c->m_waiting = 0;
yaz_log (LOG_LOG, "no first INIT!");
return 0;
}
- yaz_log (LOG_LOG, "got InitRequest");
-
+ Z_InitRequest *initRequest = apdu->u.initRequest;
+
+ if (!initRequest->idAuthentication)
+ {
+ if (m_proxy_authentication)
+ {
+ initRequest->idAuthentication =
+ (Z_IdAuthentication *)
+ odr_malloc (odr_encode(),
+ sizeof(*initRequest->idAuthentication));
+ initRequest->idAuthentication->which =
+ Z_IdAuthentication_open;
+ initRequest->idAuthentication->u.open =
+ odr_strdup (odr_encode(), m_proxy_authentication);
+ }
+ }
+
// 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;
+ yaz_log (LOG_LOG, "Existing sessions");
for (c = parent->m_clientPool; c; c = c->m_next)
{
+ yaz_log (LOG_LOG, " Session %-3d wait=%d %s", c->m_seqno,
+ c->m_waiting, c->get_hostname());
no_of_clients++;
if (min_seq < 0 || c->m_seqno < min_seq)
{
c = c_min;
if (c->m_waiting || strcmp(m_proxyTarget, c->get_hostname()))
{
- yaz_log (LOG_LOG, "Yaz_Proxy::get_client re-init session %d",
+ yaz_log (LOG_LOG, "Replace session %d",
c->m_seqno);
if (c->m_server && c->m_server != this)
delete c->m_server;
}
else
{
- yaz_log (LOG_LOG,
- "Yaz_Proxy::get_client re-use session %d to %d",
+ yaz_log (LOG_LOG, "Reuse session %d to %d",
c->m_seqno, parent->m_seqno);
if (cookie)
strcpy (c->m_cookie, cookie);
}
else
{
- yaz_log (LOG_LOG, "Yaz_Proxy::get_client making session %d",
- parent->m_seqno);
+ yaz_log (LOG_LOG, "Making session %d %s", parent->m_seqno,
+ m_proxyTarget);
c = new Yaz_ProxyClient(m_PDU_Observable->clone());
c->m_next = parent->m_clientPool;
if (c->m_next)
strcpy (c->m_cookie, cookie);
else
c->m_cookie[0] = '\0';
- yaz_log (LOG_LOG, "Yaz_Proxy::get_client connect to %s",
- m_proxyTarget);
+ yaz_log (LOG_LOG, "Connecting 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_last_ok = 0;
c->m_sr_transform = 0;
c->m_waiting = 0;
c->timeout(10);
this_query->set_Z_Query(sr->query);
- if (m_client->m_last_query &&
+ if (m_client->m_last_ok && m_client->m_last_query &&
m_client->m_last_query->match(this_query) &&
m_client->m_last_databases.match(this_databases))
{
m_client->m_last_resultCount < *sr->largeSetLowerBound)
{
// medium Set
- yaz_log (LOG_LOG, "Yaz_Proxy::result_set_optimize medium set");
+ // send present request (medium size)
+ yaz_log (LOG_LOG, "Optimizing search for medium set");
Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentRequest);
Z_PresentRequest *pr = new_apdu->u.presentRequest;
pr->referenceId = sr->referenceId;
else if (m_client->m_last_resultCount >= *sr->largeSetLowerBound ||
m_client->m_last_resultCount == 0)
{
- // large set
- yaz_log (LOG_LOG, "Yaz_Proxy::result_set_optimize large set");
+ // large set. Return pseudo-search response immediately
+ yaz_log (LOG_LOG, "Optimizing search for 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
- yaz_log (LOG_LOG, "Yaz_Proxy::result_set_optimize small set");
+ // send a present request (small set)
+ yaz_log (LOG_LOG, "Optimizing search for small set");
Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentRequest);
Z_PresentRequest *pr = new_apdu->u.presentRequest;
pr->referenceId = sr->referenceId;
}
else
{
- yaz_log (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_last_ok = 0;
m_client->m_last_databases.set(sr->num_databaseNames,
(const char **) sr->databaseNames);
}
return apdu;
}
+static const char *apdu_name(Z_APDU *apdu)
+{
+ switch (apdu->which)
+ {
+ case Z_APDU_initRequest:
+ return "initRequest";
+ case Z_APDU_initResponse:
+ return "initResponse";
+ case Z_APDU_searchRequest:
+ return "searchRequest";
+ case Z_APDU_searchResponse:
+ return "searchResponse";
+ case Z_APDU_presentRequest:
+ return "presentRequest";
+ case Z_APDU_presentResponse:
+ return "presentResponse";
+ }
+ return "other";
+}
+
void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu)
{
- yaz_log (LOG_LOG, "Yaz_Proxy::recv_Z_PDU");
+ yaz_log (LOG_LOG, "Receiving %s from client", apdu_name(apdu));
// Determine our client.
m_client = get_client(apdu);
if (!m_client)
if (!apdu)
return;
- yaz_log (LOG_LOG, "Yaz_ProxyClient::send_Z_PDU %s",
- m_client->get_hostname());
+ yaz_log (LOG_LOG, "Sending %s to %s",
+ apdu_name(apdu), m_client->get_hostname());
// delete other info part from PDU before sending to target
Z_OtherInformation **oi;
void Yaz_ProxyClient::connectNotify()
{
- yaz_log (LOG_LOG, "Yaz_ProxyClient connection accepted by %s",
- get_hostname());
+ yaz_log (LOG_LOG, "Connection accepted by %s", get_hostname());
timeout(600);
}
m_init_flag = 0;
m_last_query = 0;
m_last_resultCount = 0;
+ m_last_ok = 0;
m_sr_transform = 0;
m_waiting = 0;
}
void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu)
{
m_waiting = 0;
- yaz_log (LOG_LOG, "Yaz_ProxyClient::recv_Z_PDU %s", get_hostname());
+ yaz_log (LOG_LOG, "Receiving %s from %s", apdu_name(apdu),
+ 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 (status &&
+ (!apdu->u.searchResponse->records ||
+ apdu->u.searchResponse->records->which == Z_Records_DBOSD))
+ m_last_ok = 1;
}
if (apdu->which == Z_APDU_presentResponse && m_sr_transform)
{
set_otherInformationString (apdu, VAL_COOKIE, 1, m_cookie);
if (m_server)
{
- yaz_log (LOG_LOG, "Yaz_Proxy::send_Z_PDU");
+ yaz_log (LOG_LOG, "Sending %s to client", apdu_name(apdu));
m_server->send_Z_PDU(apdu);
}
}
projects / yazpp-moved-to-github.git / blobdiff