projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Started work on shared session filter.
[metaproxy-moved-to-github.git]
/
src
/
filter_z3950_client.cpp
diff --git
a/src/filter_z3950_client.cpp
b/src/filter_z3950_client.cpp
index
f64a4c5
..
6d51c9e
100644
(file)
--- a/
src/filter_z3950_client.cpp
+++ b/
src/filter_z3950_client.cpp
@@
-1,4
+1,4
@@
-/* $Id: filter_z3950_client.cpp,v 1.8 2005-10-30 17:13:36 adam Exp $
+/* $Id: filter_z3950_client.cpp,v 1.11 2005-11-10 23:10:42 adam Exp $
Copyright (c) 2005, Index Data.
%LICENSE%
Copyright (c) 2005, Index Data.
%LICENSE%
@@
-6,17
+6,20
@@
#include "config.hpp"
#include "config.hpp"
-#include <map>
#include "filter.hpp"
#include "router.hpp"
#include "package.hpp"
#include "filter.hpp"
#include "router.hpp"
#include "package.hpp"
+#include "util.hpp"
+#include "filter_z3950_client.hpp"
+
+#include <map>
+#include <stdexcept>
+#include <list>
+#include <iostream>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.hpp>
-#include "util.hpp"
-#include "filter_z3950_client.hpp"
-
#include <yaz/zgdu.h>
#include <yaz/log.h>
#include <yaz/otherinfo.h>
#include <yaz/zgdu.h>
#include <yaz/log.h>
#include <yaz/otherinfo.h>
@@
-26,15
+29,12
@@
#include <yaz++/pdu-assoc.h>
#include <yaz++/z-assoc.h>
#include <yaz++/pdu-assoc.h>
#include <yaz++/z-assoc.h>
-#include <iostream>
-
namespace yf = yp2::filter;
namespace yp2 {
namespace filter {
class Z3950Client::Assoc : public yazpp_1::Z_Assoc{
friend class Rep;
namespace yf = yp2::filter;
namespace yp2 {
namespace filter {
class Z3950Client::Assoc : public yazpp_1::Z_Assoc{
friend class Rep;
- public:
Assoc(yazpp_1::SocketManager *socket_manager,
yazpp_1::IPDU_Observable *PDU_Observable,
std::string host);
Assoc(yazpp_1::SocketManager *socket_manager,
yazpp_1::IPDU_Observable *PDU_Observable,
std::string host);
@@
-46,8
+46,7
@@
namespace yp2 {
yazpp_1::IPDU_Observer* sessionNotify(
yazpp_1::IPDU_Observable *the_PDU_Observable,
int fd);
yazpp_1::IPDU_Observer* sessionNotify(
yazpp_1::IPDU_Observable *the_PDU_Observable,
int fd);
- private:
- // yp2::Session m_session_id;
+
yazpp_1::SocketManager *m_socket_manager;
yazpp_1::IPDU_Observable *m_PDU_Observable;
Package *m_package;
yazpp_1::SocketManager *m_socket_manager;
yazpp_1::IPDU_Observable *m_PDU_Observable;
Package *m_package;
@@
-70,6
+69,7
@@
namespace yp2 {
}
}
}
}
+using namespace yp2;
yf::Z3950Client::Assoc::Assoc(yazpp_1::SocketManager *socket_manager,
yazpp_1::IPDU_Observable *PDU_Observable,
yf::Z3950Client::Assoc::Assoc(yazpp_1::SocketManager *socket_manager,
yazpp_1::IPDU_Observable *PDU_Observable,
@@
-100,13
+100,9
@@
void yf::Z3950Client::Assoc::failNotify()
yp2::odr odr;
yp2::odr odr;
- Z_APDU *apdu = zget_APDU(odr, Z_APDU_close);
-
- *apdu->u.close->closeReason = Z_Close_peerAbort;
-
if (m_package)
{
if (m_package)
{
- m_package->response() = apdu;
+ m_package->response() = odr.create_close(Z_Close_peerAbort, 0);
m_package->session().close();
}
}
m_package->session().close();
}
}
@@
-117,13
+113,9
@@
void yf::Z3950Client::Assoc::timeoutNotify()
yp2::odr odr;
yp2::odr odr;
- Z_APDU *apdu = zget_APDU(odr, Z_APDU_close);
-
- *apdu->u.close->closeReason = Z_Close_lackOfActivity;
-
if (m_package)
{
if (m_package)
{
- m_package->response() = apdu;
+ m_package->response() = odr.create_close(Z_Close_lackOfActivity, 0);
m_package->session().close();
}
}
m_package->session().close();
}
}
@@
-188,14
+180,9
@@
yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package)
if (apdu->which != Z_APDU_initRequest)
{
yp2::odr odr;
if (apdu->which != Z_APDU_initRequest)
{
yp2::odr odr;
- 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.response() = odr.create_close(Z_Close_protocolError,
+ "no init request for session");
package.session().close();
return 0;
}
package.session().close();
return 0;
}
@@
-206,14
+193,10
@@
yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package)
if (!vhost)
{
yp2::odr odr;
if (!vhost)
{
yp2::odr odr;
- Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse);
+ package.response() = odr.create_initResponse(
+ YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED,
+ "Virtual host not given");
- apdu->u.initResponse->userInformationField =
- zget_init_diagnostics(odr,
- YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED,
- "Virtual host not given");
- package.response() = apdu;
-
package.session().close();
return 0;
}
package.session().close();
return 0;
}