-/* $Id: filter_z3950_client.cpp,v 1.1 2005-10-16 16:05:44 adam Exp $
+/* $Id: filter_z3950_client.cpp,v 1.5 2005-10-25 21:32:01 adam Exp $
Copyright (c) 2005, Index Data.
%LICENSE%
#include "config.hpp"
+#include <map>
#include "filter.hpp"
#include "router.hpp"
#include "package.hpp"
class Z3950Client::Assoc : public yazpp_1::Z_Assoc{
friend class Pimpl;
public:
- Assoc(yp2::Session id, yazpp_1::SocketManager *socket_manager,
+ Assoc(yazpp_1::SocketManager *socket_manager,
yazpp_1::IPDU_Observable *PDU_Observable,
std::string host);
~Assoc();
yazpp_1::IPDU_Observable *the_PDU_Observable,
int fd);
private:
- yp2::Session m_session_id;
+ // yp2::Session m_session_id;
yazpp_1::SocketManager *m_socket_manager;
yazpp_1::IPDU_Observable *m_PDU_Observable;
Package *m_package;
class Z3950Client::Pimpl {
public:
boost::mutex m_mutex;
- std::list<Z3950Client::Assoc *> m_clients;
+ std::map<yp2::Session,Z3950Client::Assoc *> m_clients;
Z3950Client::Assoc *get_assoc(Package &package);
void send_and_receive(Package &package,
yf::Z3950Client::Assoc *c);
+ void release_assoc(Package &package,
+ yf::Z3950Client::Assoc *c);
};
}
}
-yf::Z3950Client::Assoc::Assoc(yp2::Session id,
- yazpp_1::SocketManager *socket_manager,
+yf::Z3950Client::Assoc::Assoc(yazpp_1::SocketManager *socket_manager,
yazpp_1::IPDU_Observable *PDU_Observable,
std::string host)
- : Z_Assoc(PDU_Observable), m_session_id(id),
+ : Z_Assoc(PDU_Observable),
m_socket_manager(socket_manager), m_PDU_Observable(PDU_Observable),
m_package(0), m_waiting(false), m_connected(false),
m_host(host)
{
+ // std::cout << "create assoc " << this << "\n";
}
yf::Z3950Client::Assoc::~Assoc()
{
- delete m_socket_manager;
+ // std::cout << "destroy assoc " << this << "\n";
}
void yf::Z3950Client::Assoc::connectNotify()
yf::Z3950Client::Assoc *yf::Z3950Client::Pimpl::get_assoc(Package &package)
{
- Z_GDU *gdu = package.request().get();
+ // only one thread messes with the clients list at a time
+ boost::mutex::scoped_lock lock(m_mutex);
+
+ std::map<yp2::Session,yf::Z3950Client::Assoc *>::iterator it;
+
+ it = m_clients.find(package.session());
+ if (it != m_clients.end())
+ return it->second;
// only deal with Z39.50
+ Z_GDU *gdu = package.request().get();
+
if (!gdu || gdu->which != Z_GDU_Z3950)
{
package.move();
return 0;
}
-
- // only one thread messes with the clients list at a time
- boost::mutex::scoped_lock lock(m_mutex);
-
Z_APDU *apdu = gdu->u.z3950;
- std::list<yf::Z3950Client::Assoc *>::iterator it;
-
- for (it = m_clients.begin(); it != m_clients.end(); it++)
- {
- if ((*it)->m_session_id == package.session())
- break;
- }
- if (it != m_clients.end())
- return *it;
-
- // new session ..
+ // new Z39.50 session ..
// check that it is init. If not, close
if (apdu->which != Z_APDU_initRequest)
Z_APDU *apdu = zget_APDU(odr, Z_APDU_close);
*apdu->u.close->closeReason = Z_Close_protocolError;
+ apdu->u.close->diagnosticInformation =
+ odr_strdup(odr, "no init request for session");
+
package.response() = apdu;
package.session().close();
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(package.session(),
- sm, pdu_as,
- vhost);
- m_clients.push_back(as);
+ yf::Z3950Client::Assoc *as = new yf::Z3950Client::Assoc(sm, pdu_as, vhost);
+ m_clients[package.session()] = as;
return as;
}
void yf::Z3950Client::Pimpl::send_and_receive(Package &package,
yf::Z3950Client::Assoc *c)
{
+ Z_GDU *gdu = package.request().get();
+
+ if (!gdu || gdu->which != Z_GDU_Z3950)
+ return;
+
// we should lock c!
c->m_package = &package;
// relay the package ..
int len;
- c->send_GDU(package.request().get(), &len);
+ c->send_GDU(gdu, &len);
while (c->m_waiting && c->m_socket_manager->processEvent() > 0)
;
}
+void yf::Z3950Client::Pimpl::release_assoc(Package &package,
+ yf::Z3950Client::Assoc *c)
+{
+ if (package.session().is_closed())
+ {
+ boost::mutex::scoped_lock lock(m_mutex);
+ std::map<yp2::Session,yf::Z3950Client::Assoc *>::iterator it;
+
+ it = m_clients.find(package.session());
+ if (it != m_clients.end())
+ {
+ // the Z_Assoc and PDU_Assoc must be destroyed before
+ // the socket manager.. so pull that out.. first..
+ yazpp_1::SocketManager *s = it->second->m_socket_manager;
+ delete it->second; // destroy Z_Assoc
+ delete s; // then manager
+ m_clients.erase(it);
+ }
+ }
+}
+
void yf::Z3950Client::process(Package &package) const
{
yf::Z3950Client::Assoc *c = m_p->get_assoc(package);
- if (!c)
- return;
- m_p->send_and_receive(package, c);
+ if (c)
+ {
+ m_p->send_and_receive(package, c);
+ m_p->release_assoc(package, c);
+ }
}