X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-proxy.cpp;h=217b660652d85af1ae30b304988839119bc4bcaf;hb=b79576d9970810e60bc7b34cc9af56f3139fa5d8;hp=f7a83534ec7f91aebb0f4a5c226739c5b329c8eb;hpb=ff656a4cd980e8ba6472f99e110c3b52d6a1ed86;p=yazpp-moved-to-github.git diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp index f7a8353..217b660 100644 --- a/src/yaz-proxy.cpp +++ b/src/yaz-proxy.cpp @@ -2,7 +2,7 @@ * 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.35 2002-09-10 13:00:58 adam Exp $ */ #include @@ -21,6 +21,7 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable) : 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"); @@ -29,10 +30,11 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable) : 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; @@ -40,14 +42,24 @@ void Yaz_Proxy::set_proxyTarget(const char *target) 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; } @@ -95,7 +107,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) 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) @@ -130,9 +142,8 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) 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; @@ -155,14 +166,32 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) 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) { @@ -175,7 +204,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) 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; @@ -183,8 +212,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) } 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); @@ -203,8 +231,8 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) } 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) @@ -216,15 +244,12 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) 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); @@ -250,8 +275,9 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) 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) && + !strcmp(m_client->m_last_resultSetId, sr->resultSetName) && m_client->m_last_databases.match(this_databases)) { delete this_query; @@ -259,7 +285,8 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) 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; @@ -277,10 +304,10 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) return new_apdu; } else if (m_client->m_last_resultCount >= *sr->largeSetLowerBound || - m_client->m_last_resultCount == 0) + 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 = @@ -291,7 +318,8 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) 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; @@ -311,18 +339,42 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) } 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; + + xfree (m_client->m_last_resultSetId); + m_client->m_last_resultSetId = xstrdup (sr->resultSetName); + 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) @@ -336,7 +388,8 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu) { if (m_client->m_init_flag) { - Z_APDU *apdu = create_Z_PDU(Z_APDU_initResponse); + Z_APDU *apdu = m_client->m_initResponse; + apdu->u.initResponse->otherInfo = 0; if (m_client->m_cookie) set_otherInformationString(apdu, VAL_COOKIE, 1, m_client->m_cookie); @@ -349,8 +402,8 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu) 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; @@ -423,8 +476,7 @@ void Yaz_ProxyClient::failNotify() 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); } @@ -441,7 +493,9 @@ Yaz_ProxyClient::~Yaz_ProxyClient() if (m_next) m_next->m_prev = m_prev; m_waiting = 2; // for debugging purposes only. + odr_destroy(m_init_odr); delete m_last_query; + xfree (m_last_resultSetId); } void Yaz_Proxy::timeoutNotify() @@ -464,9 +518,13 @@ Yaz_ProxyClient::Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable) : m_prev = 0; m_init_flag = 0; m_last_query = 0; + m_last_resultSetId = 0; m_last_resultCount = 0; + m_last_ok = 0; m_sr_transform = 0; m_waiting = 0; + m_init_odr = odr_createmem (ODR_DECODE); + m_initResponse = 0; } const char *Yaz_Proxy::option(const char *name, const char *value) @@ -484,18 +542,24 @@ const char *Yaz_Proxy::option(const char *name, const char *value) 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_initResponse) + { + NMEM nmem = odr_extract_mem (odr_decode()); + odr_reset (m_init_odr); + nmem_transfer (m_init_odr->mem, nmem); + m_initResponse = apdu; + nmem_destroy (nmem); + } 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) { @@ -514,7 +578,7 @@ void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu) 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); } }