Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-03-23 11:54:03 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-03-23 11:54:03 (GMT) |
| commit | 846c4b9d2e7ec3214a3b13bdbbce77f70fede515 (patch) | |
| tree | 579bf6be3e266c8e28a7469e7547ac88fa9af3fc /Swiften/Component | |
| parent | 8ccdfd958ba1e7afbeb8c5893c12f09046cb8892 (diff) | |
| download | swift-contrib-846c4b9d2e7ec3214a3b13bdbbce77f70fede515.zip swift-contrib-846c4b9d2e7ec3214a3b13bdbbce77f70fede515.tar.bz2 | |
Allow TLS errors to bubble further up the stackks/tlserrors
Diffstat (limited to 'Swiften/Component')
| -rw-r--r-- | Swiften/Component/CoreComponent.cpp | 12 | ||||
| -rw-r--r-- | Swiften/Component/UnitTest/ComponentSessionTest.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Swiften/Component/CoreComponent.cpp b/Swiften/Component/CoreComponent.cpp index e630ddf..e11d2b0 100644 --- a/Swiften/Component/CoreComponent.cpp +++ b/Swiften/Component/CoreComponent.cpp @@ -114,23 +114,23 @@ void CoreComponent::handleSessionFinished(boost::shared_ptr<Error> error) { break; } } - else if (boost::shared_ptr<SessionStream::Error> actualError = boost::dynamic_pointer_cast<SessionStream::Error>(error)) { + else if (boost::shared_ptr<SessionStream::SessionStreamError> actualError = boost::dynamic_pointer_cast<SessionStream::SessionStreamError>(error)) { switch(actualError->type) { - case SessionStream::Error::ParseError: + case SessionStream::SessionStreamError::ParseError: componentError = ComponentError(ComponentError::XMLError); break; - case SessionStream::Error::TLSError: + case SessionStream::SessionStreamError::TLSError: assert(false); componentError = ComponentError(ComponentError::UnknownError); break; - case SessionStream::Error::InvalidTLSCertificateError: + case SessionStream::SessionStreamError::InvalidTLSCertificateError: assert(false); componentError = ComponentError(ComponentError::UnknownError); break; - case SessionStream::Error::ConnectionReadError: + case SessionStream::SessionStreamError::ConnectionReadError: componentError = ComponentError(ComponentError::ConnectionReadError); break; - case SessionStream::Error::ConnectionWriteError: + case SessionStream::SessionStreamError::ConnectionWriteError: componentError = ComponentError(ComponentError::ConnectionWriteError); break; } diff --git a/Swiften/Component/UnitTest/ComponentSessionTest.cpp b/Swiften/Component/UnitTest/ComponentSessionTest.cpp index 9763c7f..da9ca7d 100644 --- a/Swiften/Component/UnitTest/ComponentSessionTest.cpp +++ b/Swiften/Component/UnitTest/ComponentSessionTest.cpp @@ -159,7 +159,7 @@ class ComponentSessionTest : public CppUnit::TestFixture { } void breakConnection() { - onClosed(boost::make_shared<SessionStream::Error>(SessionStream::Error::ConnectionReadError)); + onClosed(boost::make_shared<SessionStream::SessionStreamError>(SessionStream::SessionStreamError::ConnectionReadError)); } void sendStreamStart() { |