X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-proxy.cpp;h=f647343c6be3419acef9a1175a42ac0aa7fd009c;hp=5707846a24a011b36680474757a6ad0e780f51d1;hb=5ace60a2d363137c0e55b78611be2aa00e1d0e2d;hpb=acf534916169e14e2c33c9edb1b8a6f6c30c836c diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp index 5707846..f647343 100644 --- a/src/yaz-proxy.cpp +++ b/src/yaz-proxy.cpp @@ -1,7 +1,5 @@ -/* $Id: yaz-proxy.cpp,v 1.73 2007-04-12 18:18:42 adam Exp $ - Copyright (c) 1998-2007, Index Data. - -This file is part of the yazproxy. +/* This file is part of YAZ proxy + Copyright (C) 1998-2008 Index Data YAZ proxy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -14,10 +12,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with YAZ proxy; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ #ifdef WIN32 #define HAVE_SYS_STAT_H 1 @@ -220,7 +217,8 @@ Yaz_Proxy::Yaz_Proxy(IPDU_Observable *the_PDU_Observable, m_seed = time(0); m_client_idletime = 600; m_target_idletime = 600; - m_optimize = xstrdup ("1"); + m_max_sockets = 1024; + m_optimize = xstrdup("1"); strcpy(m_session_str, "0 "); m_session_no = 0; m_bytes_sent = 0; @@ -319,14 +317,14 @@ Yaz_Proxy::~Yaz_Proxy() if (m_stylesheet_xsp) xsltFreeStylesheet((xsltStylesheetPtr) m_stylesheet_xsp); #endif - xfree (m_time_tv); - - xfree (m_peername); - xfree (m_schema); - xfree (m_backend_type); - xfree (m_backend_charset); - xfree (m_usemarcon_ini_stage1); - xfree (m_usemarcon_ini_stage2); + xfree(m_time_tv); + + xfree(m_peername); + xfree(m_schema); + xfree(m_backend_type); + xfree(m_backend_charset); + xfree(m_usemarcon_ini_stage1); + xfree(m_usemarcon_ini_stage2); delete m_usemarcon; if (m_s2z_odr_init) odr_destroy(m_s2z_odr_init); @@ -364,13 +362,13 @@ int Yaz_Proxy::set_config(const char *config) void Yaz_Proxy::set_default_target(const char *target) { - xfree (m_default_target); + xfree(m_default_target); m_default_target = 0; if (target) - m_default_target = (char *) xstrdup (target); + m_default_target = (char *) xstrdup(target); } -void Yaz_Proxy::set_proxy_negotiation (const char *charset, const char *lang, +void Yaz_Proxy::set_proxy_negotiation(const char *charset, const char *lang, const char *default_charset) { yaz_log(YLOG_DEBUG, "%sSet the proxy negotiation: charset to '%s', " @@ -378,16 +376,16 @@ void Yaz_Proxy::set_proxy_negotiation (const char *charset, const char *lang, charset?charset:"none", default_charset?default_charset:"none", lang?lang:"none"); - xfree (m_proxy_negotiation_charset); - xfree (m_proxy_negotiation_lang); + xfree(m_proxy_negotiation_charset); + xfree(m_proxy_negotiation_lang); m_proxy_negotiation_charset = m_proxy_negotiation_lang = 0; if (charset) - m_proxy_negotiation_charset = (char *) xstrdup (charset); + m_proxy_negotiation_charset = (char *) xstrdup(charset); if (lang) - m_proxy_negotiation_lang = (char *) xstrdup (lang); + m_proxy_negotiation_lang = (char *) xstrdup(lang); if (default_charset) m_proxy_negotiation_default_charset = - (char *) xstrdup (default_charset); + (char *) xstrdup(default_charset); } Yaz_ProxyConfig *Yaz_Proxy::check_reconfigure() @@ -399,7 +397,6 @@ Yaz_ProxyConfig *Yaz_Proxy::check_reconfigure() if (m_reconfig_flag) { yaz_log(YLOG_LOG, "reconfigure"); - yaz_log_reopen(); if (m_config_fname && cfg) { yaz_log(YLOG_LOG, "reconfigure config %s", m_config_fname); @@ -441,7 +438,7 @@ IPDU_Observer *Yaz_Proxy::sessionNotify(IPDU_Observable (long) time(0), m_session_no, 0); m_session_no++; - yaz_log (YLOG_LOG, "%sNew session %s", session_str, peername); + yaz_log(YLOG_LOG, "%sNew session %s", session_str, peername); Yaz_Proxy *new_proxy = new Yaz_Proxy(the_PDU_Observable, m_socket_observable, this); @@ -474,7 +471,7 @@ IPDU_Observer *Yaz_Proxy::sessionNotify(IPDU_Observable // create thread object the first time we get an incoming connection if (!m_my_thread && m_num_msg_threads > 0) { - yaz_log (YLOG_LOG, "%sStarting message thread management. number=%d", + yaz_log(YLOG_LOG, "%sStarting message thread management. number=%d", session_str, m_num_msg_threads); m_my_thread = new Msg_Thread(m_socket_observable, m_num_msg_threads); } @@ -484,25 +481,20 @@ IPDU_Observer *Yaz_Proxy::sessionNotify(IPDU_Observable char *Yaz_Proxy::get_cookie(Z_OtherInformation **otherInfo) { - Z_OtherInformationUnit *oi; - const int *oid = yaz_string_to_oid(yaz_oid_std(), - CLASS_USERINFO, OID_STR_COOKIE); + Z_OtherInformationUnit *oi = + update_otherInformation(otherInfo, 0, yaz_oid_userinfo_cookie, 1, 1); - if (oid && - (oi = update_otherInformation(otherInfo, 0, oid, 1, 1)) && - oi->which == Z_OtherInfo_characterInfo) + if (oi && oi->which == Z_OtherInfo_characterInfo) return oi->information.characterInfo; return 0; } char *Yaz_Proxy::get_proxy(Z_OtherInformation **otherInfo) { - Z_OtherInformationUnit *oi; - const int *oid = yaz_string_to_oid(yaz_oid_std(), - CLASS_USERINFO, OID_STR_COOKIE); - if (oid && - (oi = update_otherInformation(otherInfo, 0, oid, 1, 1)) && - oi->which == Z_OtherInfo_characterInfo) + Z_OtherInformationUnit *oi = + update_otherInformation(otherInfo, 0, yaz_oid_userinfo_proxy, 1, 1); + + if (oi && oi->which == Z_OtherInfo_characterInfo) return oi->information.characterInfo; return 0; } @@ -552,10 +544,29 @@ const char *Yaz_Proxy::load_balance(const char **url) return ret_min; } +int Yaz_Proxy::get_number_of_connections() +{ + int no_connections = 0; + Yaz_ProxyClient *c; + + for (c = m_parent->m_clientPool; c; c = c->m_next) + { + assert(c->m_prev); + assert(*c->m_prev == c); + if (!strcmp(m_proxyTarget, c->get_hostname())) + { + no_connections++; + } + } + yaz_log(YLOG_LOG, "%sExisting %s connections: %d", m_session_str, m_proxyTarget, + no_connections); + return no_connections; +} + Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, - const char *proxy_host) + const char *proxy_host, int *http_code) { - assert (m_parent); + assert(m_parent); Yaz_Proxy *parent = m_parent; Yaz_ProxyClient *c = m_client; @@ -590,6 +601,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, &m_pdu_max, &m_max_record_retrieve, &m_search_max, &m_target_idletime, &client_idletime, + &m_max_sockets, &parent->m_max_clients, &m_keepalive_limit_bw, &m_keepalive_limit_pdu, @@ -636,8 +648,8 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, { // search in sessions with a cookie for (c = parent->m_clientPool; c; c = c->m_next) { - assert (c->m_prev); - assert (*c->m_prev == c); + assert(c->m_prev); + assert(*c->m_prev == c); if (c->m_cookie && !strcmp(cookie,c->m_cookie) && !strcmp(m_proxyTarget, c->get_hostname())) { @@ -647,7 +659,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, // we have an initRequest we can safely do re-open if (c->m_waiting && apdu->which == Z_APDU_initRequest) { - yaz_log (YLOG_LOG, "%s REOPEN target=%s", m_session_str, + yaz_log(YLOG_LOG, "%s REOPEN target=%s", m_session_str, c->get_hostname()); c->close(); c->m_init_flag = 0; @@ -671,7 +683,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, c->m_server->m_client = 0; c->m_server = this; (parent->m_seqno)++; - yaz_log (YLOG_DEBUG, "get_client 1 %p %p", this, c); + yaz_log(YLOG_DEBUG, "get_client 1 %p %p", this, c); return c; } } @@ -685,13 +697,13 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, { assert(c->m_prev); assert(*c->m_prev == c); - if (c->m_server == 0 && c->m_cookie == 0 && c->m_waiting == 0 + if (c->m_server == 0 && c->m_cookie == 0 && c->m_waiting == 0 && c->compare_idAuthentication(apdu) && c->compare_charset(apdu) && !strcmp(m_proxyTarget, c->get_hostname())) { // found it in cache - yaz_log (YLOG_LOG, "%sREUSE %d %s", + yaz_log(YLOG_LOG, "%sREUSE %d %s", m_session_str, parent->m_seqno, c->get_hostname()); c->m_seqno = parent->m_seqno; @@ -715,7 +727,17 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, { if (apdu->which != Z_APDU_initRequest) { - yaz_log (YLOG_LOG, "%sno init request as first PDU", m_session_str); + yaz_log(YLOG_LOG, "%sno init request as first PDU", m_session_str); + *http_code = 500; + return 0; + } + + int no_in_use = get_number_of_connections(); + if (no_in_use >= m_max_sockets) + { + yaz_log(YLOG_LOG, "%smax sockets reached %d", m_session_str, + m_max_sockets); + *http_code = 500; return 0; } // go through list of clients - and find the lowest/oldest one. @@ -723,10 +745,10 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, int min_seq = -1; int no_of_clients = 0; if (parent->m_clientPool) - yaz_log (YLOG_DEBUG, "Existing sessions"); + yaz_log(YLOG_DEBUG, "Existing sessions"); for (c = parent->m_clientPool; c; c = c->m_next) { - yaz_log (YLOG_DEBUG, " Session %-3d wait=%d %s cookie=%s", c->m_seqno, + yaz_log(YLOG_DEBUG, " Session %-3d wait=%d %s cookie=%s", c->m_seqno, c->m_waiting, c->get_hostname(), c->m_cookie ? c->m_cookie : ""); no_of_clients++; @@ -741,17 +763,17 @@ 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 (YLOG_LOG, "%sMAXCLIENTS %d Destroy %d", + yaz_log(YLOG_LOG, "%sMAXCLIENTS %d Destroy %d", m_session_str, parent->m_max_clients, c->m_seqno); if (c->m_server && c->m_server != this) c->m_server->dec_ref(); } else { - yaz_log (YLOG_LOG, "%sMAXCLIENTS %d Reuse %d %d %s", + yaz_log(YLOG_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); + xfree(c->m_cookie); c->m_cookie = 0; if (cookie) c->m_cookie = xstrdup(cookie); @@ -775,7 +797,8 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, } else { - yaz_log (YLOG_LOG, "%sNEW %d %s", + + yaz_log(YLOG_LOG, "%sNEW %d %s", m_session_str, parent->m_seqno, m_proxyTarget); c = new Yaz_ProxyClient(m_PDU_Observable->clone(), parent); c->m_next = parent->m_clientPool; @@ -785,7 +808,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, c->m_prev = &parent->m_clientPool; } - xfree (c->m_cookie); + xfree(c->m_cookie); c->m_cookie = 0; if (cookie) c->m_cookie = xstrdup(cookie); @@ -814,7 +837,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, c->set_idAuthentication(apdu); } - yaz_log (YLOG_DEBUG, "get_client 3 %p %p", this, c); + yaz_log(YLOG_DEBUG, "get_client 3 %p %p", this, c); return c; } @@ -892,12 +915,10 @@ void Yaz_Proxy::convert_xsl_delay() { xmlChar *out_buf; int out_len; - xmlDocDumpFormatMemory (res, &out_buf, &out_len, 1); - const int *oid = yaz_string_to_oid(yaz_oid_std(), - CLASS_RECSYN, OID_STR_XML); + xmlDocDumpFormatMemory(res, &out_buf, &out_len, 1); m_stylesheet_nprl->records[m_stylesheet_offset]-> u.databaseRecord = - z_ext_record_oid(odr_encode(), oid, + z_ext_record_oid(odr_encode(), yaz_oid_recsyn_xml, (char*) out_buf, out_len); xmlFree(out_buf); xmlFreeDoc(res); @@ -937,53 +958,30 @@ void Yaz_Proxy::convert_to_frontend_type(Z_NamePlusRecordList *p) Z_External *r = npr->u.databaseRecord; if (r->which == Z_External_octet) { -#if HAVE_USEMARCON +#if !HAVE_USEMARCON if (m_usemarcon_ini_stage1 && *m_usemarcon_ini_stage1) + yaz_log(YLOG_LOG, "%sError: USEMARCON requested but not available", + m_session_str); +#endif +#if HAVE_USEMARCON + yaz_log(YLOG_DEBUG, "%sUSEMARCON stage1=%s stage2=%s", + m_session_str, + m_usemarcon_ini_stage1 ? m_usemarcon_ini_stage1 : "(none)", + m_usemarcon_ini_stage2 ? m_usemarcon_ini_stage2 : "(none)"); + char *converted; + int convlen; + if (m_usemarcon->convert(m_usemarcon_ini_stage1, m_usemarcon_ini_stage2, + (char*) r->u.octet_aligned->buf, r->u.octet_aligned->len, + &converted, &convlen)) { - if (!m_usemarcon->m_stage1) - { - m_usemarcon->m_stage1 = new CDetails(); - } - m_usemarcon->m_stage1->SetIniFileName(m_usemarcon_ini_stage1); - m_usemarcon->m_stage1->SetMarcRecord((char*) r->u.octet_aligned->buf, r->u.octet_aligned->len); - int res = m_usemarcon->m_stage1->Start(); - if (res == 0) - { - char *converted; - int convlen; - m_usemarcon->m_stage1->GetMarcRecord(converted, convlen); - if (m_usemarcon_ini_stage2 && *m_usemarcon_ini_stage2) - { - if (!m_usemarcon->m_stage2) - { - m_usemarcon->m_stage2 = new CDetails(); - } - m_usemarcon->m_stage2->SetIniFileName(m_usemarcon_ini_stage2); - m_usemarcon->m_stage2->SetMarcRecord(converted, convlen); - res = m_usemarcon->m_stage2->Start(); - if (res == 0) - { - free(converted); - m_usemarcon->m_stage2->GetMarcRecord(converted, convlen); - } - else - { - yaz_log(YLOG_LOG, "%sUSEMARCON stage 2 error %d", m_session_str, res); - } - } - npr->u.databaseRecord = - z_ext_record_oid(odr_encode(), - m_frontend_type, - converted, - strlen(converted)); - free(converted); - } - else - { - yaz_log(YLOG_LOG, "%sUSEMARCON stage 1 error %d", m_session_str, res); - } - continue; + npr->u.databaseRecord = + z_ext_record_oid(odr_encode(), + m_frontend_type, + converted, + strlen(converted)); + free(converted); } + else #endif /* HAVE_USEMARCON */ npr->u.databaseRecord = @@ -1018,16 +1016,11 @@ void Yaz_Proxy::convert_records_charset(Z_NamePlusRecordList *p, if (npr->which == Z_NamePlusRecord_databaseRecord) { Z_External *r = npr->u.databaseRecord; - const int *oid = r->direct_reference; + const Odr_oid *oid = r->direct_reference; if (!oid) continue; - char oid_name_str[OID_STR_MAX]; - int oclass; - const char *oid_name = yaz_oid_to_string_buf( - oid, &oclass, oid_name_str); - - if (oid_name && !strcmp(oid_name, OID_STR_SUTRS)) + if (!oid_oidcmp(oid, yaz_oid_recsyn_sutrs)) { WRBUF w = wrbuf_alloc(); @@ -1038,7 +1031,7 @@ void Yaz_Proxy::convert_records_charset(Z_NamePlusRecordList *p, wrbuf_len(w)); wrbuf_destroy(w); } - else if (oid_name && !strcmp(oid_name, OID_STR_XML)) + else if (!oid_oidcmp(oid, yaz_oid_recsyn_xml)) { ; } @@ -1080,9 +1073,6 @@ void Yaz_Proxy::convert_to_marcxml(Z_NamePlusRecordList *p, Z_NamePlusRecord *npr = p->records[i]; if (npr->which == Z_NamePlusRecord_databaseRecord) { - const int *xml_oid = yaz_string_to_oid(yaz_oid_std(), - CLASS_RECSYN, - OID_STR_XML); Z_External *r = npr->u.databaseRecord; if (r->which == Z_External_OPAC) { @@ -1090,7 +1080,7 @@ void Yaz_Proxy::convert_to_marcxml(Z_NamePlusRecordList *p, yaz_opac_decode_wrbuf(mt, r->u.opac, w); npr->u.databaseRecord = z_ext_record_oid( - odr_encode(), xml_oid, + odr_encode(), yaz_oid_recsyn_xml, wrbuf_buf(w), wrbuf_len(w)); wrbuf_destroy(w); } @@ -1103,7 +1093,8 @@ void Yaz_Proxy::convert_to_marcxml(Z_NamePlusRecordList *p, &result, &rlen)) { npr->u.databaseRecord = - z_ext_record_oid(odr_encode(), xml_oid, result, rlen); + z_ext_record_oid(odr_encode(), yaz_oid_recsyn_xml, + result, rlen); } } } @@ -1182,7 +1173,7 @@ int Yaz_Proxy::send_srw_response(Z_SRW_PDU *srw_pdu, int http_code /* = 200 */) static Z_SOAP_Handler soap_handlers[2] = { #if YAZ_HAVE_XSLT - {"http://www.loc.gov/zing/srw/", 0, + { (char*) "http://www.loc.gov/zing/srw/", 0, (Z_SOAP_fun) yaz_srw_codec}, #endif {0, 0, 0} @@ -1201,8 +1192,8 @@ int Yaz_Proxy::send_srw_response(Z_SRW_PDU *srw_pdu, int http_code /* = 200 */) soap_handlers, 0, m_s2z_stylesheet); if (m_log_mask & PROXY_LOG_REQ_CLIENT) { - yaz_log (YLOG_LOG, "%sSending %s to client", m_session_str, - gdu_name(gdu)); + yaz_log(YLOG_LOG, "%sSending %s to client", m_session_str, + gdu_name(gdu)); } int len; int r = send_GDU(gdu, &len); @@ -1240,6 +1231,35 @@ int Yaz_Proxy::z_to_srw_diag(ODR o, Z_SRW_searchRetrieveResponse *srw_res, return 0; } +static void yazproxy_encode_sru_surrogate(ODR o, Z_SRW_record *record, int pos, + int code, const char *details) +{ + const char *message = yaz_diag_srw_str(code); + int len = 200; + if (message) + len += strlen(message); + if (details) + len += strlen(details); + + record->recordData_buf = (char *) odr_malloc(o, len); + + sprintf(record->recordData_buf, "\n" + " info:srw/diagnostic/1/%d\n", code); + if (details) + sprintf(record->recordData_buf + strlen(record->recordData_buf), + "
%s
\n", details); + if (message) + sprintf(record->recordData_buf + strlen(record->recordData_buf), + " %s\n", message); + sprintf(record->recordData_buf + strlen(record->recordData_buf), + "\n"); + record->recordData_len = strlen(record->recordData_buf); + record->recordPosition = odr_intdup(o, pos); + record->recordSchema = odr_strdup(o, "info:srw/schema/1/diagnostics-v1.1"); +} + + int Yaz_Proxy::send_to_srw_client_ok(int hits, Z_Records *records, int start) { ODR o = odr_encode(); @@ -1259,19 +1279,16 @@ int Yaz_Proxy::send_to_srw_client_ok(int hits, Z_Records *records, int start) 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); + yaz_log(YLOG_LOG, "Point 1"); + yazproxy_encode_sru_surrogate( + o, srw_res->records + i, i+start, + YAZ_SRW_RECORD_NOT_AVAILABLE_IN_THIS_SCHEMA, 0); continue; } Z_External *r = npr->u.databaseRecord; - const int *xml_oid = yaz_string_to_oid( - yaz_oid_std(), CLASS_RECSYN, OID_STR_XML); if (r->which == Z_External_octet - && !oid_oidcmp(r->direct_reference, xml_oid)) + && !oid_oidcmp(r->direct_reference, yaz_oid_recsyn_xml)) { srw_res->records[i].recordSchema = m_schema; srw_res->records[i].recordPacking = m_s2z_packing; @@ -1282,11 +1299,10 @@ int Yaz_Proxy::send_to_srw_client_ok(int hits, Z_Records *records, int 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); + yaz_log(YLOG_LOG, "Point 2"); + yazproxy_encode_sru_surrogate( + o, srw_res->records + i, i+start, + YAZ_SRW_RECORD_NOT_AVAILABLE_IN_THIS_SCHEMA, 0); } } } @@ -1331,7 +1347,8 @@ int Yaz_Proxy::send_srw_explain_response(Z_SRW_diagnostic *diagnostics, 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->record.recordSchema = odr_strdup(odr_encode(), + "http://explain.z3950.org/dtd/2.0/"); er->diagnostics = diagnostics; er->num_diagnostics = num_diagnostics; @@ -1404,7 +1421,7 @@ int Yaz_Proxy::send_PDU_convert(Z_APDU *apdu) { int len = 0; if (m_log_mask & PROXY_LOG_REQ_CLIENT) - yaz_log (YLOG_LOG, "%sSending %s to client", m_session_str, + yaz_log(YLOG_LOG, "%sSending %s to client", m_session_str, apdu_name(apdu)); int r = send_Z_PDU(apdu, &len); m_bytes_sent += len; @@ -1607,7 +1624,7 @@ int Yaz_ProxyClient::send_to_target(Z_APDU *apdu) 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 (YLOG_LOG, "%sSending %s to %s %d bytes", + yaz_log(YLOG_LOG, "%sSending %s to %s %d bytes", get_session_str(), apdu_name_tmp, get_hostname(), len); m_bytes_sent += len; @@ -1673,7 +1690,7 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) pr->preferredRecordSyntax, pr->recordComposition)) { - yaz_log (YLOG_LOG, "%sReturned cached records for present request", + yaz_log(YLOG_LOG, "%sReturned cached records for present request", m_session_str); Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentResponse); new_apdu->u.presentResponse->referenceId = pr->referenceId; @@ -1752,7 +1769,7 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) if (m_client->m_cache.lookup (odr_encode(), &npr, 1, toget, sr->preferredRecordSyntax, comp)) { - yaz_log (YLOG_LOG, "%sReturned cached records for medium set", + yaz_log(YLOG_LOG, "%sReturned cached records for medium set", m_session_str); Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse); new_apdu->u.searchResponse->referenceId = sr->referenceId; @@ -1777,7 +1794,7 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) { // medium Set // send present request (medium size) - yaz_log (YLOG_LOG, "%sOptimizing search for medium set", + yaz_log(YLOG_LOG, "%sOptimizing search for medium set", m_session_str); Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentRequest); @@ -1795,7 +1812,7 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) m_client->m_last_resultCount <= 0) { // large set. Return pseudo-search response immediately - yaz_log (YLOG_LOG, "%sOptimizing search for large set", + yaz_log(YLOG_LOG, "%sOptimizing search for large set", m_session_str); Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse); new_apdu->u.searchResponse->referenceId = sr->referenceId; @@ -1823,7 +1840,7 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) if (m_client->m_cache.lookup (odr_encode(), &npr, 1, toget, sr->preferredRecordSyntax, comp)) { - yaz_log (YLOG_LOG, "%sReturned cached records for small set", + yaz_log(YLOG_LOG, "%sReturned cached records for small set", m_session_str); Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse); new_apdu->u.searchResponse->referenceId = sr->referenceId; @@ -1846,7 +1863,7 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) } else { - yaz_log (YLOG_LOG, "%sOptimizing search for small set", + yaz_log(YLOG_LOG, "%sOptimizing search for small set", m_session_str); Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentRequest); Z_PresentRequest *pr = new_apdu->u.presentRequest; @@ -1868,8 +1885,8 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) m_client->m_cache.clear(); m_client->m_resultSetStartPoint = 0; - xfree (m_client->m_last_resultSetId); - m_client->m_last_resultSetId = xstrdup (sr->resultSetName); + 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); @@ -1897,7 +1914,7 @@ void Yaz_Proxy::recv_GDU(Z_GDU *apdu, int len) m_bytes_recv += len; if (m_log_mask & PROXY_LOG_REQ_CLIENT) - yaz_log (YLOG_LOG, "%sReceiving %s from client %d bytes", + yaz_log(YLOG_LOG, "%sReceiving %s from client %d bytes", m_session_str, gdu_name(apdu), len); #if 0 @@ -2283,8 +2300,7 @@ Z_Records *Yaz_Proxy::create_nonSurrogateDiagnostics(ODR odr, *err = error; rec->which = Z_Records_NSD; rec->u.nonSurrogateDiagnostic = dr; - dr->diagnosticSetId = - yaz_string_to_oid_odr(yaz_oid_std(), CLASS_DIAGSET, OID_STR_BIB1, odr); + dr->diagnosticSetId = odr_oiddup(odr, yaz_oid_diagset_bib_1); dr->condition = err; dr->which = Z_DefaultDiagFormat_v2Addinfo; dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : ""); @@ -2516,7 +2532,7 @@ Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu) sr->preferredRecordSyntax = yaz_string_to_oid_odr( yaz_oid_std(), CLASS_RECSYN, - m_backend_type ? m_backend_type : OID_STR_USMARC, + m_backend_type ? m_backend_type : "usmarc", odr_encode()); } else if (err) @@ -2584,7 +2600,7 @@ Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu) pr->preferredRecordSyntax = yaz_string_to_oid_odr( yaz_oid_std(), CLASS_RECSYN, - m_backend_type ? m_backend_type : OID_STR_USMARC, + m_backend_type ? m_backend_type : "usmarc", odr_encode()); } else if (err) @@ -2708,7 +2724,7 @@ int Yaz_Proxy::file_access(Z_HTTP_Request *hreq) } if (m_log_mask & PROXY_LOG_REQ_CLIENT) { - yaz_log (YLOG_LOG, "%sSending file %s to client", m_session_str, + yaz_log(YLOG_LOG, "%sSending file %s to client", m_session_str, fname); } int len; @@ -2782,24 +2798,39 @@ void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq) m_s2z_present_apdu = 0; m_s2z_stylesheet = 0; - + Z_IdAuthentication *auth = NULL; - if (*authorization_str) + if (srw_pdu->username && srw_pdu->password) { + yaz_log(YLOG_LOG, "username/password: %s/%s\n", + srw_pdu->username, srw_pdu->password); auth = (Z_IdAuthentication *) odr_malloc(m_s2z_odr_init, sizeof(Z_IdAuthentication)); auth->which = Z_IdAuthentication_idPass; auth->u.idPass = (Z_IdPass *) odr_malloc(m_s2z_odr_init, sizeof(Z_IdPass)); auth->u.idPass->groupId = NULL; - char *p = strchr(authorization_str, ':'); - if (p) + auth->u.idPass->password = odr_strdup(m_s2z_odr_init, srw_pdu->password); + auth->u.idPass->userId = odr_strdup(m_s2z_odr_init, srw_pdu->username); + } + else + { + if (*authorization_str) { - *p = '\0'; - p++; - auth->u.idPass->password = odr_strdup(m_s2z_odr_init, p); + yaz_log(YLOG_LOG, "authorization_str present: %s\n", authorization_str); + auth = (Z_IdAuthentication *) odr_malloc(m_s2z_odr_init, sizeof(Z_IdAuthentication)); + auth->which = Z_IdAuthentication_idPass; + auth->u.idPass = (Z_IdPass *) odr_malloc(m_s2z_odr_init, sizeof(Z_IdPass)); + auth->u.idPass->groupId = NULL; + char *p = strchr(authorization_str, ':'); + if (p) + { + *p = '\0'; + p++; + auth->u.idPass->password = odr_strdup(m_s2z_odr_init, p); + } + auth->u.idPass->userId = odr_strdup(m_s2z_odr_init, authorization_str); } - auth->u.idPass->userId = odr_strdup(m_s2z_odr_init, authorization_str); - } - + } + if (srw_pdu->which == Z_SRW_searchRetrieve_request) { @@ -2930,9 +2961,7 @@ void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq) *z_searchRequest->largeSetLowerBound = 2000000000; // 2e9 z_searchRequest->preferredRecordSyntax = - yaz_string_to_oid_odr(yaz_oid_std(), - CLASS_RECSYN, OID_STR_XML, - m_s2z_odr_search); + odr_oiddup(m_s2z_odr_search, yaz_oid_recsyn_xml); if (srw_req->recordSchema) { @@ -2952,10 +2981,7 @@ void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq) *z_presentRequest->numberOfRecordsRequested = max; z_presentRequest->preferredRecordSyntax = - yaz_string_to_oid_odr(yaz_oid_std(), - CLASS_RECSYN, OID_STR_XML, - m_s2z_odr_search); - + odr_oiddup(m_s2z_odr_search, yaz_oid_recsyn_xml); if (srw_req->recordSchema) { z_presentRequest->recordComposition = @@ -3160,8 +3186,8 @@ void Yaz_Proxy::handle_init(Z_APDU *apdu) Z_APDU *apdu2 = m_client->m_initResponse; apdu2->u.initResponse->otherInfo = 0; if (m_client->m_cookie && *m_client->m_cookie) - set_otherInformationString(apdu2, OID_STR_COOKIE, 1, - m_client->m_cookie); + set_otherInformationString(apdu2, yaz_oid_userinfo_cookie, + 1, m_client->m_cookie); apdu2->u.initResponse->referenceId = apdu->u.initRequest->referenceId; apdu2->u.initResponse->options = m_client->m_initResponse_options; @@ -3245,12 +3271,13 @@ void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu) // Determine our client. Z_OtherInformation **oi; get_otherInfoAPDU(apdu, &oi); - m_client = get_client(apdu, get_cookie(oi), get_proxy(oi)); + int http_code = 404; + m_client = get_client(apdu, get_cookie(oi), get_proxy(oi), &http_code); if (!m_client) { if (m_http_version) { // HTTP. Send not found - send_http_response(404); + send_http_response(http_code); return; } else @@ -3348,7 +3375,7 @@ void Yaz_Proxy::releaseClient() } else if (m_client) { - yaz_log (YLOG_LOG, "%sShutdown (client to proxy) close %s", + yaz_log(YLOG_LOG, "%sShutdown (client to proxy) close %s", m_session_str, m_client->get_hostname()); assert (m_client->m_waiting != 2); @@ -3357,13 +3384,13 @@ void Yaz_Proxy::releaseClient() } else if (!m_parent) { - yaz_log (YLOG_LOG, "%sshutdown (client to proxy) bad state", + yaz_log(YLOG_LOG, "%sshutdown (client to proxy) bad state", m_session_str); assert (m_parent); } else { - yaz_log (YLOG_LOG, "%sShutdown (client to proxy)", + yaz_log(YLOG_LOG, "%sShutdown (client to proxy)", m_session_str); } if (m_parent) @@ -3393,7 +3420,7 @@ const char *Yaz_ProxyClient::get_session_str() void Yaz_ProxyClient::shutdown() { - yaz_log (YLOG_LOG, "%sShutdown (proxy to target) %s", get_session_str(), + yaz_log(YLOG_LOG, "%sShutdown (proxy to target) %s", get_session_str(), get_hostname()); if (m_server) @@ -3408,7 +3435,7 @@ void Yaz_ProxyClient::shutdown() void Yaz_Proxy::failNotify() { inc_request_no(); - yaz_log (YLOG_LOG, "%sConnection closed by client", get_session_str()); + yaz_log(YLOG_LOG, "%sConnection closed by client", get_session_str()); dec_ref(); } @@ -3428,11 +3455,12 @@ void Yaz_Proxy::send_response_fail_client(const char *addr) send_srw_explain_response(diagnostic, num_diagnostic); } } + void Yaz_ProxyClient::failNotify() { if (m_server) m_server->inc_request_no(); - yaz_log (YLOG_LOG, "%sConnection closed by target %s", + yaz_log(YLOG_LOG, "%sConnection closed by target %s", get_session_str(), get_hostname()); if (m_server) @@ -3444,7 +3472,7 @@ void Yaz_ProxyClient::connectNotify() { const char *s = get_session_str(); const char *h = get_hostname(); - yaz_log (YLOG_LOG, "%sConnection accepted by %s timeout=%d", s, h, + yaz_log(YLOG_LOG, "%sConnection accepted by %s timeout=%d", s, h, m_target_idletime); timeout(m_target_idletime); if (!m_server) @@ -3467,8 +3495,8 @@ Yaz_ProxyClient::~Yaz_ProxyClient() odr_destroy(m_init_odr); odr_destroy(m_idAuthentication_odr); delete m_last_query; - xfree (m_last_resultSetId); - xfree (m_cookie); + xfree(m_last_resultSetId); + xfree(m_cookie); } void Yaz_ProxyClient::pre_init_client() @@ -3504,6 +3532,7 @@ void Yaz_Proxy::pre_init() const char *zurl_in_use[MAX_ZURL_PLEX]; int limit_bw, limit_pdu, limit_req, limit_search; int target_idletime, client_idletime; + int max_sockets; int max_clients; int keepalive_limit_bw, keepalive_limit_pdu; int pre_init; @@ -3525,6 +3554,7 @@ void Yaz_Proxy::pre_init() &limit_bw, &limit_pdu, &limit_req, &limit_search, &target_idletime, &client_idletime, + &max_sockets, &max_clients, &keepalive_limit_bw, &keepalive_limit_pdu, @@ -3568,7 +3598,8 @@ void Yaz_Proxy::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) + if (spare + spare_waiting < pre_init + && in_use + spare + spare_waiting + other < max_sockets) { c = new Yaz_ProxyClient(m_PDU_Observable->clone(), this); c->m_next = m_clientPool; @@ -3609,7 +3640,7 @@ void Yaz_Proxy::timeoutNotify() case timeout_busy: inc_request_no(); m_in_queue.clear(); - yaz_log (YLOG_LOG, "%sTimeout (client to proxy)", m_session_str); + yaz_log(YLOG_LOG, "%sTimeout (client to proxy)", m_session_str); dec_ref(); break; case timeout_reduce: @@ -3643,7 +3674,7 @@ void Yaz_ProxyClient::timeoutNotify() if (m_server) m_server->inc_request_no(); - yaz_log (YLOG_LOG, "%sTimeout (proxy to target) %s", get_session_str(), + yaz_log(YLOG_LOG, "%sTimeout (proxy to target) %s", get_session_str(), get_hostname()); if (m_server) @@ -3692,8 +3723,8 @@ const char *Yaz_Proxy::option(const char *name, const char *value) { if (!strcmp (name, "optimize")) { if (value) { - xfree (m_optimize); - m_optimize = xstrdup (value); + xfree(m_optimize); + m_optimize = xstrdup(value); } return m_optimize; } @@ -3734,7 +3765,7 @@ void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu, int len) m_pdu_recv++; m_waiting = 0; if (m_root->get_log_mask() & PROXY_LOG_REQ_SERVER) - yaz_log (YLOG_LOG, "%sReceiving %s from %s %d bytes", get_session_str(), + yaz_log(YLOG_LOG, "%sReceiving %s from %s %d bytes", get_session_str(), apdu_name(apdu), get_hostname(), len); if (apdu->which == Z_APDU_initResponse) { @@ -3825,7 +3856,7 @@ void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu, int len) } } if (m_cookie) - set_otherInformationString (apdu, OID_STR_COOKIE, 1, m_cookie); + set_otherInformationString(apdu, yaz_oid_userinfo_cookie, 1, m_cookie); Yaz_Proxy *server = m_server; // save it. send_to_client may destroy us @@ -3892,19 +3923,19 @@ void Yaz_Proxy::base64_decode(const char *base64, char *buf, int buf_len) char ch = (char) (ch_ptr - base64_chars); switch (index) { - case 1: - buf[buf_pos] = ch << 2; - break; - case 2: - buf[buf_pos++] += (ch & 0x30) >> 4; - buf[buf_pos] = (ch & 0x0f) << 4; - break; - case 3: - buf[buf_pos++] += (ch & 0x3c) >> 2; - buf[buf_pos] = (ch & 0x03) << 6; - break; - case 4: - buf[buf_pos++] += ch; + case 1: + buf[buf_pos] = ch << 2; + break; + case 2: + buf[buf_pos++] += (ch & 0x30) >> 4; + buf[buf_pos] = (ch & 0x0f) << 4; + break; + case 3: + buf[buf_pos++] += (ch & 0x3c) >> 2; + buf[buf_pos] = (ch & 0x03) << 6; + break; + case 4: + buf[buf_pos++] += ch; } if (index < 4) index++;