Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-01-22 14:00:01 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-01-22 14:00:01 (GMT) |
| commit | df029015f47f284ced01b8d1f11c4d48cc2f2564 (patch) | |
| tree | 455d47a7fcb0d9d90bef6a6c63bdc7120eaec286 /Swiften/Component | |
| parent | 940cb5e744564ec15b805a9e5388e1fa5c60d703 (diff) | |
| download | swift-contrib-df029015f47f284ced01b8d1f11c4d48cc2f2564.zip swift-contrib-df029015f47f284ced01b8d1f11c4d48cc2f2564.tar.bz2 | |
Close connection properly before quitting.
Diffstat (limited to 'Swiften/Component')
| -rw-r--r-- | Swiften/Component/ComponentSession.cpp | 33 | ||||
| -rw-r--r-- | Swiften/Component/ComponentSession.h | 4 | ||||
| -rw-r--r-- | Swiften/Component/UnitTest/ComponentSessionTest.cpp | 6 |
3 files changed, 28 insertions, 15 deletions
diff --git a/Swiften/Component/ComponentSession.cpp b/Swiften/Component/ComponentSession.cpp index 967e68d..c45f663 100644 --- a/Swiften/Component/ComponentSession.cpp +++ b/Swiften/Component/ComponentSession.cpp @@ -24,7 +24,7 @@ ComponentSession::~ComponentSession() { void ComponentSession::start() { stream->onStreamStartReceived.connect(boost::bind(&ComponentSession::handleStreamStart, shared_from_this(), _1)); stream->onElementReceived.connect(boost::bind(&ComponentSession::handleElement, shared_from_this(), _1)); - stream->onClosed.connect(boost::bind(&ComponentSession::handleStreamError, shared_from_this(), _1)); + stream->onClosed.connect(boost::bind(&ComponentSession::handleStreamClosed, shared_from_this(), _1)); assert(state == Initial); state = WaitingForStreamStart; @@ -81,8 +81,19 @@ bool ComponentSession::checkState(State state) { return true; } -void ComponentSession::handleStreamError(boost::shared_ptr<Swift::Error> error) { - finishSession(error); +void ComponentSession::handleStreamClosed(boost::shared_ptr<Swift::Error> streamError) { + State oldState = state; + state = Finished; + stream->setWhitespacePingEnabled(false); + stream->onStreamStartReceived.disconnect(boost::bind(&ComponentSession::handleStreamStart, shared_from_this(), _1)); + stream->onElementReceived.disconnect(boost::bind(&ComponentSession::handleElement, shared_from_this(), _1)); + stream->onClosed.disconnect(boost::bind(&ComponentSession::handleStreamClosed, shared_from_this(), _1)); + if (oldState == Finishing) { + onFinished(error); + } + else { + onFinished(streamError); + } } void ComponentSession::finish() { @@ -93,16 +104,12 @@ void ComponentSession::finishSession(Error::Type error) { finishSession(boost::shared_ptr<Swift::ComponentSession::Error>(new Swift::ComponentSession::Error(error))); } -void ComponentSession::finishSession(boost::shared_ptr<Swift::Error> error) { - state = Finished; - stream->setWhitespacePingEnabled(false); - stream->onStreamStartReceived.disconnect(boost::bind(&ComponentSession::handleStreamStart, shared_from_this(), _1)); - stream->onElementReceived.disconnect(boost::bind(&ComponentSession::handleElement, shared_from_this(), _1)); - stream->onClosed.disconnect(boost::bind(&ComponentSession::handleStreamError, shared_from_this(), _1)); - if (stream->isAvailable()) { - stream->writeFooter(); - } - onFinished(error); +void ComponentSession::finishSession(boost::shared_ptr<Swift::Error> finishError) { + state = Finishing; + error = finishError; + assert(stream->isOpen()); + stream->writeFooter(); + stream->close(); } } diff --git a/Swiften/Component/ComponentSession.h b/Swiften/Component/ComponentSession.h index cbfa227..dbe6e27 100644 --- a/Swiften/Component/ComponentSession.h +++ b/Swiften/Component/ComponentSession.h @@ -27,6 +27,7 @@ namespace Swift { WaitingForStreamStart, Authenticating, Initialized, + Finishing, Finished }; @@ -68,7 +69,7 @@ namespace Swift { void handleElement(boost::shared_ptr<Element>); void handleStreamStart(const ProtocolHeader&); - void handleStreamError(boost::shared_ptr<Swift::Error>); + void handleStreamClosed(boost::shared_ptr<Swift::Error>); bool checkState(State); @@ -76,6 +77,7 @@ namespace Swift { JID jid; String secret; boost::shared_ptr<SessionStream> stream; + boost::shared_ptr<Swift::Error> error; State state; }; } diff --git a/Swiften/Component/UnitTest/ComponentSessionTest.cpp b/Swiften/Component/UnitTest/ComponentSessionTest.cpp index 3ad52f9..86776e8 100644 --- a/Swiften/Component/UnitTest/ComponentSessionTest.cpp +++ b/Swiften/Component/UnitTest/ComponentSessionTest.cpp @@ -95,7 +95,11 @@ class ComponentSessionTest : public CppUnit::TestFixture { MockSessionStream() : available(true), whitespacePingEnabled(false), resetCount(0) { } - virtual bool isAvailable() { + virtual void close() { + onClosed(boost::shared_ptr<Error>()); + } + + virtual bool isOpen() { return available; } |