diff options
| author | Charles E. Rolke <chug@apache.org> | 2012-09-07 13:49:09 +0000 |
|---|---|---|
| committer | Charles E. Rolke <chug@apache.org> | 2012-09-07 13:49:09 +0000 |
| commit | 85682330fb51017cc2e2a772e7ec0b6345ff22d1 (patch) | |
| tree | b62be1b678bc56377b8bd11549337d936b069470 /cpp/src | |
| parent | 5b0aa8c557ee3ab87e8a1cf1da7e59d48ebad8fa (diff) | |
| download | qpid-python-85682330fb51017cc2e2a772e7ec0b6345ff22d1.tar.gz | |
QPID-4257 Windwos + SSL: broker/client memory leaks and client hang. Patch from Kerry Bonin
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1382026 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/client/windows/SslConnector.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/cpp/src/qpid/client/windows/SslConnector.cpp b/cpp/src/qpid/client/windows/SslConnector.cpp index d11a8285be..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>, @@ -123,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, @@ -163,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)); |