X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-proxy.cpp;h=e7783f95953a954f44765108eae102ed2a6093a2;hp=a09a3867263243dea9e39dd000a80e9a33b629d0;hb=779c379c70bf479073cc4968f6bf5ad35ffe6eec;hpb=efb41657fc33883e6520fa571c5a944106271ec5 diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp index a09a386..e7783f9 100644 --- a/src/yaz-proxy.cpp +++ b/src/yaz-proxy.cpp @@ -2,11 +2,14 @@ * Copyright (c) 1998-2004, Index Data. * See the file LICENSE for details. * - * $Id: yaz-proxy.cpp,v 1.85 2004-01-08 22:54:53 adam Exp $ + * $Id: yaz-proxy.cpp,v 1.110 2004-03-17 10:49:22 adam Exp $ */ +#include #include #include +#include +#include #include #include @@ -16,11 +19,6 @@ #include #include -#if HAVE_XSLT -#include -#include -#endif - static const char *apdu_name(Z_APDU *apdu) { switch (apdu->which) @@ -95,7 +93,8 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable, m_optimize = xstrdup ("1"); strcpy(m_session_str, "0 "); m_session_no=0; - m_bytes_sent = m_bytes_recv = 0; + m_bytes_sent = 0; + m_bytes_recv = 0; m_bw_hold_PDU = 0; m_bw_max = 0; m_pdu_max = 0; @@ -104,13 +103,21 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable, m_config_fname = 0; m_request_no = 0; m_invalid_session = 0; + m_referenceId = 0; + m_referenceId_mem = nmem_create(); m_config = 0; m_marcxml_flag = 0; - m_stylesheet_schema = 0; + m_stylesheet_xsp = 0; + m_stylesheet_nprl = 0; m_s2z_stylesheet = 0; + m_s2z_database = 0; m_schema = 0; m_initRequest_apdu = 0; m_initRequest_mem = 0; + m_initRequest_preferredMessageSize = 0; + m_initRequest_maximumRecordSize = 0; + m_initRequest_options = 0; + m_initRequest_version = 0; m_apdu_invalid_session = 0; m_mem_invalid_session = 0; m_s2z_odr_init = 0; @@ -124,6 +131,8 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable, m_s2z_packing = Z_SRW_recordPacking_string; m_time_tv.tv_sec = 0; m_time_tv.tv_usec = 0; + if (!m_parent) + low_socket_open(); } Yaz_Proxy::~Yaz_Proxy() @@ -132,16 +141,23 @@ Yaz_Proxy::~Yaz_Proxy() m_bytes_sent, m_bytes_recv); nmem_destroy(m_initRequest_mem); nmem_destroy(m_mem_invalid_session); + nmem_destroy(m_referenceId_mem); + xfree (m_proxyTarget); xfree (m_default_target); xfree (m_proxy_authentication); xfree (m_optimize); - xfree (m_stylesheet_schema); + + if (m_stylesheet_xsp) + xsltFreeStylesheet(m_stylesheet_xsp); + xfree (m_schema); if (m_s2z_odr_init) odr_destroy(m_s2z_odr_init); if (m_s2z_odr_search) odr_destroy(m_s2z_odr_search); + if (!m_parent) + low_socket_close(); delete m_config; } @@ -262,30 +278,53 @@ char *Yaz_Proxy::get_proxy(Z_OtherInformation **otherInfo) const char *Yaz_Proxy::load_balance(const char **url) { int zurl_in_use[MAX_ZURL_PLEX]; + int zurl_in_spare[MAX_ZURL_PLEX]; Yaz_ProxyClient *c; int i; for (i = 0; im_clientPool; c; c = c->m_next) { for (i = 0; url[i]; i++) if (!strcmp(url[i], c->get_hostname())) + { zurl_in_use[i]++; + if (c->m_cookie == 0 && c->m_server == 0 && c->m_waiting == 0) + zurl_in_spare[i]++; + } } - int min = 100000; - const char *ret = 0; + int min_use = 100000; + int spare_for_min = 0; + int max_spare = 0; + const char *ret_min = 0; + const char *ret_spare = 0; for (i = 0; url[i]; i++) { - yaz_log(LOG_DEBUG, "%szurl=%s use=%d", - m_session_str, url[i], zurl_in_use[i]); - if (min > zurl_in_use[i]) + yaz_log(LOG_DEBUG, "%szurl=%s use=%d spare=%d", + m_session_str, url[i], zurl_in_use[i], zurl_in_spare[i]); + if (min_use > zurl_in_use[i]) + { + ret_min = url[i]; + min_use = zurl_in_use[i]; + spare_for_min = zurl_in_spare[i]; + } + if (max_spare < zurl_in_spare[i]) { - ret = url[i]; - min = zurl_in_use[i]; + ret_spare = url[i]; + max_spare = zurl_in_spare[i]; } } - return ret; + // use the one with minimum connections if spare is > 3 + if (spare_for_min > 3) + return ret_min; + // use one with most spares (if any) + if (max_spare > 0) + return ret_spare; + return ret_min; } Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, @@ -402,8 +441,8 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, !strcmp(m_proxyTarget, c->get_hostname())) { // found it in cache - yaz_log (LOG_LOG, "%sREUSE %s", - m_session_str, c->get_hostname()); + yaz_log (LOG_LOG, "%sREUSE %d %s", + m_session_str, parent->m_seqno, c->get_hostname()); c->m_seqno = parent->m_seqno; assert(c->m_server == 0); @@ -426,7 +465,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, { if (apdu->which != Z_APDU_initRequest) { - yaz_log (LOG_LOG, "no first INIT!"); + yaz_log (LOG_LOG, "%sno init request as first PDU", m_session_str); return 0; } Z_InitRequest *initRequest = apdu->u.initRequest; @@ -445,7 +484,6 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, 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; @@ -469,16 +507,16 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, c = c_min; if (c->m_waiting || strcmp(m_proxyTarget, c->get_hostname())) { - yaz_log (LOG_LOG, "%sMAXCLIENTS Destroy %d", - m_session_str, c->m_seqno); + yaz_log (LOG_LOG, "%sMAXCLIENTS %d Destroy %d", + m_session_str, parent->m_max_clients, c->m_seqno); if (c->m_server && c->m_server != this) delete c->m_server; c->m_server = 0; } else { - yaz_log (LOG_LOG, "%sMAXCLIENTS Reuse %d %d %s", - m_session_str, + yaz_log (LOG_LOG, "%sMAXCLIENTS %d Reuse %d %d %s", + m_session_str, parent->m_max_clients, c->m_seqno, parent->m_seqno, c->get_hostname()); xfree (c->m_cookie); c->m_cookie = 0; @@ -581,50 +619,77 @@ void Yaz_Proxy::display_diagrecs(Z_DiagRec **pp, int num) } } -void Yaz_Proxy::convert_xsl(Z_NamePlusRecordList *p) +int Yaz_Proxy::convert_xsl(Z_NamePlusRecordList *p, Z_APDU *apdu) { - if (!m_stylesheet_schema) - return; - xmlDocPtr xslt_doc = xmlParseFile(m_stylesheet_schema); - xsltStylesheetPtr xsp; + if (!m_stylesheet_xsp || p->num_records <= 0) + return 0; /* no XSLT to be done ... */ - xsp = xsltParseStylesheetDoc(xslt_doc); + m_stylesheet_offset = 0; + m_stylesheet_nprl = p; + m_stylesheet_apdu = apdu; + timeout(0); + return 1; +} - int i; - for (i = 0; i < p->num_records; i++) +void Yaz_Proxy::convert_xsl_delay() +{ + Z_NamePlusRecord *npr = m_stylesheet_nprl->records[m_stylesheet_offset]; + if (npr->which == Z_NamePlusRecord_databaseRecord) { - Z_NamePlusRecord *npr = p->records[i]; - if (npr->which == Z_NamePlusRecord_databaseRecord) + Z_External *r = npr->u.databaseRecord; + if (r->which == Z_External_octet) { - Z_External *r = npr->u.databaseRecord; - if (r->which == Z_External_octet) +#if 0 + fwrite((char*) r->u.octet_aligned->buf, 1, r->u.octet_aligned->len, stdout); +#endif + xmlDocPtr res, doc = xmlParseMemory( + (char*) r->u.octet_aligned->buf, + r->u.octet_aligned->len); + + + yaz_log(LOG_LOG, "%sXSLT convert %d", + m_session_str, m_stylesheet_offset); + res = xsltApplyStylesheet(m_stylesheet_xsp, doc, 0); + + if (res) { - xmlDocPtr res, doc = xmlParseMemory( - (char*) r->u.octet_aligned->buf, - r->u.octet_aligned->len); - - res = xsltApplyStylesheet(xsp, doc, 0); - xmlChar *out_buf; int out_len; - xmlDocDumpMemory (res, &out_buf, &out_len); - p->records[i]->u.databaseRecord = + xmlDocDumpFormatMemory (res, &out_buf, &out_len, 1); + + m_stylesheet_nprl->records[m_stylesheet_offset]-> + u.databaseRecord = z_ext_record(odr_encode(), VAL_TEXT_XML, (char*) out_buf, out_len); - xmlFreeDoc(doc); + xmlFree(out_buf); xmlFreeDoc(res); } + + xmlFreeDoc(doc); } } - xsltFreeStylesheet(xsp); + m_stylesheet_offset++; + if (m_stylesheet_offset == m_stylesheet_nprl->num_records) + { + m_stylesheet_nprl = 0; + if (m_stylesheet_xsp) + xsltFreeStylesheet(m_stylesheet_xsp); + m_stylesheet_xsp = 0; + timeout(m_client_idletime); + send_PDU_convert(m_stylesheet_apdu); + } + else + timeout(0); } void Yaz_Proxy::convert_to_marcxml(Z_NamePlusRecordList *p) { int i; + yaz_iconv_t cd = yaz_iconv_open("UTF-8", "MARC-8"); yaz_marc_t mt = yaz_marc_create(); yaz_marc_xml(mt, YAZ_MARC_MARCXML); + yaz_marc_iconv(mt, cd); for (i = 0; i < p->num_records; i++) { Z_NamePlusRecord *npr = p->records[i]; @@ -639,44 +704,15 @@ void Yaz_Proxy::convert_to_marcxml(Z_NamePlusRecordList *p) r->u.octet_aligned->len, &result, &rlen)) { - yaz_iconv_t cd = yaz_iconv_open("UTF-8", "MARC-8"); - WRBUF wrbuf = wrbuf_alloc(); - - char outbuf[120]; - size_t inbytesleft = rlen; - const char *inp = result; - while (cd && inbytesleft) - { - size_t outbytesleft = sizeof(outbuf); - char *outp = outbuf; - size_t r; - - r = yaz_iconv (cd, (char**) &inp, - &inbytesleft, - &outp, &outbytesleft); - if (r == (size_t) (-1)) - { - int e = yaz_iconv_error(cd); - if (e != YAZ_ICONV_E2BIG) - { - yaz_log(LOG_WARN, "conversion failure"); - break; - } - } - wrbuf_write(wrbuf, outbuf, outp - outbuf); - } - if (cd) - yaz_iconv_close(cd); - npr->u.databaseRecord = z_ext_record(odr_encode(), VAL_TEXT_XML, - wrbuf_buf(wrbuf), - wrbuf_len(wrbuf)); - wrbuf_free(wrbuf, 1); + result, rlen); } } } } + if (cd) + yaz_iconv_close(cd); yaz_marc_destroy(mt); } @@ -703,7 +739,11 @@ int Yaz_Proxy::send_http_response(int code) Z_HTTP_Response *hres = gdu->u.HTTP_Response; if (m_http_version) hres->version = odr_strdup(o, m_http_version); - m_http_keepalive = 0; + if (m_http_keepalive) + z_HTTP_header_add(o, &hres->headers, "Connection", "Keep-Alive"); + else + timeout(0); + if (m_log_mask & PROXY_LOG_REQ_CLIENT) { yaz_log (LOG_LOG, "%sSending %s to client", m_session_str, @@ -711,6 +751,8 @@ int Yaz_Proxy::send_http_response(int code) } int len; int r = send_GDU(gdu, &len); + m_bytes_sent += len; + m_bw_stat.add_bytes(len); logtime(); return r; } @@ -726,6 +768,8 @@ int Yaz_Proxy::send_srw_response(Z_SRW_PDU *srw_pdu) z_HTTP_header_add(o, &hres->headers, "Content-Type", ctype); if (m_http_keepalive) z_HTTP_header_add(o, &hres->headers, "Connection", "Keep-Alive"); + else + timeout(0); static Z_SOAP_Handler soap_handlers[2] = { #if HAVE_XSLT @@ -753,6 +797,8 @@ int Yaz_Proxy::send_srw_response(Z_SRW_PDU *srw_pdu) } int len; int r = send_GDU(gdu, &len); + m_bytes_sent += len; + m_bw_stat.add_bytes(len); logtime(); return r; } @@ -766,8 +812,7 @@ int Yaz_Proxy::send_to_srw_client_error(int srw_error, const char *add) srw_res->num_diagnostics = 1; srw_res->diagnostics = (Z_SRW_diagnostic *) odr_malloc(o, sizeof(*srw_res->diagnostics)); - srw_res->diagnostics[0].code = odr_intdup(o, srw_error); - srw_res->diagnostics[0].details = add ? odr_strdup(o, add) : 0; + yaz_mk_std_diagnostic(o, srw_res->diagnostics, srw_error, add); return send_srw_response(srw_pdu); } @@ -780,9 +825,9 @@ int Yaz_Proxy::z_to_srw_diag(ODR o, Z_SRW_searchRetrieveResponse *srw_res, srw_res->num_diagnostics = 1; srw_res->diagnostics = (Z_SRW_diagnostic *) odr_malloc(o, sizeof(*srw_res->diagnostics)); - srw_res->diagnostics[0].code = - odr_intdup(o, yaz_diag_bib1_to_srw(*ddf->condition)); - srw_res->diagnostics[0].details = ddf->u.v2Addinfo; + yaz_mk_std_diagnostic(o, srw_res->diagnostics, + yaz_diag_bib1_to_srw(*ddf->condition), + ddf->u.v2Addinfo); return 0; } @@ -845,29 +890,34 @@ int Yaz_Proxy::send_to_srw_client_ok(int hits, Z_Records *records, int start) } -int Yaz_Proxy::send_srw_explain() +int Yaz_Proxy::send_srw_explain_response(Z_SRW_diagnostic *diagnostics, + int num_diagnostics) { - Z_SRW_PDU *res = yaz_srw_get(odr_encode(), Z_SRW_explain_response); - Z_SRW_explainResponse *er = res->u.explain_response; - Yaz_ProxyConfig *cfg = check_reconfigure(); if (cfg) { int len; - assert (m_proxyTarget); char *b = cfg->get_explain(odr_encode(), 0 /* target */, - 0 /* db */, &len); + m_s2z_database, &len); if (b) { + Z_SRW_PDU *res = yaz_srw_get(odr_encode(), Z_SRW_explain_response); + Z_SRW_explainResponse *er = res->u.explain_response; + er->record.recordData_buf = b; er->record.recordData_len = len; er->record.recordPacking = m_s2z_packing; + er->record.recordSchema = "http://explain.z3950.org/dtd/2.0/"; + + er->diagnostics = diagnostics; + er->num_diagnostics = num_diagnostics; + return send_srw_response(res); } } - return send_srw_response(res); + return send_http_response(404); } -int Yaz_Proxy::send_PDU_convert(Z_APDU *apdu, int *len) +int Yaz_Proxy::send_PDU_convert(Z_APDU *apdu) { if (m_http_version) { @@ -880,7 +930,7 @@ int Yaz_Proxy::send_PDU_convert(Z_APDU *apdu, int *len) } else if (!m_s2z_search_apdu) { - send_srw_explain(); + send_srw_explain_response(0, 0); } else { @@ -896,12 +946,23 @@ int Yaz_Proxy::send_PDU_convert(Z_APDU *apdu, int *len) { send_to_srw_client_ok(0, res->records, 1); } - else if (m_s2z_present_apdu) + else if (m_s2z_present_apdu && m_s2z_hit_count > 0) { + // adjust + Z_PresentRequest *pr = m_s2z_present_apdu->u.presentRequest; + + if (*pr->resultSetStartPoint <= m_s2z_hit_count) + { + if (*pr->numberOfRecordsRequested+ *pr->resultSetStartPoint + > m_s2z_hit_count) + *pr->numberOfRecordsRequested = + 1 + m_s2z_hit_count - *pr->resultSetStartPoint; + } handle_incoming_Z_PDU(m_s2z_present_apdu); } else { + m_s2z_present_apdu = 0; send_to_srw_client_ok(m_s2z_hit_count, res->records, 1); } } @@ -917,10 +978,13 @@ int Yaz_Proxy::send_PDU_convert(Z_APDU *apdu, int *len) } else { + int len = 0; if (m_log_mask & PROXY_LOG_REQ_CLIENT) yaz_log (LOG_LOG, "%sSending %s to client", m_session_str, apdu_name(apdu)); - int r = send_Z_PDU(apdu, len); + int r = send_Z_PDU(apdu, &len); + m_bytes_sent += len; + m_bw_stat.add_bytes(len); logtime(); return r; } @@ -929,8 +993,12 @@ int Yaz_Proxy::send_PDU_convert(Z_APDU *apdu, int *len) int Yaz_Proxy::send_to_client(Z_APDU *apdu) { - int len = 0; int kill_session = 0; + Z_ReferenceId **new_id = get_referenceIdP(apdu); + + if (new_id) + *new_id = m_referenceId; + if (apdu->which == Z_APDU_searchResponse) { Z_SearchResponse *sr = apdu->u.searchResponse; @@ -950,7 +1018,9 @@ int Yaz_Proxy::send_to_client(Z_APDU *apdu) { if (m_marcxml_flag) convert_to_marcxml(p->u.databaseOrSurDiagnostics); - convert_xsl(p->u.databaseOrSurDiagnostics); + if (convert_xsl(p->u.databaseOrSurDiagnostics, apdu)) + return 0; + } if (sr->resultCount) { @@ -986,32 +1056,62 @@ int Yaz_Proxy::send_to_client(Z_APDU *apdu) { if (m_marcxml_flag) convert_to_marcxml(p->u.databaseOrSurDiagnostics); - convert_xsl(p->u.databaseOrSurDiagnostics); + if (convert_xsl(p->u.databaseOrSurDiagnostics, apdu)) + return 0; + } + } + else if (apdu->which == Z_APDU_initResponse) + { + if (m_initRequest_options) + { + Z_Options *nopt = + (Odr_bitmask *)odr_malloc(odr_encode(), + sizeof(Odr_bitmask)); + ODR_MASK_ZERO(nopt); + + int i; + for (i = 0; i<24; i++) + if (ODR_MASK_GET(m_initRequest_options, i) && + ODR_MASK_GET(apdu->u.initResponse->options, i)) + ODR_MASK_SET(nopt, i); + apdu->u.initResponse->options = nopt; + } + if (m_initRequest_version) + { + Z_ProtocolVersion *nopt = + (Odr_bitmask *)odr_malloc(odr_encode(), + sizeof(Odr_bitmask)); + ODR_MASK_ZERO(nopt); + + int i; + for (i = 0; i<8; i++) + if (ODR_MASK_GET(m_initRequest_version, i) && + ODR_MASK_GET(apdu->u.initResponse->protocolVersion, i)) + ODR_MASK_SET(nopt, i); + apdu->u.initResponse->protocolVersion = nopt; } + apdu->u.initResponse->preferredMessageSize = + odr_intdup(odr_encode(), + m_client->m_initResponse_preferredMessageSize > + m_initRequest_preferredMessageSize ? + m_initRequest_preferredMessageSize : + m_client->m_initResponse_preferredMessageSize); + apdu->u.initResponse->maximumRecordSize = + odr_intdup(odr_encode(), + m_client->m_initResponse_maximumRecordSize > + m_initRequest_maximumRecordSize ? + m_initRequest_maximumRecordSize : + m_client->m_initResponse_maximumRecordSize); } - int r = send_PDU_convert(apdu, &len); + int r = send_PDU_convert(apdu); if (r) return r; - m_bytes_sent += len; - m_bw_stat.add_bytes(len); if (kill_session) { delete m_client; m_client = 0; m_parent->pre_init(); } - if (m_http_version) - { - if (!m_http_keepalive) - { -#if 1 - timeout(1); -#else - shutdown(); - return -1; -#endif - } - } return r; } @@ -1270,8 +1370,8 @@ void Yaz_Proxy::recv_GDU(Z_GDU *apdu, int len) m_bytes_recv += len; - if (m_log_mask & PROXY_LOG_APDU_CLIENT) - yaz_log (LOG_DEBUG, "%sReceiving %s from client %d bytes", + if (m_log_mask & PROXY_LOG_REQ_CLIENT) + yaz_log (LOG_LOG, "%sReceiving %s from client %d bytes", m_session_str, gdu_name(apdu), len); if (m_bw_hold_PDU) // double incoming PDU. shutdown now. @@ -1444,12 +1544,27 @@ Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu) rc_temp.u.simple = sr->smallSetElementSetNames; rc = &rc_temp; } - + + char *stylesheet_name = 0; if (cfg) err = cfg->check_syntax(odr_encode(), m_default_target, sr->preferredRecordSyntax, rc, - &addinfo, &m_stylesheet_schema, &m_schema); + &addinfo, &stylesheet_name, &m_schema); + if (stylesheet_name) + { + m_parent->low_socket_close(); + + if (m_stylesheet_xsp) + xsltFreeStylesheet(m_stylesheet_xsp); + + m_stylesheet_xsp = xsltParseStylesheetFile((const xmlChar*) + stylesheet_name); + m_stylesheet_offset = 0; + xfree(stylesheet_name); + + m_parent->low_socket_open(); + } if (err == -1) { sr->preferredRecordSyntax = @@ -1477,11 +1592,26 @@ Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu) char *addinfo = 0; Yaz_ProxyConfig *cfg = check_reconfigure(); + char *stylesheet_name = 0; if (cfg) err = cfg->check_syntax(odr_encode(), m_default_target, pr->preferredRecordSyntax, pr->recordComposition, - &addinfo, &m_stylesheet_schema, &m_schema); + &addinfo, &stylesheet_name, &m_schema); + if (stylesheet_name) + { + m_parent->low_socket_close(); + + if (m_stylesheet_xsp) + xsltFreeStylesheet(m_stylesheet_xsp); + + m_stylesheet_xsp = xsltParseStylesheetFile((const xmlChar*) + stylesheet_name); + m_stylesheet_offset = 0; + xfree(stylesheet_name); + + m_parent->low_socket_open(); + } if (err == -1) { pr->preferredRecordSyntax = @@ -1519,7 +1649,6 @@ Z_ElementSetNames *Yaz_Proxy::mk_esn_from_schema(ODR o, const char *schema) void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq) { - if (m_s2z_odr_init) { odr_destroy(m_s2z_odr_init); @@ -1555,10 +1684,12 @@ void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq) Z_SRW_PDU *srw_pdu = 0; Z_SOAP *soap_package = 0; char *charset = 0; + Z_SRW_diagnostic *diagnostic = 0; + int num_diagnostic = 0; if (yaz_srw_decode(hreq, &srw_pdu, &soap_package, odr_decode(), &charset) == 0 || yaz_sru_decode(hreq, &srw_pdu, &soap_package, odr_decode(), - &charset) == 0) + &charset, &diagnostic, &num_diagnostic) == 0) { m_s2z_odr_init = odr_createmem(ODR_ENCODE); m_s2z_odr_search = odr_createmem(ODR_ENCODE); @@ -1573,13 +1704,28 @@ void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq) { Z_SRW_searchRetrieveRequest *srw_req = srw_pdu->u.request; + m_s2z_database = odr_strdup(m_s2z_odr_init, srw_req->database); // recordXPath unsupported. if (srw_req->recordXPath) { - send_to_srw_client_error(72, 0); - return; + yaz_add_srw_diagnostic(odr_decode(), + &diagnostic, &num_diagnostic, + 72, 0); } - + // must have a query + if (!srw_req->query.cql) + { + yaz_add_srw_diagnostic(odr_decode(), + &diagnostic, &num_diagnostic, + 7, "query"); + } + // sort unsupported + if (srw_req->sort_type != Z_SRW_sort_type_none) + { + yaz_add_srw_diagnostic(odr_decode(), + &diagnostic, &num_diagnostic, + 80, 0); + } // save stylesheet if (srw_req->stylesheet) m_s2z_stylesheet = @@ -1592,6 +1738,19 @@ void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq) else m_s2z_packing = Z_SRW_recordPacking_string; + if (num_diagnostic) + { + Z_SRW_PDU *srw_pdu = + yaz_srw_get(odr_encode(), + Z_SRW_searchRetrieve_response); + Z_SRW_searchRetrieveResponse *srw_res = srw_pdu->u.response; + + srw_res->diagnostics = diagnostic; + srw_res->num_diagnostics = num_diagnostic; + send_srw_response(srw_pdu); + return; + } + // prepare search PDU m_s2z_search_apdu = zget_APDU(m_s2z_odr_search, Z_APDU_searchRequest); @@ -1611,11 +1770,6 @@ void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq) if (srw_req->query_type == Z_SRW_query_type_cql) { - if (!srw_req->query.cql) - { - send_to_srw_client_error(7, "query"); - return; - } Z_External *ext = (Z_External *) odr_malloc(m_s2z_odr_search, sizeof(*ext)); ext->direct_reference = @@ -1699,12 +1853,12 @@ void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq) z_presentRequest->preferredRecordSyntax = yaz_oidval_to_z3950oid(m_s2z_odr_search, CLASS_RECSYN, VAL_TEXT_XML); - z_presentRequest->recordComposition = - (Z_RecordComposition *) - odr_malloc(m_s2z_odr_search, - sizeof(Z_RecordComposition)); if (srw_req->recordSchema) { + z_presentRequest->recordComposition = + (Z_RecordComposition *) + odr_malloc(m_s2z_odr_search, + sizeof(Z_RecordComposition)); z_presentRequest->recordComposition->which = Z_RecordComp_simple; z_presentRequest->recordComposition->u.simple = @@ -1734,6 +1888,8 @@ void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq) { Z_SRW_explainRequest *srw_req = srw_pdu->u.explain_request; + m_s2z_database = odr_strdup(m_s2z_odr_init, srw_req->database); + // save stylesheet if (srw_req->stylesheet) m_s2z_stylesheet = @@ -1745,6 +1901,12 @@ void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq) else m_s2z_packing = Z_SRW_recordPacking_string; + if (num_diagnostic) + { + send_srw_explain_response(diagnostic, num_diagnostic); + return; + } + if (!m_client) { m_s2z_init_apdu = zget_APDU(m_s2z_odr_init, @@ -1756,29 +1918,63 @@ void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq) handle_incoming_Z_PDU(m_s2z_init_apdu); } else - send_srw_explain(); + send_srw_explain_response(0, 0); return; } + else if (srw_pdu->which == Z_SRW_scan_request) + { + m_s2z_database = odr_strdup(m_s2z_odr_init, + srw_pdu->u.scan_request->database); + + yaz_add_srw_diagnostic(odr_decode(), + &diagnostic, &num_diagnostic, + 4, "scan"); + Z_SRW_PDU *srw_pdu = + yaz_srw_get(odr_encode(), + Z_SRW_scan_response); + Z_SRW_scanResponse *srw_res = srw_pdu->u.scan_response; + + srw_res->diagnostics = diagnostic; + srw_res->num_diagnostics = num_diagnostic; + send_srw_response(srw_pdu); + return; + } else { + m_s2z_database = 0; + send_to_srw_client_error(4, 0); } } int len = 0; Z_GDU *p = z_get_HTTP_Response(odr_encode(), 400); + timeout(0); send_GDU(p, &len); - timeout(1); } void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu) { + Z_ReferenceId **refid = get_referenceIdP(apdu); + nmem_reset(m_referenceId_mem); + if (refid && *refid) + { + m_referenceId = (Z_ReferenceId *) + nmem_malloc(m_referenceId_mem, sizeof(*m_referenceId)); + m_referenceId->len = m_referenceId->size = (*refid)->len; + m_referenceId->buf = (unsigned char *) + nmem_malloc(m_referenceId_mem, (*refid)->len); + memcpy(m_referenceId->buf, (*refid)->buf, (*refid)->len); + } + else + m_referenceId = 0; + if (!m_client && m_invalid_session) { m_apdu_invalid_session = apdu; m_mem_invalid_session = odr_extract_mem(odr_decode()); apdu = m_initRequest_apdu; } - + // Determine our client. Z_OtherInformation **oi; get_otherInfoAPDU(apdu, &oi); @@ -1807,20 +2003,59 @@ void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu) nmem_destroy(m_initRequest_mem); m_initRequest_apdu = apdu; m_initRequest_mem = odr_extract_mem(odr_decode()); + + m_initRequest_preferredMessageSize = *apdu->u.initRequest-> + preferredMessageSize; + *apdu->u.initRequest->preferredMessageSize = 1024*1024; + m_initRequest_maximumRecordSize = *apdu->u.initRequest-> + maximumRecordSize; + *apdu->u.initRequest->maximumRecordSize = 1024*1024; + + // save init options for the response.. + m_initRequest_options = apdu->u.initRequest->options; + + apdu->u.initRequest->options = + (Odr_bitmask *)nmem_malloc(m_initRequest_mem, + sizeof(Odr_bitmask)); + ODR_MASK_ZERO(apdu->u.initRequest->options); + int i; + for (i = 0; i<= 24; i++) + ODR_MASK_SET(apdu->u.initRequest->options, i); + ODR_MASK_CLEAR(apdu->u.initRequest->options, + Z_Options_negotiationModel); + ODR_MASK_CLEAR(apdu->u.initRequest->options, + Z_Options_concurrentOperations); + + // make new version + m_initRequest_version = apdu->u.initRequest->protocolVersion; + apdu->u.initRequest->protocolVersion = + (Odr_bitmask *)nmem_malloc(m_initRequest_mem, + sizeof(Odr_bitmask)); + ODR_MASK_ZERO(apdu->u.initRequest->protocolVersion); + + for (i = 0; i<= 8; i++) + ODR_MASK_SET(apdu->u.initRequest->protocolVersion, i); } if (m_client->m_init_flag) { if (handle_init_response_for_invalid_session(apdu)) return; - Z_APDU *apdu2 = m_client->m_initResponse; - apdu2->u.initResponse->otherInfo = 0; - if (m_client->m_cookie && *m_client->m_cookie) - set_otherInformationString(apdu2, VAL_COOKIE, 1, - m_client->m_cookie); - apdu2->u.initResponse->referenceId = - apdu->u.initRequest->referenceId; - send_to_client(apdu2); - return; + if (m_client->m_initResponse) + { + Z_APDU *apdu2 = m_client->m_initResponse; + apdu2->u.initResponse->otherInfo = 0; + if (m_client->m_cookie && *m_client->m_cookie) + set_otherInformationString(apdu2, VAL_COOKIE, 1, + m_client->m_cookie); + apdu2->u.initResponse->referenceId = + apdu->u.initRequest->referenceId; + apdu2->u.initResponse->options = m_client->m_initResponse_options; + apdu2->u.initResponse->protocolVersion = + m_client->m_initResponse_version; + + send_to_client(apdu2); + return; + } } m_client->m_init_flag = 1; } @@ -1984,19 +2219,16 @@ void Yaz_ProxyClient::pre_init_client() Z_APDU *apdu = create_Z_PDU(Z_APDU_initRequest); Z_InitRequest *req = apdu->u.initRequest; - ODR_MASK_SET(req->options, Z_Options_search); - ODR_MASK_SET(req->options, Z_Options_present); - ODR_MASK_SET(req->options, Z_Options_namedResultSets); - ODR_MASK_SET(req->options, Z_Options_triggerResourceCtrl); - ODR_MASK_SET(req->options, Z_Options_scan); - ODR_MASK_SET(req->options, Z_Options_sort); - ODR_MASK_SET(req->options, Z_Options_extendedServices); - ODR_MASK_SET(req->options, Z_Options_delSet); - - ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_1); - ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2); - ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_3); - + int i; + for (i = 0; i<= 24; i++) + ODR_MASK_SET(req->options, i); + ODR_MASK_CLEAR(apdu->u.initRequest->options, + Z_Options_negotiationModel); + ODR_MASK_CLEAR(apdu->u.initRequest->options, + Z_Options_concurrentOperations); + for (i = 0; i<= 10; i++) + ODR_MASK_SET(req->protocolVersion, i); + if (send_to_target(apdu) < 0) { delete this; @@ -2045,6 +2277,7 @@ void Yaz_Proxy::pre_init() { Yaz_ProxyClient *c; int spare = 0; + int spare_waiting = 0; int in_use = 0; int other = 0; for (c = m_clientPool; c; c = c->m_next) @@ -2054,7 +2287,10 @@ void Yaz_Proxy::pre_init() if (c->m_cookie == 0) { if (c->m_server == 0) - spare++; + if (c->m_waiting) + spare_waiting++; + else + spare++; else in_use++; } @@ -2063,9 +2299,10 @@ void Yaz_Proxy::pre_init() } } yaz_log(LOG_LOG, "%spre-init %s %s use=%d other=%d spare=%d " - "preinit=%d",m_session_str, - name, zurl_in_use[j], in_use, other, spare, pre_init); - if (spare < pre_init) + "sparew=%d preinit=%d",m_session_str, + name, zurl_in_use[j], in_use, other, + spare, spare_waiting, pre_init); + if (spare + spare_waiting < pre_init) { c = new Yaz_ProxyClient(m_PDU_Observable->clone(), this); c->m_next = m_clientPool; @@ -2110,6 +2347,8 @@ void Yaz_Proxy::timeoutNotify() else if (apdu->which == Z_GDU_HTTP_Request) handle_incoming_HTTP(apdu->u.HTTP_Request); } + else if (m_stylesheet_nprl) + convert_xsl_delay(); else { inc_request_no(); @@ -2125,6 +2364,12 @@ void Yaz_Proxy::timeoutNotify() } } +void Yaz_Proxy::markInvalid() +{ + m_client = 0; + m_invalid_session = 1; +} + void Yaz_ProxyClient::timeoutNotify() { if (m_server) @@ -2134,6 +2379,14 @@ void Yaz_ProxyClient::timeoutNotify() get_hostname()); m_waiting = 1; m_root->pre_init(); + if (m_server && m_init_flag) + { + // target timed out in a session that was properly initialized + // server object stay alive but we mark it as invalid so it + // gets initialized again + m_server->markInvalid(); + m_server = 0; + } shutdown(); } @@ -2153,6 +2406,10 @@ Yaz_ProxyClient::Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable, m_waiting = 0; m_init_odr = odr_createmem (ODR_DECODE); m_initResponse = 0; + m_initResponse_options = 0; + m_initResponse_version = 0; + m_initResponse_preferredMessageSize = 0; + m_initResponse_maximumRecordSize = 0; m_resultSetStartPoint = 0; m_bytes_sent = m_bytes_recv = 0; m_pdu_recv = 0; @@ -2204,6 +2461,7 @@ int Yaz_Proxy::handle_init_response_for_invalid_session(Z_APDU *apdu) void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu, int len) { m_bytes_recv += len; + m_pdu_recv++; m_waiting = 0; if (m_root->get_log_mask() & PROXY_LOG_REQ_SERVER) @@ -2217,6 +2475,12 @@ void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu, int len) odr_reset (m_init_odr); nmem_transfer (m_init_odr->mem, nmem); m_initResponse = apdu; + m_initResponse_options = apdu->u.initResponse->options; + m_initResponse_version = apdu->u.initResponse->protocolVersion; + m_initResponse_preferredMessageSize = + *apdu->u.initResponse->preferredMessageSize; + m_initResponse_maximumRecordSize = + *apdu->u.initResponse->maximumRecordSize; Z_InitResponse *ir = apdu->u.initResponse; char *im0 = ir->implementationName; @@ -2290,6 +2554,21 @@ void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu, int len) } } +void Yaz_Proxy::low_socket_close() +{ + int i; + for (i = 0; i= 0) + ::close(m_lo_fd[i]); +} + +void Yaz_Proxy::low_socket_open() +{ + int i; + for (i = 0; i