summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/client/windows/SslConnector.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/qpid/client/windows/SslConnector.cpp')
-rw-r--r--cpp/src/qpid/client/windows/SslConnector.cpp20
1 files changed, 12 insertions, 8 deletions
diff --git a/cpp/src/qpid/client/windows/SslConnector.cpp b/cpp/src/qpid/client/windows/SslConnector.cpp
index 2aa31e8202..e1f34e7aea 100644
--- a/cpp/src/qpid/client/windows/SslConnector.cpp
+++ b/cpp/src/qpid/client/windows/SslConnector.cpp
@@ -71,6 +71,8 @@ class SslConnector : public qpid::client::TCPConnector
void redirectReadbuff(qpid::sys::AsynchIO&, qpid::sys::AsynchIOBufferBase*);
void redirectWritebuff(qpid::sys::AsynchIO&);
void redirectEof(qpid::sys::AsynchIO&);
+ void redirectDisconnect(qpid::sys::AsynchIO&);
+ void redirectSocketClosed(qpid::sys::AsynchIO&, const qpid::sys::Socket&);
public:
SslConnector(boost::shared_ptr<qpid::sys::Poller>,
@@ -79,7 +81,6 @@ public:
ConnectionImpl*);
virtual void connect(const std::string& host, const std::string& port);
virtual void connected(const Socket&);
- unsigned int getSSF();
};
// Static constructor which registers connector here
@@ -124,6 +125,14 @@ void SslConnector::redirectEof(qpid::sys::AsynchIO& a) {
eof(a);
}
+void SslConnector::redirectDisconnect(qpid::sys::AsynchIO& a) {
+ disconnected(a);
+}
+
+void SslConnector::redirectSocketClosed(qpid::sys::AsynchIO& a, const qpid::sys::Socket& s) {
+ socketClosed(a, s);
+}
+
SslConnector::SslConnector(boost::shared_ptr<qpid::sys::Poller> p,
framing::ProtocolVersion ver,
const ConnectionSettings& settings,
@@ -164,8 +173,8 @@ void SslConnector::connected(const Socket& s) {
credHandle,
boost::bind(&SslConnector::redirectReadbuff, this, _1, _2),
boost::bind(&SslConnector::redirectEof, this, _1),
- boost::bind(&SslConnector::redirectEof, this, _1),
- 0, // closed
+ boost::bind(&SslConnector::redirectDisconnect, this, _1),
+ boost::bind(&SslConnector::redirectSocketClosed, this, _1, _2),
0, // nobuffs
boost::bind(&SslConnector::redirectWritebuff, this, _1),
boost::bind(&SslConnector::negotiationDone, this, _1));
@@ -173,9 +182,4 @@ void SslConnector::connected(const Socket& s) {
shim->start(poller);
}
-unsigned int SslConnector::getSSF()
-{
- return shim->getSslKeySize();
-}
-
}}} // namespace qpid::client::windows