/* This file is part of Metaproxy.
- Copyright (C) 2005-2011 Index Data
+ Copyright (C) 2005-2012 Index Data
Metaproxy 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
void failNotify();
void timeoutNotify();
void recv_GDU(Z_GDU *gdu, int len);
+ void fixup_nsd(ODR odr, Z_Records *records);
+ void fixup_nsd(ODR odr, Z_DefaultDiagFormat *nsd);
+ void fixup_init(ODR odr, Z_InitResponse *initrs);
yazpp_1::IPDU_Observer* sessionNotify(
yazpp_1::IPDU_Observable *the_PDU_Observable,
int fd);
std::string host, int timeout_sec)
: Z_Assoc(PDU_Observable),
m_socket_manager(socket_manager), m_PDU_Observable(PDU_Observable),
- m_package(0), m_in_use(true), m_waiting(false),
+ m_package(0), m_in_use(true), m_waiting(false),
m_destroyed(false), m_connected(false), m_has_closed(false),
m_queue_len(1),
m_time_elapsed(0), m_time_max(timeout_sec), m_time_connect_max(10),
Z_APDU *apdu = 0;
if (gdu && gdu->which == Z_GDU_Z3950)
apdu = gdu->u.z3950;
-
+
m_package->response() = odr.create_close(apdu, Z_Close_peerAbort, 0);
m_package->session().close();
}
m_waiting = false;
mp::odr odr;
-
+
if (m_package)
{
Z_GDU *gdu = m_package->request().get();
Z_APDU *apdu = 0;
if (gdu && gdu->which == Z_GDU_Z3950)
apdu = gdu->u.z3950;
-
+
if (m_connected)
m_package->response() =
odr.create_close(apdu, Z_Close_lackOfActivity, 0);
else
- m_package->response() =
+ m_package->response() =
odr.create_close(apdu, Z_Close_peerAbort, 0);
-
+
m_package->session().close();
}
}
}
+void yf::Z3950Client::Assoc::fixup_nsd(ODR odr, Z_DefaultDiagFormat *nsd)
+{
+ std::string addinfo;
+
+ // should really check for nsd->which.. But union has two members
+ // containing almost same data
+ const char *v2Addinfo = nsd->u.v2Addinfo;
+ // Z_InternationalString *v3Addinfo;
+ if (v2Addinfo && *v2Addinfo)
+ {
+ addinfo.assign(nsd->u.v2Addinfo);
+ addinfo += " ";
+ }
+ addinfo += "(backend=" + m_host + ")";
+ nsd->u.v2Addinfo = odr_strdup(odr, addinfo.c_str());
+}
+
+void yf::Z3950Client::Assoc::fixup_nsd(ODR odr, Z_Records *records)
+{
+ if (records && records->which == Z_Records_NSD)
+ {
+ fixup_nsd(odr, records->u.nonSurrogateDiagnostic);
+ }
+ if (records && records->which == Z_Records_multipleNSD)
+ {
+ Z_DiagRecs *drecs = records->u.multipleNonSurDiagnostics;
+ int i;
+ for (i = 0; i < drecs->num_diagRecs; i++)
+ {
+ Z_DiagRec *dr = drecs->diagRecs[i];
+
+ if (dr->which == Z_DiagRec_defaultFormat)
+ fixup_nsd(odr, dr->u.defaultFormat);
+ }
+ }
+}
+
+void yf::Z3950Client::Assoc::fixup_init(ODR odr, Z_InitResponse *initrs)
+{
+ Z_External *uif = initrs->userInformationField;
+
+ if (uif && uif->which == Z_External_userInfo1)
+ {
+ Z_OtherInformation *ui = uif->u.userInfo1;
+ int i;
+ for (i = 0; i < ui->num_elements; i++)
+ {
+ Z_OtherInformationUnit *unit = ui->list[i];
+ if (unit->which == Z_OtherInfo_externallyDefinedInfo &&
+ unit->information.externallyDefinedInfo &&
+ unit->information.externallyDefinedInfo->which ==
+ Z_External_diag1)
+ {
+ Z_DiagnosticFormat *diag =
+ unit->information.externallyDefinedInfo->u.diag1;
+ int j;
+ for (j = 0; j < diag->num; j++)
+ {
+ Z_DiagnosticFormat_s *ds = diag->elements[j];
+ if (ds->which == Z_DiagnosticFormat_s_defaultDiagRec)
+ {
+ Z_DefaultDiagFormat *r = ds->u.defaultDiagRec;
+ char *oaddinfo = r->u.v2Addinfo;
+ char *naddinfo = (char *) odr_malloc(
+ odr,
+ (oaddinfo ? strlen(oaddinfo) : 0) + 20 +
+ m_host.length());
+ *naddinfo = '\0';
+ if (oaddinfo && *oaddinfo)
+ {
+ strcat(naddinfo, oaddinfo);
+ strcat(naddinfo, " ");
+ }
+ strcat(naddinfo, "(backend=");
+ strcat(naddinfo, m_host.c_str());
+ strcat(naddinfo, ")");
+
+ r->u.v2Addinfo = naddinfo;
+ }
+ }
+ }
+ }
+ }
+}
+
void yf::Z3950Client::Assoc::recv_GDU(Z_GDU *gdu, int len)
{
m_waiting = false;
if (m_package)
+ {
+ mp::odr odr; // must be in scope for response() = assignment
+ if (gdu && gdu->which == Z_GDU_Z3950)
+ {
+ Z_APDU *apdu = gdu->u.z3950;
+ switch (apdu->which)
+ {
+ case Z_APDU_searchResponse:
+ fixup_nsd(odr, apdu->u.searchResponse->records);
+ break;
+ case Z_APDU_presentResponse:
+ fixup_nsd(odr, apdu->u.presentResponse->records);
+ break;
+ case Z_APDU_initResponse:
+ fixup_init(odr, apdu->u.initResponse);
+ break;
+ }
+ }
m_package->response() = gdu;
+ }
}
yazpp_1::IPDU_Observer *yf::Z3950Client::Assoc::sessionNotify(
yf::Z3950Client::~Z3950Client() {
}
-yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package)
+yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package)
{
// only one thread messes with the clients list at a time
boost::mutex::scoped_lock lock(m_mutex);
std::map<mp::Session,yf::Z3950Client::Assoc *>::iterator it;
-
+
Z_GDU *gdu = package.request().get();
-
+
int max_sockets = package.origin().get_max_sockets();
if (max_sockets == 0)
max_sockets = m_max_sockets;
-
- std::string host;
it = m_clients.find(package.session());
if (it != m_clients.end())
if (apdu->which != Z_APDU_initRequest)
{
mp::odr odr;
-
+
package.response() = odr.create_close(apdu,
Z_Close_protocolError,
"First PDU was not an "
apdu,
YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED,
"z3950_client: No vhost given");
-
+
package.session().close();
return 0;
}
return 0;
}
}
-
- std::list<std::string> dblist;
- mp::util::split_zurl(target, host, dblist);
-
- if (dblist.size())
- {
- ; // z3950_client: Databases in vhost ignored
- }
-
+
// see if we have reached max number of clients (max-sockets)
while (max_sockets)
for (; it != m_clients.end(); it++)
{
yf::Z3950Client::Assoc *as = it->second;
- if (!strcmp(as->m_host.c_str(), host.c_str()))
+ if (!strcmp(as->m_host.c_str(), target.c_str()))
{
number++;
if (!as->m_in_use)
}
}
yaz_log(YLOG_LOG, "Found %d/%d connections for %s", number, max_sockets,
- host.c_str());
+ target.c_str());
if (number < max_sockets)
break;
if (no_not_in_use == 0) // all in use..
{
mp::odr odr;
-
+
package.response() = odr.create_initResponse(
- apdu, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR, "max sessions");
+ apdu, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR,
+ "z3950_client: max sessions");
package.session().close();
return 0;
}
boost::xtime xt;
xtime_get(&xt, boost::TIME_UTC);
-
+
xt.sec += 15;
if (!m_cond_session_ready.timed_wait(lock, xt))
{
mp::odr odr;
-
+
package.response() = odr.create_initResponse(
- apdu, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR, "max sessions");
+ apdu, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR,
+ "z3950_client: max sessions");
package.session().close();
return 0;
}
yazpp_1::SocketManager *sm = new yazpp_1::SocketManager;
yazpp_1::PDU_Assoc *pdu_as = new yazpp_1::PDU_Assoc(sm);
yf::Z3950Client::Assoc *as = new yf::Z3950Client::Assoc(sm, pdu_as,
- host.c_str(),
+ target.c_str(),
m_timeout_sec);
m_clients[package.session()] = as;
return as;
&& m_force_close)
{
mp::odr odr;
-
+
package.request() = odr.create_close(
0, Z_Close_finished, "z3950_client");
c->m_package = 0; // don't inspect response
c->m_waiting = true;
if (!c->m_connected)
{
- c->client(c->m_host.c_str());
+ if (c->client(c->m_host.c_str()))
+ {
+ mp::odr odr;
+ package.response() =
+ odr.create_close(gdu->u.z3950, Z_Close_peerAbort, 0);
+ package.session().close();
+ return;
+ }
c->timeout(1); // so timeoutNotify gets called once per second
- while (!c->m_destroyed && c->m_waiting
+
+ while (!c->m_destroyed && c->m_waiting
&& c->m_socket_manager->processEvent() > 0)
;
}
// prepare response
c->m_time_elapsed = 0;
c->m_waiting = true;
-
+
// relay the package ..
int len;
c->send_GDU(gdu, &len);
{
boost::mutex::scoped_lock lock(m_mutex);
std::map<mp::Session,yf::Z3950Client::Assoc *>::iterator it;
-
+
it = m_clients.find(package.session());
if (it != m_clients.end())
{
}
}
-void yf::Z3950Client::configure(const xmlNode *ptr, bool test_only)
+void yf::Z3950Client::configure(const xmlNode *ptr, bool test_only,
+ const char *path)
{
for (ptr = ptr->children; ptr; ptr = ptr->next)
{
continue;
if (!strcmp((const char *) ptr->name, "timeout"))
{
- m_p->m_timeout_sec = mp::xml::get_int(ptr->children, 30);
+ m_p->m_timeout_sec = mp::xml::get_int(ptr, 30);
}
else if (!strcmp((const char *) ptr->name, "default_target"))
{
}
else if (!strcmp((const char *) ptr->name, "max-sockets"))
{
- m_p->m_max_sockets = mp::xml::get_int(ptr->children, 0);
+ m_p->m_max_sockets = mp::xml::get_int(ptr, 0);
}
else if (!strcmp((const char *) ptr->name, "force_close"))
{
- m_p->m_force_close = mp::xml::get_bool(ptr->children, 0);
+ m_p->m_force_close = mp::xml::get_bool(ptr, 0);
}
else
{
- throw mp::filter::FilterException("Bad element "
+ throw mp::filter::FilterException("Bad element "
+ std::string((const char *)
ptr->name));
}