X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-proxy.cpp;h=97ec2de71592f07ae649c8f71620ccf90df18499;hp=996f258f6d225446942a8308f10be7c8fba48c20;hb=d84b43231c7c5b0786e9aa62d0f7ca7ecd83bdb5;hpb=92c0519af66131a46fbb398ce037009be2e8d0c5 diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp index 996f258..97ec2de 100644 --- a/src/yaz-proxy.cpp +++ b/src/yaz-proxy.cpp @@ -1,18 +1,25 @@ /* - * Copyright (c) 1998-2003, Index Data. + * Copyright (c) 1998-2004, Index Data. * See the file LICENSE for details. * - * $Id: yaz-proxy.cpp,v 1.63 2003-10-20 18:31:44 adam Exp $ + * $Id: yaz-proxy.cpp,v 1.91 2004-01-15 23:44:58 adam Exp $ */ #include #include +#include #include #include #include #include #include +#include + +#if HAVE_XSLT +#include +#include +#endif static const char *apdu_name(Z_APDU *apdu) { @@ -52,6 +59,20 @@ static const char *apdu_name(Z_APDU *apdu) return "other"; } +static const char *gdu_name(Z_GDU *gdu) +{ + switch(gdu->which) + { + case Z_GDU_Z3950: + return apdu_name(gdu->u.z3950); + case Z_GDU_HTTP_Request: + return "HTTP Request"; + case Z_GDU_HTTP_Response: + return "HTTP Response"; + } + return "Unknown request/response"; +} + Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable, Yaz_Proxy *parent) : Yaz_Z_Assoc(the_PDU_Observable), m_bw_stat(60), m_pdu_stat(60) @@ -72,7 +93,7 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable, m_client_idletime = 600; m_target_idletime = 600; m_optimize = xstrdup ("1"); - strcpy(m_session_str, "0"); + strcpy(m_session_str, "0 "); m_session_no=0; m_bytes_sent = m_bytes_recv = 0; m_bw_hold_PDU = 0; @@ -85,16 +106,45 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable, m_invalid_session = 0; m_config = 0; m_marcxml_flag = 0; + m_stylesheet_schema = 0; + m_s2z_stylesheet = 0; + m_s2z_database = 0; + m_schema = 0; + m_initRequest_apdu = 0; + m_initRequest_mem = 0; + m_initRequest_options = 0; + m_initRequest_version = 0; + m_apdu_invalid_session = 0; + m_mem_invalid_session = 0; + m_s2z_odr_init = 0; + m_s2z_odr_search = 0; + m_s2z_init_apdu = 0; + m_s2z_search_apdu = 0; + m_s2z_present_apdu = 0; + m_http_keepalive = 0; + m_http_version = 0; + m_soap_ns = 0; + m_s2z_packing = Z_SRW_recordPacking_string; + m_time_tv.tv_sec = 0; + m_time_tv.tv_usec = 0; } Yaz_Proxy::~Yaz_Proxy() { yaz_log(LOG_LOG, "%sClosed %d/%d sent/recv bytes total", m_session_str, m_bytes_sent, m_bytes_recv); + nmem_destroy(m_initRequest_mem); + nmem_destroy(m_mem_invalid_session); xfree (m_proxyTarget); xfree (m_default_target); xfree (m_proxy_authentication); xfree (m_optimize); + xfree (m_stylesheet_schema); + 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); delete m_config; } @@ -241,24 +291,20 @@ const char *Yaz_Proxy::load_balance(const char **url) return ret; } -Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) +Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, + const char *proxy_host) { assert (m_parent); Yaz_Proxy *parent = m_parent; - Z_OtherInformation **oi; Yaz_ProxyClient *c = m_client; - get_otherInfoAPDU(apdu, &oi); - char *cookie = get_cookie(oi); - if (!m_proxyTarget) { const char *url[MAX_ZURL_PLEX]; - const char *proxy_host = get_proxy(oi); Yaz_ProxyConfig *cfg = check_reconfigure(); if (proxy_host) { -#if 0 +#if 1 /* only to be enabled for debugging... */ if (!strcmp(proxy_host, "stop")) exit(0); @@ -268,6 +314,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) proxy_host = m_default_target; } int client_idletime = -1; + const char *cql2rpn_fname = 0; url[0] = m_default_target; url[1] = 0; if (cfg) @@ -279,13 +326,16 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) &parent->m_max_clients, &m_keepalive_limit_bw, &m_keepalive_limit_pdu, - &pre_init); + &pre_init, + &cql2rpn_fname); } if (client_idletime != -1) { m_client_idletime = client_idletime; timeout(m_client_idletime); } + if (cql2rpn_fname) + m_cql2rpn.set_pqf_file(cql2rpn_fname); if (!url[0]) { yaz_log(LOG_LOG, "%sNo default target", m_session_str); @@ -355,9 +405,8 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) !strcmp(m_proxyTarget, c->get_hostname())) { // found it in cache - yaz_log (LOG_LOG, "%sREUSE %d %d %s", - m_session_str, - c->m_seqno, parent->m_seqno, c->get_hostname()); + yaz_log (LOG_LOG, "%sREUSE %s", + m_session_str, c->get_hostname()); c->m_seqno = parent->m_seqno; assert(c->m_server == 0); @@ -380,7 +429,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) { 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; @@ -399,7 +448,6 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) 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; @@ -535,6 +583,45 @@ void Yaz_Proxy::display_diagrecs(Z_DiagRec **pp, int num) } } +void Yaz_Proxy::convert_xsl(Z_NamePlusRecordList *p) +{ + if (!m_stylesheet_schema) + return; + xsltStylesheetPtr xsp; + + xsp = xsltParseStylesheetFile((const xmlChar *) m_stylesheet_schema); + + int i; + for (i = 0; i < p->num_records; i++) + { + Z_NamePlusRecord *npr = p->records[i]; + if (npr->which == Z_NamePlusRecord_databaseRecord) + { + Z_External *r = npr->u.databaseRecord; + if (r->which == Z_External_octet) + { + 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; + xmlDocDumpFormatMemory (res, &out_buf, &out_len, 1); + + p->records[i]->u.databaseRecord = + z_ext_record(odr_encode(), VAL_TEXT_XML, + (char*) out_buf, out_len); + xmlFree(out_buf); + xmlFreeDoc(doc); + xmlFreeDoc(res); + } + } + } + xsltFreeStylesheet(xsp); +} + void Yaz_Proxy::convert_to_marcxml(Z_NamePlusRecordList *p) { int i; @@ -596,9 +683,272 @@ void Yaz_Proxy::convert_to_marcxml(Z_NamePlusRecordList *p) yaz_marc_destroy(mt); } +void Yaz_Proxy::logtime() +{ + if (m_time_tv.tv_sec) + { + struct timeval tv; + gettimeofday(&tv, 0); + long diff = (tv.tv_sec - m_time_tv.tv_sec)*1000000 + + (tv.tv_usec - m_time_tv.tv_usec); + if (diff >= 0) + yaz_log(LOG_LOG, "%sElapsed %ld.%03ld", m_session_str, + diff/1000000, (diff/1000)%1000); + } + m_time_tv.tv_sec = 0; + m_time_tv.tv_usec = 0; +} + +int Yaz_Proxy::send_http_response(int code) +{ + ODR o = odr_encode(); + Z_GDU *gdu = z_get_HTTP_Response(o, 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_log_mask & PROXY_LOG_REQ_CLIENT) + { + yaz_log (LOG_LOG, "%sSending %s to client", m_session_str, + gdu_name(gdu)); + } + int len; + int r = send_GDU(gdu, &len); + logtime(); + return r; +} + +int Yaz_Proxy::send_srw_response(Z_SRW_PDU *srw_pdu) +{ + ODR o = odr_encode(); + const char *ctype = "text/xml"; + Z_GDU *gdu = z_get_HTTP_Response(o, 200); + Z_HTTP_Response *hres = gdu->u.HTTP_Response; + if (m_http_version) + hres->version = odr_strdup(o, m_http_version); + z_HTTP_header_add(o, &hres->headers, "Content-Type", ctype); + if (m_http_keepalive) + z_HTTP_header_add(o, &hres->headers, "Connection", "Keep-Alive"); + + static Z_SOAP_Handler soap_handlers[2] = { +#if HAVE_XSLT + {"http://www.loc.gov/zing/srw/", 0, + (Z_SOAP_fun) yaz_srw_codec}, +#endif + {0, 0, 0} + }; + + Z_SOAP *soap_package = (Z_SOAP*) odr_malloc(o, sizeof(Z_SOAP)); + soap_package->which = Z_SOAP_generic; + soap_package->u.generic = + (Z_SOAP_Generic *) odr_malloc(o, sizeof(*soap_package->u.generic)); + soap_package->u.generic->no = 0; + soap_package->u.generic->ns = soap_handlers[0].ns; + soap_package->u.generic->p = (void *) srw_pdu; + soap_package->ns = m_soap_ns; + z_soap_codec_enc_xsl(o, &soap_package, + &hres->content_buf, &hres->content_len, + soap_handlers, 0, m_s2z_stylesheet); + if (m_log_mask & PROXY_LOG_REQ_CLIENT) + { + yaz_log (LOG_LOG, "%sSending %s to client", m_session_str, + gdu_name(gdu)); + } + int len; + int r = send_GDU(gdu, &len); + logtime(); + return r; +} + +int Yaz_Proxy::send_to_srw_client_error(int srw_error, const char *add) +{ + ODR o = odr_encode(); + Z_SRW_PDU *srw_pdu = yaz_srw_get(o, Z_SRW_searchRetrieve_response); + Z_SRW_searchRetrieveResponse *srw_res = srw_pdu->u.response; + + 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; + return send_srw_response(srw_pdu); +} + +int Yaz_Proxy::z_to_srw_diag(ODR o, Z_SRW_searchRetrieveResponse *srw_res, + Z_DefaultDiagFormat *ddf) +{ + int bib1_code = *ddf->condition; + if (bib1_code == 109) + return 404; + 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; + return 0; +} + +int Yaz_Proxy::send_to_srw_client_ok(int hits, Z_Records *records, int start) +{ + ODR o = odr_encode(); + Z_SRW_PDU *srw_pdu = yaz_srw_get(o, Z_SRW_searchRetrieve_response); + Z_SRW_searchRetrieveResponse *srw_res = srw_pdu->u.response; + + srw_res->numberOfRecords = odr_intdup (o, hits); + if (records && records->which == Z_Records_DBOSD) + { + srw_res->num_records = + records->u.databaseOrSurDiagnostics->num_records; + int i; + srw_res->records = (Z_SRW_record *) + odr_malloc(o, srw_res->num_records * sizeof(Z_SRW_record)); + for (i = 0; i < srw_res->num_records; i++) + { + Z_NamePlusRecord *npr = records->u.databaseOrSurDiagnostics->records[i]; + if (npr->which != Z_NamePlusRecord_databaseRecord) + { + srw_res->records[i].recordSchema = "diagnostic"; + srw_res->records[i].recordPacking = m_s2z_packing; + srw_res->records[i].recordData_buf = "67"; + srw_res->records[i].recordData_len = 2; + srw_res->records[i].recordPosition = odr_intdup(o, i+start); + continue; + } + Z_External *r = npr->u.databaseRecord; + oident *ent = oid_getentbyoid(r->direct_reference); + if (r->which == Z_External_octet && ent->value == VAL_TEXT_XML) + { + srw_res->records[i].recordSchema = m_schema; + srw_res->records[i].recordPacking = m_s2z_packing; + srw_res->records[i].recordData_buf = (char*) + r->u.octet_aligned->buf; + srw_res->records[i].recordData_len = r->u.octet_aligned->len; + srw_res->records[i].recordPosition = odr_intdup(o, i+start); + } + else + { + srw_res->records[i].recordSchema = "diagnostic"; + srw_res->records[i].recordPacking = m_s2z_packing; + srw_res->records[i].recordData_buf = "67"; + srw_res->records[i].recordData_len = 2; + srw_res->records[i].recordPosition = odr_intdup(o, i+start); + } + } + } + if (records && records->which == Z_Records_NSD) + { + int http_code; + http_code = z_to_srw_diag(odr_encode(), srw_res, + records->u.nonSurrogateDiagnostic); + if (http_code) + return send_http_response(http_code); + } + return send_srw_response(srw_pdu); + +} + +int Yaz_Proxy::send_srw_explain_response(Z_SRW_diagnostic *diagnostics, + int num_diagnostics) +{ + Yaz_ProxyConfig *cfg = check_reconfigure(); + if (cfg) + { + int len; + char *b = cfg->get_explain(odr_encode(), 0 /* target */, + 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->diagnostics = diagnostics; + er->num_diagnostics = num_diagnostics; + return send_srw_response(res); + } + } + return send_http_response(404); +} + +int Yaz_Proxy::send_PDU_convert(Z_APDU *apdu, int *len) +{ + if (m_http_version) + { + if (apdu->which == Z_APDU_initResponse) + { + Z_InitResponse *res = apdu->u.initResponse; + if (*res->result == 0) + { + send_to_srw_client_error(3, 0); + } + else if (!m_s2z_search_apdu) + { + send_srw_explain_response(0, 0); + } + else + { + handle_incoming_Z_PDU(m_s2z_search_apdu); + } + } + else if (m_s2z_search_apdu && apdu->which == Z_APDU_searchResponse) + { + m_s2z_search_apdu = 0; + Z_SearchResponse *res = apdu->u.searchResponse; + m_s2z_hit_count = *res->resultCount; + if (res->records && res->records->which == Z_Records_NSD) + { + send_to_srw_client_ok(0, res->records, 1); + } + 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); + } + } + else if (m_s2z_present_apdu && apdu->which == Z_APDU_presentResponse) + { + int start = + *m_s2z_present_apdu->u.presentRequest->resultSetStartPoint; + + m_s2z_present_apdu = 0; + Z_PresentResponse *res = apdu->u.presentResponse; + send_to_srw_client_ok(m_s2z_hit_count, res->records, start); + } + } + else + { + 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); + logtime(); + return r; + } + return 0; +} + int Yaz_Proxy::send_to_client(Z_APDU *apdu) { int len = 0; + int kill_session = 0; if (apdu->which == Z_APDU_searchResponse) { Z_SearchResponse *sr = apdu->u.searchResponse; @@ -609,18 +959,31 @@ int Yaz_Proxy::send_to_client(Z_APDU *apdu) dr.which = Z_DiagRec_defaultFormat; dr.u.defaultFormat = p->u.nonSurrogateDiagnostic; + *sr->searchStatus = 0; display_diagrecs(&dr_p, 1); } else { - if (m_marcxml_flag && p && p->which == Z_Records_DBOSD) - convert_to_marcxml(p->u.databaseOrSurDiagnostics); + if (p && p->which == Z_Records_DBOSD) + { + if (m_marcxml_flag) + convert_to_marcxml(p->u.databaseOrSurDiagnostics); + convert_xsl(p->u.databaseOrSurDiagnostics); + } if (sr->resultCount) { yaz_log(LOG_LOG, "%s%d hits", m_session_str, *sr->resultCount); if (*sr->resultCount < 0) + { m_invalid_session = 1; + kill_session = 1; + + *sr->searchStatus = 0; + sr->records = + create_nonSurrogateDiagnostics(odr_encode(), 2, 0); + *sr->resultCount = 0; + } } } } @@ -633,29 +996,83 @@ int Yaz_Proxy::send_to_client(Z_APDU *apdu) Z_DiagRec dr, *dr_p = &dr; dr.which = Z_DiagRec_defaultFormat; dr.u.defaultFormat = p->u.nonSurrogateDiagnostic; - + if (*sr->presentStatus == Z_PresentStatus_success) + *sr->presentStatus = Z_PresentStatus_failure; display_diagrecs(&dr_p, 1); } - if (m_marcxml_flag && p && p->which == Z_Records_DBOSD) - convert_to_marcxml(p->u.databaseOrSurDiagnostics); + if (p && p->which == Z_Records_DBOSD) + { + if (m_marcxml_flag) + convert_to_marcxml(p->u.databaseOrSurDiagnostics); + convert_xsl(p->u.databaseOrSurDiagnostics); + } } - int r = send_Z_PDU(apdu, &len); - if (m_log_mask & PROXY_LOG_APDU_CLIENT) - yaz_log (LOG_DEBUG, "%sSending %s to client %d bytes", m_session_str, - apdu_name(apdu), len); + 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; + } + } + int r = send_PDU_convert(apdu, &len); + 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; } int Yaz_ProxyClient::send_to_target(Z_APDU *apdu) { int len = 0; + const char *apdu_name_tmp = apdu_name(apdu); int r = send_Z_PDU(apdu, &len); if (m_root->get_log_mask() & PROXY_LOG_REQ_SERVER) yaz_log (LOG_LOG, "%sSending %s to %s %d bytes", get_session_str(), - apdu_name(apdu), get_hostname(), len); + apdu_name_tmp, get_hostname(), len); m_bytes_sent += len; return r; } @@ -665,7 +1082,6 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) if (apdu->which == Z_APDU_presentRequest) { Z_PresentRequest *pr = apdu->u.presentRequest; - Z_NamePlusRecordList *npr; int toget = *pr->numberOfRecordsRequested; int start = *pr->resultSetStartPoint; @@ -694,6 +1110,7 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) send_to_client(new_apdu); return 0; } + Z_NamePlusRecordList *npr; if (m_client->m_cache.lookup (odr_encode(), &npr, start, toget, pr->preferredRecordSyntax, pr->recordComposition)) @@ -888,19 +1305,23 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) } -void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu, int len) +void Yaz_Proxy::inc_request_no() { char *cp = strchr(m_session_str, ' '); m_request_no++; if (cp) sprintf(cp+1, "%d ", m_request_no); +} + +void Yaz_Proxy::recv_GDU(Z_GDU *apdu, int len) +{ + inc_request_no(); - int reduce = 0; m_bytes_recv += len; if (m_log_mask & PROXY_LOG_APDU_CLIENT) yaz_log (LOG_DEBUG, "%sReceiving %s from client %d bytes", - m_session_str, apdu_name(apdu), len); + m_session_str, gdu_name(apdu), len); if (m_bw_hold_PDU) // double incoming PDU. shutdown now. shutdown(); @@ -908,11 +1329,12 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu, int len) m_bw_stat.add_bytes(len); m_pdu_stat.add_bytes(1); + gettimeofday(&m_time_tv, 0); + int bw_total = m_bw_stat.get_total(); int pdu_total = m_pdu_stat.get_total(); - yaz_log(LOG_LOG, "%sstat bw=%d pdu=%d limit-bw=%d limit-pdu=%d", - m_session_str, bw_total, pdu_total, m_bw_max, m_pdu_max); + int reduce = 0; if (m_bw_max) { if (bw_total > m_bw_max) @@ -924,18 +1346,23 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu, int len) { if (pdu_total > m_pdu_max) { - int nreduce = (60/m_pdu_max); + int nreduce = (m_pdu_max >= 60) ? 1 : 60/m_pdu_max; reduce = (reduce > nreduce) ? reduce : nreduce; } } if (reduce) { - yaz_log(LOG_LOG, "%sLimit delay=%d", m_session_str, reduce); + yaz_log(LOG_LOG, "%sdelay=%d bw=%d pdu=%d limit-bw=%d limit-pdu=%d", + m_session_str, reduce, bw_total, pdu_total, + m_bw_max, m_pdu_max); + m_bw_hold_PDU = apdu; // save PDU and signal "on hold" timeout(reduce); // call us reduce seconds later } - else - recv_Z_PDU_0(apdu); // all fine. Proceed receive PDU as usual + else if (apdu->which == Z_GDU_Z3950) + handle_incoming_Z_PDU(apdu->u.z3950); + else if (apdu->which == Z_GDU_HTTP_Request) + handle_incoming_HTTP(apdu->u.HTTP_Request); } void Yaz_Proxy::handle_max_record_retrieve(Z_APDU *apdu) @@ -975,6 +1402,51 @@ Z_Records *Yaz_Proxy::create_nonSurrogateDiagnostics(ODR odr, return rec; } +Z_APDU *Yaz_Proxy::handle_query_transformation(Z_APDU *apdu) +{ + if (apdu->which == Z_APDU_searchRequest && + apdu->u.searchRequest->query && + apdu->u.searchRequest->query->which == Z_Query_type_104 && + apdu->u.searchRequest->query->u.type_104->which == Z_External_CQL) + { + Z_RPNQuery *rpnquery = 0; + Z_SearchRequest *sr = apdu->u.searchRequest; + char *addinfo = 0; + + yaz_log(LOG_LOG, "%sCQL: %s", m_session_str, + sr->query->u.type_104->u.cql); + + int r = m_cql2rpn.query_transform(sr->query->u.type_104->u.cql, + &rpnquery, odr_encode(), + &addinfo); + if (r == -3) + yaz_log(LOG_LOG, "%sNo CQL to RPN table", m_session_str); + else if (r) + { + yaz_log(LOG_LOG, "%sCQL Conversion error %d", m_session_str, r); + Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse); + + new_apdu->u.searchResponse->referenceId = sr->referenceId; + new_apdu->u.searchResponse->records = + create_nonSurrogateDiagnostics(odr_encode(), + yaz_diag_srw_to_bib1(r), + addinfo); + *new_apdu->u.searchResponse->searchStatus = 0; + + send_to_client(new_apdu); + + return 0; + } + else + { + sr->query->which = Z_Query_type_1; + sr->query->u.type_1 = rpnquery; + } + return apdu; + } + return apdu; +} + Z_APDU *Yaz_Proxy::handle_query_validation(Z_APDU *apdu) { if (apdu->which == Z_APDU_searchRequest) @@ -1010,37 +1482,41 @@ Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu) if (apdu->which == Z_APDU_searchRequest) { Z_SearchRequest *sr = apdu->u.searchRequest; - if (*sr->smallSetUpperBound > 0 || *sr->mediumSetPresentNumber > 0) + int err = 0; + char *addinfo = 0; + Yaz_ProxyConfig *cfg = check_reconfigure(); + + Z_RecordComposition rc_temp, *rc = 0; + if (sr->smallSetElementSetNames) { - int err = 0; - char *addinfo = 0; - Yaz_ProxyConfig *cfg = check_reconfigure(); - - if (cfg) - err = cfg->check_syntax(odr_encode(), - m_default_target, - sr->preferredRecordSyntax, - &addinfo); - if (err == -1) - { - sr->preferredRecordSyntax = - yaz_oidval_to_z3950oid(odr_decode(), CLASS_RECSYN, - VAL_USMARC); - m_marcxml_flag = 1; - } - else if (err) - { - Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse); - - new_apdu->u.searchResponse->referenceId = sr->referenceId; - new_apdu->u.searchResponse->records = - create_nonSurrogateDiagnostics(odr_encode(), err, addinfo); - *new_apdu->u.searchResponse->searchStatus = 0; - - send_to_client(new_apdu); - - return 0; - } + rc_temp.which = Z_RecordComp_simple; + rc_temp.u.simple = sr->smallSetElementSetNames; + rc = &rc_temp; + } + + if (cfg) + err = cfg->check_syntax(odr_encode(), + m_default_target, + sr->preferredRecordSyntax, rc, + &addinfo, &m_stylesheet_schema, &m_schema); + if (err == -1) + { + sr->preferredRecordSyntax = + yaz_oidval_to_z3950oid(odr_encode(), CLASS_RECSYN, VAL_USMARC); + m_marcxml_flag = 1; + } + else if (err) + { + Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse); + + new_apdu->u.searchResponse->referenceId = sr->referenceId; + new_apdu->u.searchResponse->records = + create_nonSurrogateDiagnostics(odr_encode(), err, addinfo); + *new_apdu->u.searchResponse->searchStatus = 0; + + send_to_client(new_apdu); + + return 0; } } else if (apdu->which == Z_APDU_presentRequest) @@ -1053,12 +1529,12 @@ Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu) if (cfg) err = cfg->check_syntax(odr_encode(), m_default_target, pr->preferredRecordSyntax, - &addinfo); + pr->recordComposition, + &addinfo, &m_stylesheet_schema, &m_schema); if (err == -1) { pr->preferredRecordSyntax = - yaz_oidval_to_z3950oid(odr_decode(), CLASS_RECSYN, - VAL_USMARC); + yaz_oidval_to_z3950oid(odr_decode(), CLASS_RECSYN, VAL_USMARC); m_marcxml_flag = 1; } else if (err) @@ -1079,10 +1555,335 @@ Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu) return apdu; } -void Yaz_Proxy::recv_Z_PDU_0(Z_APDU *apdu) +Z_ElementSetNames *Yaz_Proxy::mk_esn_from_schema(ODR o, const char *schema) +{ + if (!schema) + return 0; + Z_ElementSetNames *esn = (Z_ElementSetNames *) + odr_malloc(o, sizeof(Z_ElementSetNames)); + esn->which = Z_ElementSetNames_generic; + esn->u.generic = odr_strdup(o, schema); + return esn; +} + +void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq) { + if (m_s2z_odr_init) + { + odr_destroy(m_s2z_odr_init); + m_s2z_odr_init = 0; + } + if (m_s2z_odr_search) + { + odr_destroy(m_s2z_odr_search); + m_s2z_odr_search = 0; + } + + m_http_keepalive = 0; + m_http_version = 0; + if (!strcmp(hreq->version, "1.0")) + { + const char *v = z_HTTP_header_lookup(hreq->headers, "Connection"); + if (v && !strcmp(v, "Keep-Alive")) + m_http_keepalive = 1; + else + m_http_keepalive = 0; + m_http_version = "1.0"; + } + else + { + const char *v = z_HTTP_header_lookup(hreq->headers, "Connection"); + if (v && !strcmp(v, "close")) + m_http_keepalive = 0; + else + m_http_keepalive = 1; + m_http_version = "1.1"; + } + + 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, &diagnostic, &num_diagnostic) == 0) + { + m_s2z_odr_init = odr_createmem(ODR_ENCODE); + m_s2z_odr_search = odr_createmem(ODR_ENCODE); + m_soap_ns = odr_strdup(m_s2z_odr_search, soap_package->ns); + m_s2z_init_apdu = 0; + m_s2z_search_apdu = 0; + m_s2z_present_apdu = 0; + + m_s2z_stylesheet = 0; + + if (srw_pdu->which == Z_SRW_searchRetrieve_request) + { + 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) + { + 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 = + odr_strdup(m_s2z_odr_init, srw_req->stylesheet); + + // set packing for response records .. + if (srw_req->recordPacking && + !strcmp(srw_req->recordPacking, "xml")) + m_s2z_packing = Z_SRW_recordPacking_XML; + 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); + Z_SearchRequest *z_searchRequest = + m_s2z_search_apdu->u.searchRequest; + + z_searchRequest->num_databaseNames = 1; + z_searchRequest->databaseNames = (char**) + odr_malloc(m_s2z_odr_search, sizeof(char *)); + z_searchRequest->databaseNames[0] = odr_strdup(m_s2z_odr_search, + srw_req->database); + + // query transformation + Z_Query *query = (Z_Query *) + odr_malloc(m_s2z_odr_search, sizeof(Z_Query)); + z_searchRequest->query = query; + + if (srw_req->query_type == Z_SRW_query_type_cql) + { + Z_External *ext = (Z_External *) + odr_malloc(m_s2z_odr_search, sizeof(*ext)); + ext->direct_reference = + odr_getoidbystr(m_s2z_odr_search, "1.2.840.10003.16.2"); + ext->indirect_reference = 0; + ext->descriptor = 0; + ext->which = Z_External_CQL; + ext->u.cql = srw_req->query.cql; + + query->which = Z_Query_type_104; + query->u.type_104 = ext; + } + else if (srw_req->query_type == Z_SRW_query_type_pqf) + { + Z_RPNQuery *RPNquery; + YAZ_PQF_Parser pqf_parser; + + pqf_parser = yaz_pqf_create (); + + RPNquery = yaz_pqf_parse (pqf_parser, m_s2z_odr_search, + srw_req->query.pqf); + if (!RPNquery) + { + const char *pqf_msg; + size_t off; + int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off); + yaz_log(LOG_LOG, "%*s^\n", off+4, ""); + yaz_log(LOG_LOG, "Bad PQF: %s (code %d)\n", pqf_msg, code); + + send_to_srw_client_error(10, 0); + return; + } + query->which = Z_Query_type_1; + query->u.type_1 = RPNquery; + + yaz_pqf_destroy (pqf_parser); + } + else + { + send_to_srw_client_error(7, "query"); + return; + } + + // present + m_s2z_present_apdu = 0; + int max = 0; + if (srw_req->maximumRecords) + max = *srw_req->maximumRecords; + int start = 1; + if (srw_req->startRecord) + start = *srw_req->startRecord; + if (max > 0) + { + // Some backend, such as Voyager doesn't honor piggyback + // So we use present always (0 &&). + if (0 && start <= 1) // Z39.50 piggyback + { + *z_searchRequest->smallSetUpperBound = max; + *z_searchRequest->mediumSetPresentNumber = max; + *z_searchRequest->largeSetLowerBound = 2000000000; // 2e9 + + z_searchRequest->preferredRecordSyntax = + yaz_oidval_to_z3950oid(m_s2z_odr_search, CLASS_RECSYN, + VAL_TEXT_XML); + if (srw_req->recordSchema) + { + z_searchRequest->smallSetElementSetNames = + z_searchRequest->mediumSetElementSetNames = + mk_esn_from_schema(m_s2z_odr_search, + srw_req->recordSchema); + } + } + else // Z39.50 present + { + m_s2z_present_apdu = zget_APDU(m_s2z_odr_search, + Z_APDU_presentRequest); + Z_PresentRequest *z_presentRequest = + m_s2z_present_apdu->u.presentRequest; + *z_presentRequest->resultSetStartPoint = start; + *z_presentRequest->numberOfRecordsRequested = max; + 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->which = + Z_RecordComp_simple; + z_presentRequest->recordComposition->u.simple = + mk_esn_from_schema(m_s2z_odr_search, + srw_req->recordSchema); + } + } + } + if (!m_client) + { + m_s2z_init_apdu = zget_APDU(m_s2z_odr_init, + Z_APDU_initRequest); + + // prevent m_initRequest_apdu memory from being grabbed + // in Yaz_Proxy::handle_incoming_Z_PDU + m_initRequest_apdu = m_s2z_init_apdu; + handle_incoming_Z_PDU(m_s2z_init_apdu); + return; + } + else + { + handle_incoming_Z_PDU(m_s2z_search_apdu); + return; + } + } + else if (srw_pdu->which == Z_SRW_explain_request) + { + 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 = + odr_strdup(m_s2z_odr_init, srw_req->stylesheet); + + if (srw_req->recordPacking && + !strcmp(srw_req->recordPacking, "xml")) + m_s2z_packing = Z_SRW_recordPacking_XML; + 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, + Z_APDU_initRequest); + + // prevent m_initRequest_apdu memory from being grabbed + // in Yaz_Proxy::handle_incoming_Z_PDU + m_initRequest_apdu = m_s2z_init_apdu; + handle_incoming_Z_PDU(m_s2z_init_apdu); + } + else + 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); + send_GDU(p, &len); + timeout(1); +} + +void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu) +{ + 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. - m_client = get_client(apdu); + Z_OtherInformation **oi; + get_otherInfoAPDU(apdu, &oi); + m_client = get_client(apdu, get_cookie(oi), get_proxy(oi)); if (!m_client) { delete this; @@ -1101,14 +1902,52 @@ void Yaz_Proxy::recv_Z_PDU_0(Z_APDU *apdu) if (apdu->u.initRequest->implementationVersion) yaz_log(LOG_LOG, "%simplementationVersion: %s", m_session_str, apdu->u.initRequest->implementationVersion); + if (m_initRequest_apdu == 0) + { + if (m_initRequest_mem) + nmem_destroy(m_initRequest_mem); + m_initRequest_apdu = apdu; + m_initRequest_mem = odr_extract_mem(odr_decode()); + + // 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); + + // 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) { - Z_APDU *apdu = m_client->m_initResponse; - apdu->u.initResponse->otherInfo = 0; + 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(apdu, VAL_COOKIE, 1, + set_otherInformationString(apdu2, VAL_COOKIE, 1, m_client->m_cookie); - send_to_client(apdu); + 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; @@ -1119,6 +1958,9 @@ void Yaz_Proxy::recv_Z_PDU_0(Z_APDU *apdu) apdu = handle_syntax_validation(apdu); if (apdu) + apdu = handle_query_transformation(apdu); + + if (apdu) apdu = handle_query_validation(apdu); if (apdu) @@ -1131,7 +1973,6 @@ void Yaz_Proxy::recv_Z_PDU_0(Z_APDU *apdu) } // delete other info part from PDU before sending to target - Z_OtherInformation **oi; get_otherInfoAPDU(apdu, &oi); if (oi) *oi = 0; @@ -1161,9 +2002,9 @@ void Yaz_Proxy::connectNotify() void Yaz_Proxy::shutdown() { + m_invalid_session = 0; // only keep if keep_alive flag is set... if (m_client && - !m_invalid_session && m_client->m_pdu_recv < m_keepalive_limit_pdu && m_client->m_bytes_recv+m_client->m_bytes_sent < m_keepalive_limit_bw && m_client->m_waiting == 0) @@ -1178,6 +2019,7 @@ void Yaz_Proxy::shutdown() assert (m_client->m_waiting != 2); // Tell client (if any) that no server connection is there.. m_client->m_server = 0; + m_invalid_session = 0; } else if (m_client) { @@ -1220,6 +2062,7 @@ void Yaz_ProxyClient::shutdown() void Yaz_Proxy::failNotify() { + inc_request_no(); yaz_log (LOG_LOG, "%sConnection closed by client", get_session_str()); shutdown(); @@ -1227,6 +2070,8 @@ void Yaz_Proxy::failNotify() void Yaz_ProxyClient::failNotify() { + if (m_server) + m_server->inc_request_no(); yaz_log (LOG_LOG, "%sConnection closed by target %s", get_session_str(), get_hostname()); shutdown(); @@ -1267,19 +2112,14 @@ 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); + for (i = 0; i<= 10; i++) + ODR_MASK_SET(req->protocolVersion, i); + if (send_to_target(apdu) < 0) { delete this; @@ -1301,6 +2141,7 @@ void Yaz_Proxy::pre_init() int max_clients; int keepalive_limit_bw, keepalive_limit_pdu; int pre_init; + const char *cql2rpn = 0; Yaz_ProxyConfig *cfg = check_reconfigure(); @@ -1317,7 +2158,8 @@ void Yaz_Proxy::pre_init() &max_clients, &keepalive_limit_bw, &keepalive_limit_pdu, - &pre_init) ; i++) + &pre_init, + &cql2rpn) ; i++) { if (pre_init) { @@ -1343,8 +2185,8 @@ void Yaz_Proxy::pre_init() other++; } } - yaz_log(LOG_LOG, "%s pre-init %s %s use=%d other=%d spare=%d preinit=%d", - m_session_str, + 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) { @@ -1383,12 +2225,18 @@ void Yaz_Proxy::timeoutNotify() if (m_bw_hold_PDU) { timeout(m_client_idletime); - Z_APDU *apdu = m_bw_hold_PDU; + Z_GDU *apdu = m_bw_hold_PDU; m_bw_hold_PDU = 0; - recv_Z_PDU_0(apdu); + + if (apdu->which == Z_GDU_Z3950) + handle_incoming_Z_PDU(apdu->u.z3950); + else if (apdu->which == Z_GDU_HTTP_Request) + handle_incoming_HTTP(apdu->u.HTTP_Request); } else { + inc_request_no(); + yaz_log (LOG_LOG, "%sTimeout (client to proxy)", m_session_str); shutdown(); } @@ -1400,12 +2248,29 @@ void Yaz_Proxy::timeoutNotify() } } +void Yaz_Proxy::markInvalid() +{ + m_client = 0; + m_invalid_session = 1; +} + void Yaz_ProxyClient::timeoutNotify() { + if (m_server) + m_server->inc_request_no(); + yaz_log (LOG_LOG, "%sTimeout (proxy to target) %s", get_session_str(), 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(); } @@ -1425,6 +2290,8 @@ 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_resultSetStartPoint = 0; m_bytes_sent = m_bytes_recv = 0; m_pdu_recv = 0; @@ -1446,6 +2313,33 @@ const char *Yaz_Proxy::option(const char *name, const char *value) return 0; } +void Yaz_ProxyClient::recv_HTTP_response(Z_HTTP_Response *apdu, int len) +{ + +} + +void Yaz_ProxyClient::recv_GDU(Z_GDU *apdu, int len) +{ + if (apdu->which == Z_GDU_Z3950) + recv_Z_PDU(apdu->u.z3950, len); + else if (apdu->which == Z_GDU_HTTP_Response) + recv_HTTP_response(apdu->u.HTTP_Response, len); + else + shutdown(); +} + +int Yaz_Proxy::handle_init_response_for_invalid_session(Z_APDU *apdu) +{ + if (!m_invalid_session) + return 0; + m_invalid_session = 0; + handle_incoming_Z_PDU(m_apdu_invalid_session); + assert (m_mem_invalid_session); + nmem_destroy(m_mem_invalid_session); + m_mem_invalid_session = 0; + return 1; +} + void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu, int len) { m_bytes_recv += len; @@ -1462,6 +2356,8 @@ 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; Z_InitResponse *ir = apdu->u.initResponse; char *im0 = ir->implementationName; @@ -1478,6 +2374,9 @@ void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu, int len) ir->implementationName = im1; nmem_destroy (nmem); + + if (m_server && m_server->handle_init_response_for_invalid_session(apdu)) + return; } if (apdu->which == Z_APDU_searchResponse) { @@ -1532,10 +2431,14 @@ void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu, int len) } } -void Yaz_Proxy::server(const char *addr) +int Yaz_Proxy::server(const char *addr) { - Yaz_Z_Assoc::server(addr); - - timeout(1); + int r = Yaz_Z_Assoc::server(addr); + if (!r) + { + yaz_log(LOG_LOG, "%sStarted proxy " VERSION " on %s", m_session_str, addr); + timeout(1); + } + return r; }