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
Add "auth_simple" 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
21f20b3
..
9975aa6
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.17 2006-01-09 18:19:09 adam Exp $
+/* $Id: filter_z3950_client.cpp,v 1.20 2006-01-13 15:09:35 adam Exp $
Copyright (c) 2005, Index Data.
%LICENSE%
Copyright (c) 2005, Index Data.
%LICENSE%
@@
-6,9
+6,7
@@
#include "config.hpp"
#include "config.hpp"
-#include "xmlutil.hpp"
#include "filter.hpp"
#include "filter.hpp"
-#include "router.hpp"
#include "package.hpp"
#include "util.hpp"
#include "filter_z3950_client.hpp"
#include "package.hpp"
#include "util.hpp"
#include "filter_z3950_client.hpp"
@@
-110,7
+108,12
@@
void yf::Z3950Client::Assoc::failNotify()
if (m_package)
{
if (m_package)
{
- m_package->response() = odr.create_close(Z_Close_peerAbort, 0);
+ Z_GDU *gdu = m_package->request().get();
+ 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_package->session().close();
}
}
@@
-126,10
+129,17
@@
void yf::Z3950Client::Assoc::timeoutNotify()
if (m_package)
{
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)
if (m_connected)
- m_package->response() = odr.create_close(Z_Close_lackOfActivity, 0);
+ m_package->response() =
+ odr.create_close(apdu, Z_Close_lackOfActivity, 0);
else
else
- m_package->response() = odr.create_close(Z_Close_peerAbort, 0);
+ m_package->response() =
+ odr.create_close(apdu, Z_Close_peerAbort, 0);
m_package->session().close();
}
m_package->session().close();
}
@@
-206,7
+216,8
@@
yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package)
{
yp2::odr odr;
{
yp2::odr odr;
- package.response() = odr.create_close(Z_Close_protocolError,
+ package.response() = odr.create_close(apdu,
+ Z_Close_protocolError,
"First PDU was not an "
"Initialize Request");
package.session().close();
"First PDU was not an "
"Initialize Request");
package.session().close();
@@
-221,6
+232,7
@@
yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package)
{
yp2::odr odr;
package.response() = odr.create_initResponse(
{
yp2::odr odr;
package.response() = odr.create_initResponse(
+ apdu,
YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED,
"Virtual host not given");
YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED,
"Virtual host not given");