-/* $Id: yaz-proxy.cpp,v 1.78 2008-02-21 09:33:23 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-2009 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
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
#include <yaz/oid_db.h>
#include "msg-thread.h"
+#if YAZ_VERSIONL >= 0x03001D
+#define YAZ_HAS_MK_SURROGATE 1
+#else
+#define YAZ_HAS_MK_SURROGATE 0
+#endif
+
using namespace yazpp_1;
#ifdef WIN32
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;
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);
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', "
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()
(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);
// 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);
}
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;
&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,
{ // 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()))
{
// 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;
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;
}
}
{
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;
{
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.
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++;
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);
}
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;
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);
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;
}
switch (r->which)
{
case Z_DefaultDiagFormat_v2Addinfo:
- yaz_log(YLOG_LOG, "%sError %d %s:%s",
+ yaz_log(YLOG_LOG, "%sError " ODR_INT_PRINTF " %s:%s",
m_session_str,
*r->condition, diagbib1_str(*r->condition),
r->u.v2Addinfo);
break;
case Z_DefaultDiagFormat_v3Addinfo:
- yaz_log(YLOG_LOG, "%sError %d %s:%s",
+ yaz_log(YLOG_LOG, "%sError " ODR_INT_PRINTF " %s:%s",
m_session_str,
*r->condition, diagbib1_str(*r->condition),
r->u.v3Addinfo);
{
xmlChar *out_buf;
int out_len;
- xmlDocDumpFormatMemory (res, &out_buf, &out_len, 1);
+ xmlDocDumpFormatMemory(res, &out_buf, &out_len, 1);
m_stylesheet_nprl->records[m_stylesheet_offset]->
u.databaseRecord =
z_ext_record_oid(odr_encode(), yaz_oid_recsyn_xml,
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 =
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}
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);
return 0;
}
+#if YAZ_HAS_MK_SURROGATE
+#else
+static void yazproxy_mk_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, "<diagnostic "
+ "xmlns=\"http://www.loc.gov/zing/srw/diagnostic/\">\n"
+ " <uri>info:srw/diagnostic/1/%d</uri>\n", code);
+ if (details)
+ sprintf(record->recordData_buf + strlen(record->recordData_buf),
+ " <details>%s</details>\n", details);
+ if (message)
+ sprintf(record->recordData_buf + strlen(record->recordData_buf),
+ " <message>%s</message>\n", message);
+ sprintf(record->recordData_buf + strlen(record->recordData_buf),
+ "</diagnostic>\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");
+}
+#endif
+
int Yaz_Proxy::send_to_srw_client_ok(int hits, Z_Records *records, int start)
{
ODR o = odr_encode();
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);
+#if YAZ_HAS_MK_SURROGATE
+ yaz_mk_sru_surrogate(
+ o, srw_res->records + i, i+start,
+ YAZ_SRW_RECORD_NOT_AVAILABLE_IN_THIS_SCHEMA, 0);
+#else
+ yazproxy_mk_sru_surrogate(
+ o, srw_res->records + i, i+start,
+ YAZ_SRW_RECORD_NOT_AVAILABLE_IN_THIS_SCHEMA, 0);
+#endif
continue;
}
Z_External *r = npr->u.databaseRecord;
}
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 YAZ_HAS_MK_SURROGATE
+ yaz_mk_sru_surrogate(
+ o, srw_res->records + i, i+start,
+ YAZ_SRW_RECORD_NOT_AVAILABLE_IN_THIS_SCHEMA, 0);
+#else
+ yazproxy_mk_sru_surrogate(
+ o, srw_res->records + i, i+start,
+ YAZ_SRW_RECORD_NOT_AVAILABLE_IN_THIS_SCHEMA, 0);
+#endif
}
}
}
int Yaz_Proxy::send_srw_explain_response(Z_SRW_diagnostic *diagnostics,
int num_diagnostics)
{
+ int http_status = 404;
Yaz_ProxyConfig *cfg = check_reconfigure();
if (cfg)
{
int len;
char *b = cfg->get_explain_doc(odr_encode(), 0 /* target */,
- m_s2z_database, &len);
+ m_s2z_database, &len, &http_status);
if (b)
{
Z_SRW_PDU *res = yaz_srw_get(odr_encode(), Z_SRW_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->record.recordSchema = odr_strdup(odr_encode(),
+ "http://explain.z3950.org/dtd/2.0/");
er->diagnostics = diagnostics;
er->num_diagnostics = num_diagnostics;
return send_srw_response(res);
}
}
- return send_http_response(404);
+ return send_http_response(http_status);
}
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;
}
if (sr->resultCount)
{
- yaz_log(YLOG_LOG, "%s%d hits", m_session_str,
+ yaz_log(YLOG_LOG, "%s" ODR_INT_PRINTF " hits", m_session_str,
*sr->resultCount);
if (*sr->resultCount < 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 (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;
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;
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;
{
// 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);
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;
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;
}
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;
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);
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
{
Z_Records *rec = (Z_Records *)
odr_malloc (odr, sizeof(*rec));
- int *err = (int *)
+ Odr_int *err = (Odr_int *)
odr_malloc (odr, sizeof(*err));
Z_DiagRec *drec = (Z_DiagRec *)
odr_malloc (odr, sizeof(*drec));
}
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;
m_s2z_stylesheet = 0;
Z_IdAuthentication *auth = NULL;
- if (srw_pdu->username && srw_pdu->password)
+ if (srw_pdu->username && !srw_pdu->password)
+ {
+ yaz_log(YLOG_LOG, "username: %s\n", srw_pdu->username);
+ auth = (Z_IdAuthentication *) odr_malloc(m_s2z_odr_init, sizeof(Z_IdAuthentication));
+ auth->which = Z_IdAuthentication_open;
+ auth->u.open = odr_strdup(m_s2z_odr_init, srw_pdu->username);
+ }
+ else if (srw_pdu->username && srw_pdu->password)
{
yaz_log(YLOG_LOG, "username/password: %s/%s\n",
srw_pdu->username, srw_pdu->password);
}
auth->u.idPass->userId = odr_strdup(m_s2z_odr_init, authorization_str);
}
- else
- {
- // Use _client_ IP as shown in the log entries...!
- yaz_log(YLOG_LOG, "No authorization_str present: use client IP: %s\n", m_peername);
-
- 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;
- auth->u.idPass->password = NULL;
- auth->u.idPass->userId = odr_strdup(m_s2z_odr_init, m_peername);
- }
}
if (srw_pdu->which == Z_SRW_searchRetrieve_request)
// 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
}
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);
}
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)
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)
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();
}
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)
{
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)
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()
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;
&limit_bw, &limit_pdu, &limit_req,
&limit_search,
&target_idletime, &client_idletime,
+ &max_sockets,
&max_clients,
&keepalive_limit_bw,
&keepalive_limit_pdu,
"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;
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:
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)
{
if (!strcmp (name, "optimize")) {
if (value) {
- xfree (m_optimize);
- m_optimize = xstrdup (value);
+ xfree(m_optimize);
+ m_optimize = xstrdup(value);
}
return m_optimize;
}
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)
{
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++;
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
projects / yazproxy-moved-to-github.git / blobdiff