Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-02-03 19:37:49 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-02-03 19:37:49 (GMT) |
| commit | 42a1bbc568aab7e5b29c7fe16c13659291d01cae (patch) | |
| tree | e554e83883497d7fdd6861c365204fa02380eedc /Swiften/Network/BoostConnection.cpp | |
| parent | 5b9e776a70fa83aafa83a02ea1dc04c06f02734f (diff) | |
| download | swift-contrib-42a1bbc568aab7e5b29c7fe16c13659291d01cae.zip swift-contrib-42a1bbc568aab7e5b29c7fe16c13659291d01cae.tar.bz2 | |
Correct previous patch.
Diffstat (limited to 'Swiften/Network/BoostConnection.cpp')
| -rw-r--r-- | Swiften/Network/BoostConnection.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Swiften/Network/BoostConnection.cpp b/Swiften/Network/BoostConnection.cpp index b6b2d9d..1d4bd32 100644 --- a/Swiften/Network/BoostConnection.cpp +++ b/Swiften/Network/BoostConnection.cpp @@ -73,23 +73,28 @@ void BoostConnection::disconnect() { //MainEventLoop::removeEventsFromOwner(shared_from_this()); // Mac OS X apparently exhibits a problem where closing a socket during a write could potentially go into uninterruptable sleep. // See e.g. http://bugs.python.org/issue7401 // We therefore wait until any pending write finishes, which hopefully should fix our hang on exit during close(). boost::lock_guard<boost::mutex> lock(writeMutex_); if (writing_) { closeSocketAfterNextWrite_ = true; } else { - socket_.shutdown(); - socket_.close(); + closeSocket(); } } +void BoostConnection::closeSocket() { + boost::system::error_code errorCode; + socket_.shutdown(boost::asio::ip::tcp::socket::shutdown_both, errorCode); + socket_.close(); +} + void BoostConnection::write(const SafeByteArray& data) { boost::lock_guard<boost::mutex> lock(writeMutex_); if (!writing_) { writing_ = true; doWrite(data); } else { append(writeQueue_, data); } @@ -143,20 +148,19 @@ void BoostConnection::handleDataWritten(const boost::system::error_code& error) } else { eventLoop->postEvent(boost::bind(boost::ref(onDisconnected), WriteError), shared_from_this()); } { boost::lock_guard<boost::mutex> lock(writeMutex_); if (writeQueue_.empty()) { writing_ = false; if (closeSocketAfterNextWrite_) { - socket_.shutdown(); - socket_.close(); + closeSocket(); } } else { doWrite(writeQueue_); writeQueue_.clear(); } } } |