Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-11-20 18:23:09 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-11-20 18:23:09 (GMT) |
| commit | cf8e2aca04c9a4021448f829e5b264dad25b28c8 (patch) | |
| tree | 6f11cb1a32a9d73f3b9a62db6d06e6ae2dcab6ab /Swiften/Network | |
| parent | 97bdf1a66d321bcd059a0ee218bec0cc92d1bc7b (diff) | |
| download | swift-cf8e2aca04c9a4021448f829e5b264dad25b28c8.zip swift-cf8e2aca04c9a4021448f829e5b264dad25b28c8.tar.bz2 | |
Fixed connection leak.
Diffstat (limited to 'Swiften/Network')
| -rw-r--r-- | Swiften/Network/BoostConnectionServer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Swiften/Network/BoostConnectionServer.cpp b/Swiften/Network/BoostConnectionServer.cpp index 4e83ad5..cea016d 100644 --- a/Swiften/Network/BoostConnectionServer.cpp +++ b/Swiften/Network/BoostConnectionServer.cpp @@ -1,67 +1,68 @@ #include "Swiften/Network/BoostConnectionServer.h" #include <boost/bind.hpp> #include <boost/system/system_error.hpp> #include "Swiften/EventLoop/MainEventLoop.h" namespace Swift { BoostConnectionServer::BoostConnectionServer(int port, boost::asio::io_service* ioService) : port_(port), ioService_(ioService), acceptor_(NULL) { } void BoostConnectionServer::start() { try { assert(!acceptor_); acceptor_ = new boost::asio::ip::tcp::acceptor( *ioService_, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port_)); acceptNextConnection(); } catch (const boost::system::system_error& e) { if (e.code() == boost::asio::error::address_in_use) { MainEventLoop::postEvent(boost::bind(boost::ref(onStopped), Conflict), shared_from_this()); } else { MainEventLoop::postEvent(boost::bind(boost::ref(onStopped), UnknownError), shared_from_this()); } } } void BoostConnectionServer::stop() { stop(boost::optional<Error>()); } void BoostConnectionServer::stop(boost::optional<Error> e) { if (acceptor_) { acceptor_->close(); + delete acceptor_; acceptor_ = NULL; } MainEventLoop::postEvent(boost::bind(boost::ref(onStopped), e), shared_from_this()); } void BoostConnectionServer::acceptNextConnection() { boost::shared_ptr<BoostConnection> newConnection(new BoostConnection(&acceptor_->io_service())); acceptor_->async_accept(newConnection->getSocket(), boost::bind(&BoostConnectionServer::handleAccept, shared_from_this(), newConnection, boost::asio::placeholders::error)); } void BoostConnectionServer::handleAccept(boost::shared_ptr<BoostConnection> newConnection, const boost::system::error_code& error) { if (error) { MainEventLoop::postEvent( boost::bind( &BoostConnectionServer::stop, shared_from_this(), UnknownError), shared_from_this()); } else { MainEventLoop::postEvent( boost::bind(boost::ref(onNewConnection), newConnection), shared_from_this()); newConnection->listen(); acceptNextConnection(); } } } |